diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf')
12 files changed, 5 insertions, 144 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 1b16ba8280..a5c715be7a 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 @@ -96,7 +96,6 @@ public abstract class AllConfigs extends ConfigTestSuite testClasses.add(DynamicXSDTest.class); testClasses.add(SetFeatureTest.class); testClasses.add(DynamicPackageTest.class); - testClasses.add(LegacyTest.class); testClasses.add(XRefTest.class); testClasses.add(StickyViewsTest.class); testClasses.add(LobTest.class); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LegacyTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LegacyTest.java deleted file mode 100644 index b803f01455..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LegacyTest.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - * Martin Fluegge - recreation of the test case - */ -package org.eclipse.emf.cdo.tests; - -import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.session.CDOSession; -import org.eclipse.emf.cdo.tests.model1.Customer; -import org.eclipse.emf.cdo.transaction.CDOTransaction; -import org.eclipse.emf.cdo.util.CDOUtil; -import org.eclipse.emf.cdo.util.LegacyModeNotEnabledException; - -/** - * @author Eike Stepper - */ -public class LegacyTest extends AbstractCDOTest -{ - public void testLegacyModeEnabled() throws Exception - { - Customer customer = getModel1Factory().createCustomer(); - customer.setName("Martin Fluegge"); - customer.setStreet("ABC Street 7"); - customer.setCity("Berlin"); - - CDOSession session = openSession(); - CDOUtil.setLegacyModeDefault(false); - CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource(getResourcePath("/test1")); - - try - { - resource.getContents().add(customer); - transaction.commit(); - - if (isConfig(LEGACY)) - { - fail("LegacyModeNotEnabledException expected"); - } - } - catch (LegacyModeNotEnabledException ex) - { - if (!isConfig(LEGACY)) - { - fail("Native mode should not throw an exception here (" + ex.getMessage() + ")"); - } - } - } -} diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java index 75b8ae1600..4fd9072ddc 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java @@ -29,7 +29,6 @@ import org.eclipse.emf.cdo.tests.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.subpackage.Class2; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; -import org.eclipse.emf.cdo.util.LegacyModeNotEnabledException; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; @@ -333,51 +332,6 @@ public class PackageRegistryTest extends AbstractCDOTest } } - public void testGlobalDynamicPackageUnprepared() throws Exception - { - String nsURI = "http://dynamic"; - - try - { - EPackage p = EcoreFactory.eINSTANCE.createEPackage(); - p.setName("dynamic"); - p.setNsPrefix("dynamic"); - p.setNsURI(nsURI); - - EClass c = EcoreFactory.eINSTANCE.createEClass(); - c.setName("DClass"); - - p.getEClassifiers().add(c); - EPackage.Registry.INSTANCE.put(nsURI, p); - - CDOSession session = openSession(); - - // The default case is that legacy is disabled. For our test bed it is always enabled. - // To test the default case we must switch of legacy here. - CDOUtil.setLegacyModeDefault(false); - - CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource(getResourcePath("/res")); - - EFactory factory = p.getEFactoryInstance(); - EObject object = factory.create(c); - - res.getContents().add(object); - transaction.commit(); - session.close(); - - fail("LegacyModeNotEnabledException expected"); - } - catch (LegacyModeNotEnabledException expected) - { - // SUCCESS - } - finally - { - EPackage.Registry.INSTANCE.remove(nsURI); - } - } - @CleanRepositoriesBefore public void testDynamicPackageFactory() throws Exception { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java index 9d8ce2f568..2ecfebb919 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java @@ -219,7 +219,7 @@ public class RepositoryTest extends AbstractCDOTest public void handleTransactionBeforeCommitting(ITransaction transaction, CommitContext commitContext, OMMonitor monitor) throws RuntimeException { - CDOView view = CDOServerUtil.openView(commitContext, isConfig(LEGACY)); + CDOView view = CDOServerUtil.openView(commitContext); for (CDORevision revision : commitContext.getNewObjects()) { EObject object = view.getObject(revision.getID()); @@ -274,7 +274,7 @@ public class RepositoryTest extends AbstractCDOTest resource.getContents().add(createCustomer("Eike")); transaction.commit(); // Ensure that model1 is committed to the repository - getRepository().addHandler(new ObjectWriteAccessHandler(isConfig(LEGACY)) + getRepository().addHandler(new ObjectWriteAccessHandler() { @Override protected void handleTransactionBeforeCommitting(OMMonitor monitor) throws RuntimeException diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java index dc10c05ca6..4fd7968af3 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java @@ -118,14 +118,12 @@ public class WorkspaceTest extends AbstractCDOTest JVMUtil.prepareContainer(getClientContainer()); localStore = createLocalStore(); - CDOUtil.setLegacyModeDefault(true); } @Override protected void doTearDown() throws Exception { disableConsole(); - CDOUtil.setLegacyModeDefault(false); for (CDOWorkspace workspace : workspaces) { IOUtil.closeSilent(workspace); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java index b89a8975bc..da68c03ce2 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java @@ -31,7 +31,6 @@ import org.eclipse.emf.cdo.tests.model1.SalesOrder; import org.eclipse.emf.cdo.tests.model1.VAT; import org.eclipse.emf.cdo.tests.util.TestSessionConfiguration; import org.eclipse.emf.cdo.transaction.CDOTransaction; -import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.CommitException; import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.cdo.workspace.CDOWorkspace; @@ -118,15 +117,12 @@ public class Bugzilla_327604_Test extends AbstractCDOTest JVMUtil.prepareContainer(getClientContainer()); localStore = createLocalStore(); - - CDOUtil.setLegacyModeDefault(true); } @Override protected void doTearDown() throws Exception { disableConsole(); - CDOUtil.setLegacyModeDefault(false); for (CDOWorkspace workspace : workspaces) { IOUtil.closeSilent(workspace); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_355915_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_355915_Test.java index be5d25e207..0b977c55d2 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_355915_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_355915_Test.java @@ -16,7 +16,6 @@ import org.eclipse.emf.cdo.tests.AbstractCDOTest; import org.eclipse.emf.cdo.tests.config.IModelConfig; import org.eclipse.emf.cdo.tests.model1.Customer; import org.eclipse.emf.cdo.transaction.CDOTransaction; -import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.CommitException; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; @@ -49,8 +48,6 @@ public class Bugzilla_355915_Test extends AbstractCDOTest public void testInvalidationNotification() throws Exception { CDOSession session = openSession(); - CDOUtil.setLegacyModeDefault(true); - CDOTransaction transaction1 = session.openTransaction(); transaction1.options().setInvalidationNotificationEnabled(true); @@ -73,8 +70,6 @@ public class Bugzilla_355915_Test extends AbstractCDOTest public void run() { CDOSession session = openSession(); - CDOUtil.setLegacyModeDefault(true); - CDOTransaction transaction2 = session.openTransaction(); Resource resource2 = transaction2.getResource(getResourcePath(RESOURCE_PATH)); @@ -105,8 +100,6 @@ public class Bugzilla_355915_Test extends AbstractCDOTest public void testDeltaNotification() throws Exception { CDOSession session = openSession(); - CDOUtil.setLegacyModeDefault(true); - CDOTransaction transaction1 = session.openTransaction(); transaction1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); @@ -129,8 +122,6 @@ public class Bugzilla_355915_Test extends AbstractCDOTest public void run() { CDOSession session = openSession(); - CDOUtil.setLegacyModeDefault(true); - CDOTransaction transaction2 = session.openTransaction(); Resource resource2 = transaction2.getResource(getResourcePath(RESOURCE_PATH)); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359992_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359992_Test.java index 76f2edd0f5..36f6891b57 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359992_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359992_Test.java @@ -22,7 +22,6 @@ import org.eclipse.emf.cdo.tests.model1.Customer; import org.eclipse.emf.cdo.tests.model1.SalesOrder; import org.eclipse.emf.cdo.tests.model1.legacy.Model1Factory; import org.eclipse.emf.cdo.transaction.CDOTransaction; -import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.CommitException; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; @@ -37,7 +36,7 @@ import java.util.concurrent.TimeUnit; /** * Bug 359992. - * + * * @author Martin Fluegge */ public class Bugzilla_359992_Test extends AbstractCDOTest @@ -58,7 +57,6 @@ public class Bugzilla_359992_Test extends AbstractCDOTest public void testInvalidationNotification() throws Exception { CDOSession session = openSession(); - CDOUtil.setLegacyModeDefault(true); CDONet4jSession.Options options = (Options)session.options(); options.setCommitTimeout(10 * CommitTransactionRequest.DEFAULT_MONITOR_TIMEOUT_SECONDS); @@ -77,8 +75,6 @@ public class Bugzilla_359992_Test extends AbstractCDOTest session.close(); session = openSession(); - CDOUtil.setLegacyModeDefault(true); - transaction1 = session.openTransaction(); transaction1.options().setInvalidationNotificationEnabled(true); @@ -100,7 +96,6 @@ public class Bugzilla_359992_Test extends AbstractCDOTest public void testDeltaNotification() throws Exception { CDOSession session = openSession(); - CDOUtil.setLegacyModeDefault(true); CDONet4jSession.Options options = (Options)session.options(); options.setCommitTimeout(10 * CommitTransactionRequest.DEFAULT_MONITOR_TIMEOUT_SECONDS); @@ -119,8 +114,6 @@ public class Bugzilla_359992_Test extends AbstractCDOTest session.close(); session = openSession(); - CDOUtil.setLegacyModeDefault(true); - transaction1 = session.openTransaction(); transaction1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); @@ -154,7 +147,6 @@ public class Bugzilla_359992_Test extends AbstractCDOTest private void doClient2() throws CommitException { CDOSession session = openSession(); - CDOUtil.setLegacyModeDefault(true); CDONet4jSession.Options options = (Options)session.options(); options.setCommitTimeout(10 * CommitTransactionRequest.DEFAULT_MONITOR_TIMEOUT_SECONDS); CDOTransaction transaction2 = session.openTransaction(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_362270_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_362270_Test.java index b497305b27..77bd8be720 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_362270_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_362270_Test.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -19,7 +19,6 @@ import org.eclipse.emf.cdo.tests.model1.Company; import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; import org.eclipse.emf.cdo.tests.model1.Supplier; import org.eclipse.emf.cdo.transaction.CDOTransaction; -import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.notify.Notification; @@ -50,7 +49,7 @@ import java.util.Map; /** * Test case for {@link CDODeltaNotification#getNewValue()} which must returns a local {@link EObject} contained in a * {@link XMIResource} because a {@link CDOObject} stored in a {@link CDOResource} references the local {@link EObject}. - * + * * @author Esteban Dugueperoux */ public class Bugzilla_362270_Test extends AbstractCDOTest @@ -74,7 +73,6 @@ public class Bugzilla_362270_Test extends AbstractCDOTest obeoCompany.getSuppliers().add(martinSupplier); CDOSession session = openSession(); - CDOUtil.setLegacyModeDefault(true); final CDOTransaction cdoTransaction = session.openTransaction(resourceSet); CDOResource cdoResource = cdoTransaction.createResource(getResourcePath("/test1")); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_376620_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_376620_Test.java index 4a26178e41..793b29dc99 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_376620_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_376620_Test.java @@ -20,7 +20,6 @@ import org.eclipse.emf.cdo.tests.config.IModelConfig; import org.eclipse.emf.cdo.tests.model1.Supplier; import org.eclipse.emf.cdo.tests.model1.legacy.Model1Factory; import org.eclipse.emf.cdo.transaction.CDOTransaction; -import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.CommitException; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; @@ -50,7 +49,6 @@ public class Bugzilla_376620_Test extends AbstractCDOTest public void testDeltaNotification() throws Exception { CDOSession session = openSession(); - CDOUtil.setLegacyModeDefault(true); CDONet4jSession.Options options = (Options)session.options(); options.setCommitTimeout(10 * CommitTransactionRequest.DEFAULT_MONITOR_TIMEOUT_SECONDS); @@ -69,8 +67,6 @@ public class Bugzilla_376620_Test extends AbstractCDOTest session.close(); session = openSession(); - CDOUtil.setLegacyModeDefault(true); - transaction1 = session.openTransaction(); transaction1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); @@ -99,7 +95,6 @@ public class Bugzilla_376620_Test extends AbstractCDOTest private void doClient2() throws CommitException { CDOSession session = openSession(); - CDOUtil.setLegacyModeDefault(true); CDONet4jSession.Options options = (Options)session.options(); options.setCommitTimeout(10 * CommitTransactionRequest.DEFAULT_MONITOR_TIMEOUT_SECONDS); CDOTransaction transaction2 = session.openTransaction(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_392956_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_392956_Test.java index 267eb20e27..3afbd9f242 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_392956_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_392956_Test.java @@ -16,7 +16,6 @@ import org.eclipse.emf.cdo.tests.model6.Holdable; import org.eclipse.emf.cdo.tests.model6.Holder; import org.eclipse.emf.cdo.tests.model6.Thing; import org.eclipse.emf.cdo.transaction.CDOTransaction; -import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.resource.Resource; @@ -32,8 +31,6 @@ public class Bugzilla_392956_Test extends AbstractCDOTest Holder rootHolder = createModel(); CDOSession session = openSession(); - CDOUtil.setLegacyModeDefault(true); - CDOTransaction transaction = session.openTransaction(); Resource resource = transaction.getOrCreateResource(getResourcePath("model.model7")); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java index 8922a07be9..e166b54e38 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java @@ -23,7 +23,6 @@ import org.eclipse.emf.cdo.tests.config.IConfig; import org.eclipse.emf.cdo.tests.config.IRepositoryConfig; import org.eclipse.emf.cdo.tests.config.ISessionConfig; import org.eclipse.emf.cdo.tests.util.TestRevisionManager; -import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.view.CDOFetchRuleManager; import org.eclipse.emf.cdo.view.CDOViewProvider; import org.eclipse.emf.cdo.view.CDOViewProviderRegistry; @@ -207,8 +206,6 @@ public abstract class SessionConfig extends Config implements ISessionConfig IOUtil.delete(lobCache); } }); - - CDOUtil.setLegacyModeDefault(true); } private Set<String> captureGlobalPackageRegistry() |