diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs')
8 files changed, 83 insertions, 86 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java index fe81b68138..ca3fcdfed4 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java @@ -1,12 +1,12 @@ /*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. + * Copyright (c) 2004 - 2008 André Dietisheim, Germany. * 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 + * André Dietisheim - initial API and implementation **************************************************************************/ package org.eclipse.emf.cdo.tests.defs; @@ -19,7 +19,7 @@ import junit.framework.Test; import junit.framework.TestSuite; /** - * @author Eike Stepper + * @author André Dietisheim */ public class AllTestsCDODefs extends ConfigTestSuite { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java index 661bcce382..e3ea8cdd2b 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java @@ -1,25 +1,25 @@ /*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. + * Copyright (c) 2004 - 2008 André Dietisheim, Germany. * 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 + * André Dietisheim - initial API and implementation **************************************************************************/ package org.eclipse.emf.cdo.tests.defs; import org.eclipse.emf.cdo.CDOAudit; import org.eclipse.emf.cdo.CDOTransaction; -import org.eclipse.emf.cdo.cdodefs.CDOAuditDef; -import org.eclipse.emf.cdo.cdodefs.util.CDODefsUtil; +import org.eclipse.emf.cdo.defs.CDOAuditDef; +import org.eclipse.emf.cdo.defs.util.CDODefsUtil; import org.eclipse.emf.cdo.tests.AbstractCDOTest; import org.eclipse.emf.cdo.tests.config.IRepositoryConfig; import org.eclipse.emf.cdo.tests.config.impl.SessionConfig; import org.eclipse.emf.cdo.tests.model1.Customer; -import org.eclipse.net4j.net4jdefs.util.Net4jDefsUtil; +import org.eclipse.net4j.defs.util.Net4jDefsUtil; import org.eclipse.net4j.util.concurrent.ConcurrencyUtil; import org.eclipse.emf.ecore.EObject; @@ -29,7 +29,7 @@ import java.util.Date; import java.util.GregorianCalendar; /** - * @author Eike Stepper + * @author André Dietisheim */ public class CDOAuditDefImplTest extends AbstractCDOTest { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOPackageRegistryDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOPackageRegistryDefImplTest.java index 9779fdf436..1d07d3ed65 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOPackageRegistryDefImplTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOPackageRegistryDefImplTest.java @@ -1,19 +1,19 @@ /*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. + * Copyright (c) 2004 - 2008 André Dietisheim, Germany. * 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 + * André Dietisheim - initial API and implementation **************************************************************************/ package org.eclipse.emf.cdo.tests.defs; -import org.eclipse.emf.cdo.cdodefs.CDODefsFactory; -import org.eclipse.emf.cdo.cdodefs.CDOPackageRegistryDef; -import org.eclipse.emf.cdo.cdodefs.EGlobalPackageDef; -import org.eclipse.emf.cdo.cdodefs.EPackageDef; +import org.eclipse.emf.cdo.defs.CDODefsFactory; +import org.eclipse.emf.cdo.defs.CDOPackageRegistryDef; +import org.eclipse.emf.cdo.defs.EGlobalPackageDef; +import org.eclipse.emf.cdo.defs.EPackageDef; import org.eclipse.emf.cdo.tests.AbstractCDOTest; import org.eclipse.emf.cdo.tests.model1.Model1Package; import org.eclipse.emf.cdo.tests.model2.Model2Package; @@ -22,7 +22,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EPackage; /** - * @author Eike Stepper + * @author André Dietisheim */ public class CDOPackageRegistryDefImplTest extends AbstractCDOTest { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOResourceDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOResourceDefImplTest.java index 5e6fbec297..fcbb81f3f3 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOResourceDefImplTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOResourceDefImplTest.java @@ -1,32 +1,32 @@ /*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. + * Copyright (c) 2004 - 2008 André Dietisheim, Germany. * 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 + * André Dietisheim - initial API and implementation **************************************************************************/ package org.eclipse.emf.cdo.tests.defs; import org.eclipse.emf.cdo.CDOTransaction; -import org.eclipse.emf.cdo.cdodefs.CDOResourceDef; -import org.eclipse.emf.cdo.cdodefs.CDOSessionDef; -import org.eclipse.emf.cdo.cdodefs.ResourceMode; -import org.eclipse.emf.cdo.cdodefs.util.CDODefsUtil; +import org.eclipse.emf.cdo.defs.CDOResourceDef; +import org.eclipse.emf.cdo.defs.CDOSessionDef; +import org.eclipse.emf.cdo.defs.ResourceMode; +import org.eclipse.emf.cdo.defs.util.CDODefsUtil; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.tests.AbstractCDOTest; import org.eclipse.emf.cdo.tests.config.IRepositoryConfig; import org.eclipse.emf.cdo.tests.config.impl.SessionConfig; import org.eclipse.emf.cdo.util.InvalidURIException; -import org.eclipse.net4j.net4jdefs.util.Net4jDefsUtil; +import org.eclipse.net4j.defs.util.Net4jDefsUtil; import org.eclipse.emf.common.util.WrappedException; /** - * @author Eike Stepper + * @author André Dietisheim */ public class CDOResourceDefImplTest extends AbstractCDOTest { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java index 59965f9859..a6895f6057 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java @@ -1,28 +1,28 @@ /*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. + * Copyright (c) 2004 - 2008 André Dietisheim, Germany. * 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 + * André Dietisheim - initial API and implementation **************************************************************************/ package org.eclipse.emf.cdo.tests.defs; import org.eclipse.emf.cdo.CDOSession; -import org.eclipse.emf.cdo.cdodefs.CDODefsFactory; -import org.eclipse.emf.cdo.cdodefs.CDOSessionDef; -import org.eclipse.emf.cdo.cdodefs.util.CDODefsUtil; +import org.eclipse.emf.cdo.defs.CDODefsFactory; +import org.eclipse.emf.cdo.defs.CDOSessionDef; +import org.eclipse.emf.cdo.defs.util.CDODefsUtil; import org.eclipse.emf.cdo.tests.AbstractCDOTest; import org.eclipse.emf.cdo.tests.config.IRepositoryConfig; import org.eclipse.emf.cdo.tests.config.impl.SessionConfig; -import org.eclipse.net4j.net4jdefs.util.Net4jDefsUtil; +import org.eclipse.net4j.defs.util.Net4jDefsUtil; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; /** - * @author Eike Stepper + * @author André Dietisheim */ public class CDOSessionDefImplTest extends AbstractCDOTest { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java index 5e311f3976..8ff2574fb9 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java @@ -1,29 +1,29 @@ /*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. + * Copyright (c) 2004 - 2008 André Dietisheim, Germany. * 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 + * André Dietisheim - initial API and implementation **************************************************************************/ package org.eclipse.emf.cdo.tests.defs; import org.eclipse.emf.cdo.CDOTransaction; -import org.eclipse.emf.cdo.cdodefs.CDOSessionDef; -import org.eclipse.emf.cdo.cdodefs.CDOTransactionDef; -import org.eclipse.emf.cdo.cdodefs.util.CDODefsUtil; +import org.eclipse.emf.cdo.defs.CDOSessionDef; +import org.eclipse.emf.cdo.defs.CDOTransactionDef; +import org.eclipse.emf.cdo.defs.util.CDODefsUtil; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.tests.AbstractCDOTest; import org.eclipse.emf.cdo.tests.config.IRepositoryConfig; import org.eclipse.emf.cdo.tests.config.impl.SessionConfig; import org.eclipse.emf.cdo.tests.model1.Customer; -import org.eclipse.net4j.net4jdefs.util.Net4jDefsUtil; +import org.eclipse.net4j.defs.util.Net4jDefsUtil; /** - * @author Eike Stepper + * @author André Dietisheim */ public class CDOTransactionDefImplTest extends AbstractCDOTest { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOViewDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOViewDefImplTest.java index 9bae1e411e..b9b7d2977d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOViewDefImplTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOViewDefImplTest.java @@ -1,77 +1,79 @@ /*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. + * Copyright (c) 2004 - 2008 André Dietisheim, Germany. * 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 + * André Dietisheim - initial API and implementation **************************************************************************/ package org.eclipse.emf.cdo.tests.defs; import org.eclipse.emf.cdo.CDOTransaction; import org.eclipse.emf.cdo.CDOView; -import org.eclipse.emf.cdo.cdodefs.CDODefsFactory; -import org.eclipse.emf.cdo.cdodefs.CDOSessionDef; -import org.eclipse.emf.cdo.cdodefs.CDOViewDef; -import org.eclipse.emf.cdo.cdodefs.util.CDODefsUtil; import org.eclipse.emf.cdo.common.CDOProtocolView.Type; +import org.eclipse.emf.cdo.defs.CDODefsFactory; +import org.eclipse.emf.cdo.defs.CDOSessionDef; +import org.eclipse.emf.cdo.defs.CDOViewDef; +import org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl; +import org.eclipse.emf.cdo.defs.util.CDODefsUtil; import org.eclipse.emf.cdo.tests.AbstractCDOTest; import org.eclipse.emf.cdo.tests.config.IRepositoryConfig; import org.eclipse.emf.cdo.tests.config.impl.SessionConfig; -import org.eclipse.net4j.net4jdefs.TCPConnectorDef; -import org.eclipse.net4j.net4jdefs.util.Net4jDefsUtil; +import org.eclipse.net4j.defs.TCPConnectorDef; +import org.eclipse.net4j.defs.util.Net4jDefsUtil; +import org.eclipse.net4j.util.lifecycle.LifecycleUtil; /** - * @author Eike Stepper + * @author André Dietisheim */ public class CDOViewDefImplTest extends AbstractCDOTest { - private static final String RESOURCE_ID = "/test1"; + private CDOViewDef cdoViewDef; - public void testCreateView() - { + private CDOSessionDef cdoSessionDef; - CDOViewDef cdoViewDef = CDODefsFactory.eINSTANCE.createCDOViewDef(); - TCPConnectorDef tcpConnectorDef = Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST); - CDOSessionDef cdoSessionDef = CDODefsUtil.createSessionDef(// + private TCPConnectorDef tcpConnectorDef; + + @Override + protected void doSetUp() throws Exception + { + super.doSetUp(); + cdoViewDef = CDODefsFactory.eINSTANCE.createCDOViewDef(); + tcpConnectorDef = Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST); + cdoSessionDef = CDODefsUtil.createSessionDef(// IRepositoryConfig.REPOSITORY_NAME, // CDODefsUtil.createEagerPackageRegistryDef(), // tcpConnectorDef); cdoViewDef.setCdoSessionDef( // cdoSessionDef); + } - CDOView cdoView = (CDOView)cdoViewDef.getInstance(); - assertTrue(cdoView.getViewType() == Type.READONLY); - - // cleanup + @Override + protected void doTearDown() throws Exception + { cdoViewDef.unsetInstance(); cdoSessionDef.unsetInstance(); tcpConnectorDef.unsetInstance(); + super.doTearDown(); } - public void testCreateViewCreatesOnceAndReuses() + private static final String RESOURCE_ID = "/test1"; + + public void testCreateView() { - CDOViewDef cdoViewDef = CDODefsFactory.eINSTANCE.createCDOViewDef(); - TCPConnectorDef tcpConnectorDef = Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST); - CDOSessionDef cdoSessionDef = CDODefsUtil.createSessionDef(// - IRepositoryConfig.REPOSITORY_NAME, // - CDODefsUtil.createEagerPackageRegistryDef(), // - tcpConnectorDef); - cdoViewDef.setCdoSessionDef( // - cdoSessionDef); + CDOView cdoView = (CDOView)cdoViewDef.getInstance(); + assertTrue(cdoView.getViewType() == Type.READONLY); + } + public void testCreateViewCreatesOnceAndReuses() + { CDOView thisCdoViewReference = (CDOView)cdoViewDef.getInstance(); CDOView thatCdoViewReference = (CDOView)cdoViewDef.getInstance(); assertTrue(thisCdoViewReference == thatCdoViewReference); - - // cleanup - cdoViewDef.unsetInstance(); - cdoSessionDef.unsetInstance(); - tcpConnectorDef.unsetInstance(); } public void testViewCreatedCanRead() @@ -80,23 +82,18 @@ public class CDOViewDefImplTest extends AbstractCDOTest transaction.createResource(RESOURCE_ID); transaction.commit(); - CDOViewDef cdoViewDef = CDODefsFactory.eINSTANCE.createCDOViewDef(); - TCPConnectorDef tcpConnectorDef = Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST); - CDOSessionDef cdoSessionDef = CDODefsUtil.createSessionDef(// - IRepositoryConfig.REPOSITORY_NAME, // - CDODefsUtil.createEagerPackageRegistryDef(), // - tcpConnectorDef); - cdoViewDef.setCdoSessionDef( // - cdoSessionDef); - CDOView cdoView = (CDOView)cdoViewDef.getInstance(); assertEquals(true, cdoView.hasResource(RESOURCE_ID)); assertEquals(false, cdoView.hasResource("/test2")); + } - // cleanup - cdoViewDef.unsetInstance(); - cdoSessionDef.unsetInstance(); - tcpConnectorDef.unsetInstance(); + public void testViewMayBeUnset() + { + CDOView cdoView = (CDOView)cdoViewDef.getInstance(); + cdoViewDef.unsetInstance(); // deactivates instance + assertTrue(((CDOViewDefImpl)cdoViewDef).getInternalInstance() == null); + assertTrue(!LifecycleUtil.isActive(cdoView)); } + } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/EGlobalPackageDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/EGlobalPackageDefImplTest.java index df92bd08a7..4baee515d4 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/EGlobalPackageDefImplTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/EGlobalPackageDefImplTest.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.emf.cdo.tests.defs; -import org.eclipse.emf.cdo.cdodefs.CDODefsFactory; -import org.eclipse.emf.cdo.cdodefs.EGlobalPackageDef; +import org.eclipse.emf.cdo.defs.CDODefsFactory; +import org.eclipse.emf.cdo.defs.EGlobalPackageDef; import org.eclipse.emf.cdo.tests.AbstractCDOTest; import org.eclipse.emf.ecore.EPackage; |