diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.tests')
3 files changed, 7 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java index f52e3bbbaa..8c9f3bb372 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java @@ -10,9 +10,9 @@ */ package org.eclipse.emf.cdo.dawn.tests; -import org.eclipse.emf.cdo.dawn.resources.impl.DawnResourceFactoryImpl; import org.eclipse.emf.cdo.dawn.tests.common.GMFTest; import org.eclipse.emf.cdo.eresource.CDOResource; +import org.eclipse.emf.cdo.eresource.impl.CDOResourceFactoryImpl; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; import org.eclipse.emf.cdo.transaction.CDOTransaction; @@ -45,7 +45,7 @@ public abstract class AbstractDawnTest extends AbstractCDOTest protected ResourceSet createResourceSet() { ResourceSet dawnResourceSet = new ResourceSetImpl(); - dawnResourceSet.getResourceFactoryRegistry().getProtocolToFactoryMap().put("dawn", new DawnResourceFactoryImpl()); + dawnResourceSet.getResourceFactoryRegistry().getProtocolToFactoryMap().put("dawn", new CDOResourceFactoryImpl()); return dawnResourceSet; } @@ -73,8 +73,7 @@ public abstract class AbstractDawnTest extends AbstractCDOTest Diagram notationalRoot = (Diagram)gmfResource.getContents().get(0); - ResourceSet dawnResourceSet = new ResourceSetImpl(); - dawnResourceSet.getResourceFactoryRegistry().getProtocolToFactoryMap().put("dawn", new DawnResourceFactoryImpl()); + ResourceSet dawnResourceSet = createResourceSet(); CDOTransaction transaction = session.openTransaction(dawnResourceSet); diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnWrapperResourceTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnWrapperResourceTest.java index fe70ca3b9b..bd120bb857 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnWrapperResourceTest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnWrapperResourceTest.java @@ -10,8 +10,8 @@ */ package org.eclipse.emf.cdo.dawn.tests.common; -import org.eclipse.emf.cdo.dawn.resources.DawnWrapperResource; import org.eclipse.emf.cdo.dawn.tests.AbstractDawnTest; +import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.common.util.URI; @@ -37,7 +37,7 @@ public class DawnWrapperResourceTest extends AbstractDawnTest Resource resource = resourceSet.createResource(URI.createURI("dawn://repo1/default10.acore_diagram")); - assertInstanceOf(DawnWrapperResource.class, resource); + assertInstanceOf(CDOResource.class, resource); resource.save(Collections.EMPTY_MAP); diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java index 81cf9ddef3..f86aa350c6 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java @@ -12,7 +12,6 @@ package org.eclipse.emf.cdo.dawn.tests.common; import org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot; import org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage; -import org.eclipse.emf.cdo.dawn.resources.DawnWrapperResource; import org.eclipse.emf.cdo.dawn.tests.AbstractDawnTest; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; @@ -43,9 +42,9 @@ public class TestFrameworkTest extends AbstractDawnTest CDOResource semanticResource = transaction.getResource("/simple.acore"); assertInstanceOf(CDOResource.class, semanticResource); - DawnWrapperResource notationalResource = (DawnWrapperResource)resourceSet + CDOResource notationalResource = (CDOResource)resourceSet .getResource(URI.createURI("dawn://repo1/simple.acore_diagram"), true);// container.getNotationalResource(); - assertInstanceOf(DawnWrapperResource.class, notationalResource); + assertInstanceOf(CDOResource.class, notationalResource); ACoreRoot acoreRoot = (ACoreRoot)semanticResource.getContents().get(0); assertEquals(3, acoreRoot.getClasses().size()); |