Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-04-28 07:22:11 +0000
committerEike Stepper2015-04-28 07:23:34 +0000
commita205e6ca1364adaa12bf5cb6ef9642e5d394fd09 (patch)
tree85a0342f47be8e41762ff173db17d23a0babe93c /plugins/org.eclipse.emf.cdo.dawn.tests
parent78e1c324c06816ca50cb2947c7e582103757bd4d (diff)
downloadcdo-a205e6ca1364adaa12bf5cb6ef9642e5d394fd09.tar.gz
cdo-a205e6ca1364adaa12bf5cb6ef9642e5d394fd09.tar.xz
cdo-a205e6ca1364adaa12bf5cb6ef9642e5d394fd09.zip
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.tests')
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnWrapperResourceTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java5
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());

Back to the top