From 7c67a013ee595d744b23d32c8c09431931d06e82 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Thu, 1 Nov 2012 13:27:03 +0000
Subject: [PATCH] ALF-16604: Widended before and after time around content
 modification

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/content/AbstractWritableContentStoreTest.java |  4 +++-
 .../repo/content/ContentFullContextTestSuite.java      |  2 +-
 .../repo/content/ContentMinimalContextTestSuite.java   | 10 ++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/java/org/alfresco/repo/content/AbstractWritableContentStoreTest.java b/source/java/org/alfresco/repo/content/AbstractWritableContentStoreTest.java
index 844f54e825..a029d30d7d 100644
--- a/source/java/org/alfresco/repo/content/AbstractWritableContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/AbstractWritableContentStoreTest.java
@@ -194,7 +194,7 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
     /**
      * Checks that the various methods of obtaining a reader are supported.
      */
-    public void testGetReader() throws Exception
+    public synchronized void testGetReader() throws Exception
     {
         ContentStore store = getStore();
         ContentWriter writer = store.getWriter(ContentStore.NEW_CONTENT_CONTEXT);
@@ -212,10 +212,12 @@ public abstract class AbstractWritableContentStoreTest extends AbstractReadOnlyC
         
         // write some content
         long before = System.currentTimeMillis();
+        this.wait(1000L);
         writer.setMimetype("text/plain");
         writer.setEncoding("UTF-8");
         writer.setLocale(Locale.CHINESE);
         writer.putContent(content);
+        this.wait(1000L);
         long after = System.currentTimeMillis();
         
         // get a reader from the store
diff --git a/source/java/org/alfresco/repo/content/ContentFullContextTestSuite.java b/source/java/org/alfresco/repo/content/ContentFullContextTestSuite.java
index 97e8c6c904..506a621254 100644
--- a/source/java/org/alfresco/repo/content/ContentFullContextTestSuite.java
+++ b/source/java/org/alfresco/repo/content/ContentFullContextTestSuite.java
@@ -22,7 +22,6 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.alfresco.repo.content.cleanup.ContentStoreCleanerTest;
-import org.alfresco.repo.content.encoding.CharsetFinderTest;
 import org.alfresco.repo.content.filestore.FileContentStoreTest;
 import org.alfresco.repo.content.filestore.NoRandomAccessFileContentStoreTest;
 import org.alfresco.repo.content.filestore.ReadOnlyFileContentStoreTest;
@@ -59,6 +58,7 @@ public class ContentFullContextTestSuite extends TestSuite
         
         try
         {
+            @SuppressWarnings("rawtypes")
             Class clazz = Class.forName("org.alfresco.repo.content.routing.StoreSelectorAspectContentStoreTest");
             suite.addTestSuite(clazz);
         }
diff --git a/source/java/org/alfresco/repo/content/ContentMinimalContextTestSuite.java b/source/java/org/alfresco/repo/content/ContentMinimalContextTestSuite.java
index 0316f94177..b6daf8160f 100644
--- a/source/java/org/alfresco/repo/content/ContentMinimalContextTestSuite.java
+++ b/source/java/org/alfresco/repo/content/ContentMinimalContextTestSuite.java
@@ -18,6 +18,10 @@
  */
 package org.alfresco.repo.content;
 
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.alfresco.repo.content.metadata.DWGMetadataExtracterTest;
 import org.alfresco.repo.content.metadata.HtmlMetadataExtracterTest;
 import org.alfresco.repo.content.metadata.MP3MetadataExtracterTest;
@@ -53,12 +57,6 @@ import org.alfresco.service.cmr.repository.TransformationOptionPairTest;
 import org.alfresco.util.ApplicationContextHelper;
 import org.springframework.context.ApplicationContext;
 
-import com.google.gdata.data.acl.AclRole;
-
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Metadata Extractor and Transform test suite
  *