From 35ab604549997dc743e80ceda96daf630ade9160 Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Wed, 25 Jun 2014 16:31:57 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)    74238:
 Add missing tests in the Maven build.    Re-enable assertions in repository
 test execution, now that the test with the failing assertion is gone

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml                                                  | 1 -
 source/test-java/org/alfresco/AllUnitTestsSuite.java     | 1 +
 source/test-java/org/alfresco/Repository01TestSuite.java | 3 +++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a4bc96fde1..f6fbe5d40d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -830,7 +830,6 @@
                               </goals>
                               <configuration>
                                   <forkMode>always</forkMode>
-                                  <enableAssertions>false</enableAssertions> <!-- Failed assertion in AVMServiceTest.testDiffOrder() -->
                                   <includes combine.self="override">
                                       <include>**/org/alfresco/Repository*TestSuite.java</include>
                                   </includes>
diff --git a/source/test-java/org/alfresco/AllUnitTestsSuite.java b/source/test-java/org/alfresco/AllUnitTestsSuite.java
index 4972cfc3f9..c1e4d7fd00 100644
--- a/source/test-java/org/alfresco/AllUnitTestsSuite.java
+++ b/source/test-java/org/alfresco/AllUnitTestsSuite.java
@@ -31,6 +31,7 @@ public class AllUnitTestsSuite extends TestSuite
         suite.addTestSuite(org.alfresco.filesys.repo.CIFSContentComparatorTest.class);
         suite.addTestSuite(org.alfresco.filesys.repo.rules.ShuffleTest.class);
         suite.addTestSuite(org.alfresco.repo.admin.Log4JHierarchyInitTest.class);
+        suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.attributes.PropTablesCleanupJobTest.class));
         suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.cache.DefaultCacheFactoryTest.class));
         suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.cache.DefaultSimpleCacheTest.class));
         suite.addTestSuite(org.alfresco.repo.cache.lookup.EntityLookupCacheTest.class);
diff --git a/source/test-java/org/alfresco/Repository01TestSuite.java b/source/test-java/org/alfresco/Repository01TestSuite.java
index abc8b8f820..36a8fca2a4 100644
--- a/source/test-java/org/alfresco/Repository01TestSuite.java
+++ b/source/test-java/org/alfresco/Repository01TestSuite.java
@@ -419,5 +419,8 @@ public class Repository01TestSuite extends TestSuite
     static void tests65(TestSuite suite)
     {
         suite.addTestSuite(org.alfresco.repo.content.transform.DifferrentMimeTypeTest.class);
+        suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.attributes.PropTablesCleanupJobIntegrationTest.class));
+        suite.addTestSuite(org.alfresco.repo.dictionary.DictionaryModelTypeTest.class);
+        suite.addTestSuite(org.alfresco.repo.tagging.UpdateTagScopesActionExecuterTest.class);
     }
 }