Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2020-06-10 03:18:54 +0000
committerEike Stepper2020-06-10 03:18:54 +0000
commit43947903f962f428e225da7c68f9412d8a0f1e8e (patch)
tree60cc8bf66e876a9018fab4885779f4bd070398ce
parent4c46695b30588970102507731384bb408d2568d6 (diff)
downloadcdo-43947903f962f428e225da7c68f9412d8a0f1e8e.tar.gz
cdo-43947903f962f428e225da7c68f9412d8a0f1e8e.tar.xz
cdo-43947903f962f428e225da7c68f9412d8a0f1e8e.zip
[Releng] Undo temporary test reduction
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java161
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java2
2 files changed, 78 insertions, 85 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
index 6ec355c41f..eba63ba360 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
@@ -41,90 +41,83 @@ public class AllConfigs extends ConfigTestSuite
{
// testClasses.add(ConflictResolverExtendedTest.class);
- if (false)
- {
- // General
- testClasses.add(InitialTest.class);
- testClasses.add(CDOIDTest.class);
- testClasses.add(ComplexTest.class);
- testClasses.add(AttributeTest.class);
- // testClasses.add(CommitPerformanceTest.class);
- // testClasses.add(BigModelTest.class);
- testClasses.add(EnumTest.class);
- testClasses.add(EMapTest.class);
- testClasses.add(UnsetTest.class);
- testClasses.add(StateMachineTest.class);
- testClasses.add(SessionTest.class);
- testClasses.add(ReconnectingSessionTest.class);
- testClasses.add(RevisionManagerTest.class);
- testClasses.add(RevisionManagerClientSideTest.class);
- testClasses.add(BranchingTest.class);
- testClasses.add(BranchingSameSessionTest.class);
- testClasses.add(BranchingWithCacheClearTest.class);
- testClasses.add(MergingTest.class);
- testClasses.add(ViewTest.class);
- testClasses.add(TransactionTest.class);
- testClasses.add(PushTransactionTest.class);
- testClasses.add(PushTransactionWithoutReconstructSavepointsTest.class);
- testClasses.add(CommitInfoTest.class);
- testClasses.add(SecurityTest.class);
- testClasses.add(AuditTest.class);
- testClasses.add(AuditEMapTest.class);
- testClasses.add(AuditSameSessionTest.class);
- testClasses.add(ResourceTest.class);
- testClasses.add(ContainmentTest.class);
- testClasses.add(InvalidationTest.class);
- testClasses.add(RollbackTest.class);
- testClasses.add(CrossReferenceTest.class);
- testClasses.add(ChunkingTest.class);
- testClasses.add(ChunkingClearCachedRevisionTest.class);
- testClasses.add(MEMStoreQueryTest.class);
- testClasses.add(PackageRegistryTest.class);
- testClasses.add(PartialCommitTest.class);
- testClasses.add(MetaTest.class);
- testClasses.add(RevisionDeltaTest.class);
- testClasses.add(RevisionDeltaInBranchTest.class);
- testClasses.add(RevisionDeltaCascadingBranchesTest.class);
- testClasses.add(IndexReconstructionTest.class);
- testClasses.add(AutoAttacherTest.class);
- testClasses.add(SavePointTest.class);
- testClasses.add(ChangeSubscriptionTest.class);
- testClasses.add(DetachTest.class);
- testClasses.add(ExternalReferenceTest.class);
- testClasses.add(XATransactionTest.class);
- testClasses.add(TransactionHandlerTest.class);
- testClasses.add(RepositoryTest.class);
- testClasses.add(LockingManagerTest.class);
- testClasses.add(LockingManagerRestartTransactionTest.class);
- testClasses.add(LockingManagerRestartSessionTest.class);
- testClasses.add(LockingManagerRestartRepositoryTest.class);
- testClasses.add(LockingNotificationsTest.class);
- testClasses.add(LockingSequenceTest.class);
- testClasses.add(MultiValuedOfAttributeTest.class);
- testClasses.add(MapTest.class);
- testClasses.add(AdapterManagerTest.class);
- testClasses.add(ConflictResolverTest.class);
- testClasses.add(ConflictResolverExtendedTest.class);
- testClasses.add(DynamicXSDTest.class);
- testClasses.add(SetFeatureTest.class);
- testClasses.add(DynamicPackageTest.class);
- testClasses.add(XRefTest.class);
- testClasses.add(StickyViewsTest.class);
- testClasses.add(LobTest.class);
- testClasses.add(EMFCompareTest.class);
- testClasses.add(OCLQueryTest.class);
- testClasses.add(OCLQueryTest.Lazy.class);
- testClasses.add(ViewProviderTest.class);
- testClasses.add(WorkspaceTest.class);
- testClasses.add(BackupTest.class);
- testClasses.add(BackupBinaryTest.class);
- testClasses.add(ResourceModificationTrackingTest.class);
- testClasses.add(CDOStaleReferencePolicyTest.class);
-
- // TODO testClasses.add(RemoteSessionManagerTest.class);
- // TODO testClasses.add(NonCDOResourceTest.class);
- // TODO testClasses.add(GeneratedEcoreTest.class);
- }
+ // General
+ testClasses.add(InitialTest.class);
+ testClasses.add(CDOIDTest.class);
+ testClasses.add(ComplexTest.class);
+ testClasses.add(AttributeTest.class);
+ // testClasses.add(CommitPerformanceTest.class);
+ // testClasses.add(BigModelTest.class);
+ testClasses.add(EnumTest.class);
+ testClasses.add(EMapTest.class);
+ testClasses.add(UnsetTest.class);
+ testClasses.add(StateMachineTest.class);
+ testClasses.add(SessionTest.class);
+ testClasses.add(ReconnectingSessionTest.class);
+ testClasses.add(RevisionManagerTest.class);
+ testClasses.add(RevisionManagerClientSideTest.class);
+ testClasses.add(BranchingTest.class);
+ testClasses.add(BranchingSameSessionTest.class);
+ testClasses.add(BranchingWithCacheClearTest.class);
+ testClasses.add(MergingTest.class);
+ testClasses.add(ViewTest.class);
+ testClasses.add(TransactionTest.class);
+ testClasses.add(PushTransactionTest.class);
+ testClasses.add(PushTransactionWithoutReconstructSavepointsTest.class);
+ testClasses.add(CommitInfoTest.class);
+ testClasses.add(SecurityTest.class);
+ testClasses.add(AuditTest.class);
+ testClasses.add(AuditEMapTest.class);
+ testClasses.add(AuditSameSessionTest.class);
+ testClasses.add(ResourceTest.class);
+ testClasses.add(ContainmentTest.class);
+ testClasses.add(InvalidationTest.class);
+ testClasses.add(RollbackTest.class);
+ testClasses.add(CrossReferenceTest.class);
+ testClasses.add(ChunkingTest.class);
+ testClasses.add(ChunkingClearCachedRevisionTest.class);
+ testClasses.add(MEMStoreQueryTest.class);
+ testClasses.add(PackageRegistryTest.class);
+ testClasses.add(PartialCommitTest.class);
+ testClasses.add(MetaTest.class);
+ testClasses.add(RevisionDeltaTest.class);
+ testClasses.add(RevisionDeltaInBranchTest.class);
+ testClasses.add(RevisionDeltaCascadingBranchesTest.class);
+ testClasses.add(IndexReconstructionTest.class);
+ testClasses.add(AutoAttacherTest.class);
+ testClasses.add(SavePointTest.class);
+ testClasses.add(ChangeSubscriptionTest.class);
+ testClasses.add(DetachTest.class);
+ testClasses.add(ExternalReferenceTest.class);
+ testClasses.add(XATransactionTest.class);
+ testClasses.add(TransactionHandlerTest.class);
+ testClasses.add(RepositoryTest.class);
+ testClasses.add(LockingManagerTest.class);
+ testClasses.add(LockingManagerRestartTransactionTest.class);
+ testClasses.add(LockingManagerRestartSessionTest.class);
+ testClasses.add(LockingManagerRestartRepositoryTest.class);
+ testClasses.add(LockingNotificationsTest.class);
+ testClasses.add(LockingSequenceTest.class);
+ testClasses.add(MultiValuedOfAttributeTest.class);
+ testClasses.add(MapTest.class);
+ testClasses.add(AdapterManagerTest.class);
+ testClasses.add(ConflictResolverTest.class);
+ testClasses.add(ConflictResolverExtendedTest.class);
+ testClasses.add(DynamicXSDTest.class);
+ testClasses.add(SetFeatureTest.class);
+ testClasses.add(DynamicPackageTest.class);
+ testClasses.add(XRefTest.class);
+ testClasses.add(StickyViewsTest.class);
+ testClasses.add(LobTest.class);
+ testClasses.add(EMFCompareTest.class);
+ testClasses.add(OCLQueryTest.class);
+ testClasses.add(OCLQueryTest.Lazy.class);
+ testClasses.add(ViewProviderTest.class);
+ testClasses.add(WorkspaceTest.class);
+ testClasses.add(BackupTest.class);
+ testClasses.add(BackupBinaryTest.class);
+ testClasses.add(ResourceModificationTrackingTest.class);
+ testClasses.add(CDOStaleReferencePolicyTest.class);
// Bugzilla verifications
testClasses.addAll(getBugzillaTests());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java
index dbd7c9e466..1a19794876 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java
@@ -101,7 +101,7 @@ public abstract class ConfigTestSuite implements IConstants
for (Iterator<Class<?>> it = bundle.getClasses(); it.hasNext();)
{
Class<?> c = it.next();
- if (ConfigTest.class.isAssignableFrom(c) && c.getName().startsWith(packageName + ".Bugzilla_4"))
+ if (ConfigTest.class.isAssignableFrom(c) && c.getName().startsWith(packageName))
{
@SuppressWarnings("unchecked")
Class<? extends ConfigTest> configTest = (Class<? extends ConfigTest>)c;

Back to the top