diff options
author | Ibrahim Sallam | 2010-06-14 02:31:26 +0000 |
---|---|---|
committer | Ibrahim Sallam | 2010-06-14 02:31:26 +0000 |
commit | bcae3a4a90d7bda9ce186595a0409b0da4200dd4 (patch) | |
tree | 29545e80b5bb294711bdc3696dd949b18ecaf562 /plugins/org.eclipse.emf.cdo.tests.objectivity | |
parent | 02830327db2eed89bbe274a2a3abc9a4797cfe08 (diff) | |
download | cdo-bcae3a4a90d7bda9ce186595a0409b0da4200dd4.tar.gz cdo-bcae3a4a90d7bda9ce186595a0409b0da4200dd4.tar.xz cdo-bcae3a4a90d7bda9ce186595a0409b0da4200dd4.zip |
rearrange the tests.
Fixing compiler warning.
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.objectivity')
5 files changed, 15 insertions, 15 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java index 7ec6fabf0d..5beb63bd05 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java @@ -73,8 +73,8 @@ public class AllTestsObjyAudit extends ObjyDBConfigs protected void initRepositoryProperties(Map<String, String> props) { super.initRepositoryProperties(props); - props.put(IRepository.Props.SUPPORTING_AUDITS, "true"); - props.put(IRepository.Props.SUPPORTING_BRANCHES, "false"); + props.put(IRepository.Props.SUPPORTING_AUDITS, "true"); //$NON-NLS-1$ + props.put(IRepository.Props.SUPPORTING_BRANCHES, "false"); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java index 020d801617..3cc1e62980 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java @@ -12,9 +12,6 @@ package org.eclipse.emf.cdo.tests.objectivity; import org.eclipse.emf.cdo.server.IRepository; -import org.eclipse.emf.cdo.tests.BranchingTest; -import org.eclipse.emf.cdo.tests.BranchingTestSameSession; -import org.eclipse.emf.cdo.tests.MergingTest; import org.eclipse.emf.cdo.tests.config.impl.ConfigTest; import java.util.List; @@ -45,10 +42,10 @@ public class AllTestsObjyBranching extends ObjyDBConfigs { super.initTestClasses(testClasses); - // add branching tests for this testsuite - testClasses.add(BranchingTest.class); - testClasses.add(BranchingTestSameSession.class); - testClasses.add(MergingTest.class); + // // add branching tests for this testsuite + // testClasses.add(BranchingTest.class); + // testClasses.add(BranchingTestSameSession.class); + // testClasses.add(MergingTest.class); } @Override @@ -82,8 +79,8 @@ public class AllTestsObjyBranching extends ObjyDBConfigs protected void initRepositoryProperties(Map<String, String> props) { super.initRepositoryProperties(props); - props.put(IRepository.Props.SUPPORTING_AUDITS, "true"); - props.put(IRepository.Props.SUPPORTING_BRANCHES, "true"); + props.put(IRepository.Props.SUPPORTING_AUDITS, "true"); //$NON-NLS-1$ + props.put(IRepository.Props.SUPPORTING_BRANCHES, "true"); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java index 7050ce3bcd..44d054d915 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java @@ -91,8 +91,8 @@ public class AllTestsObjyNonAudit extends ObjyDBConfigs protected void initRepositoryProperties(Map<String, String> props) { super.initRepositoryProperties(props); - props.put(IRepository.Props.SUPPORTING_AUDITS, "false"); - props.put(IRepository.Props.SUPPORTING_BRANCHES, "false"); + props.put(IRepository.Props.SUPPORTING_AUDITS, "false"); //$NON-NLS-1$ + props.put(IRepository.Props.SUPPORTING_BRANCHES, "false"); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyBranchManagementTest.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyBranchManagementTest.java index b954643e1b..f1536b6bc0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyBranchManagementTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyBranchManagementTest.java @@ -478,7 +478,7 @@ public class ObjyBranchManagementTest { dbStore.begin(); ObjyBranch objyBranch = dbStore.getBranchManager().getBranch(branchId); - Iterator itr = objyBranch.getRevisions(); + Iterator<?> itr = objyBranch.getRevisions(); List<Temp> actualList = new ArrayList<Temp>(); while (itr.hasNext()) { diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java index a0e4900006..d843b07a39 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java @@ -18,11 +18,13 @@ import org.eclipse.emf.cdo.tests.BranchingTestSameSession; import org.eclipse.emf.cdo.tests.ChunkingTest; import org.eclipse.emf.cdo.tests.ChunkingWithMEMTest; import org.eclipse.emf.cdo.tests.CommitInfoTest; +import org.eclipse.emf.cdo.tests.ComplexTest; import org.eclipse.emf.cdo.tests.DetachTest; import org.eclipse.emf.cdo.tests.ExternalReferenceTest; import org.eclipse.emf.cdo.tests.InvalidationTest; import org.eclipse.emf.cdo.tests.LockingManagerTest; import org.eclipse.emf.cdo.tests.MergingTest; +import org.eclipse.emf.cdo.tests.MultiValuedOfAttributeTest; import org.eclipse.emf.cdo.tests.PushTransactionTest; import org.eclipse.emf.cdo.tests.RepositoryTest; import org.eclipse.emf.cdo.tests.ResourceTest; @@ -72,7 +74,7 @@ public class SampleTestsObjy extends ObjyDBConfigs testClasses.clear(); - // testClasses.add(ComplexTest.class); + testClasses.add(ComplexTest.class); // testClasses.add(AttributeTest.class); testClasses.add(UnsetTest.class); testClasses.add(BranchingTest.class); @@ -91,6 +93,7 @@ public class SampleTestsObjy extends ObjyDBConfigs // testClasses.add(XATransactionTest.class); testClasses.add(RepositoryTest.class); testClasses.add(LockingManagerTest.class); + testClasses.add(MultiValuedOfAttributeTest.class); testClasses.add(Bugzilla_248124_Test.class); testClasses.add(Bugzilla_258933_Test.class); testClasses.add(Bugzilla_259869_Test.class); |