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
This commit is contained in:
Will Abson
2014-06-25 16:31:57 +00:00
parent fc0688f871
commit 35ab604549
3 changed files with 4 additions and 1 deletions

View File

@@ -830,7 +830,6 @@
</goals> </goals>
<configuration> <configuration>
<forkMode>always</forkMode> <forkMode>always</forkMode>
<enableAssertions>false</enableAssertions> <!-- Failed assertion in AVMServiceTest.testDiffOrder() -->
<includes combine.self="override"> <includes combine.self="override">
<include>**/org/alfresco/Repository*TestSuite.java</include> <include>**/org/alfresco/Repository*TestSuite.java</include>
</includes> </includes>

View File

@@ -31,6 +31,7 @@ public class AllUnitTestsSuite extends TestSuite
suite.addTestSuite(org.alfresco.filesys.repo.CIFSContentComparatorTest.class); suite.addTestSuite(org.alfresco.filesys.repo.CIFSContentComparatorTest.class);
suite.addTestSuite(org.alfresco.filesys.repo.rules.ShuffleTest.class); suite.addTestSuite(org.alfresco.filesys.repo.rules.ShuffleTest.class);
suite.addTestSuite(org.alfresco.repo.admin.Log4JHierarchyInitTest.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.DefaultCacheFactoryTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.cache.DefaultSimpleCacheTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.cache.DefaultSimpleCacheTest.class));
suite.addTestSuite(org.alfresco.repo.cache.lookup.EntityLookupCacheTest.class); suite.addTestSuite(org.alfresco.repo.cache.lookup.EntityLookupCacheTest.class);

View File

@@ -419,5 +419,8 @@ public class Repository01TestSuite extends TestSuite
static void tests65(TestSuite suite) static void tests65(TestSuite suite)
{ {
suite.addTestSuite(org.alfresco.repo.content.transform.DifferrentMimeTypeTest.class); 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);
} }
} }