Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Fluegge2010-10-08 16:50:42 +0000
committerMartin Fluegge2010-10-08 16:50:42 +0000
commit01700460fd91df78dc01bd6f026f7077fe98fa5a (patch)
treee6ba381e5d16f66d0ae28ee41d2d65c43f4ce0f1 /plugins/org.eclipse.emf.cdo.dawn.tests
parent7bfe12fe5466a6f34e467252dcac8839ac3f1e4e (diff)
downloadcdo-01700460fd91df78dc01bd6f026f7077fe98fa5a.tar.gz
cdo-01700460fd91df78dc01bd6f026f7077fe98fa5a.tar.xz
cdo-01700460fd91df78dc01bd6f026f7077fe98fa5a.zip
[323828] [Dawn] Provide collaborative EMF editors on CDO
https://bugs.eclipse.org/bugs/show_bug.cgi?id=323828
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.tests')
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/testdata/model/acore.dawngenmodel11
3 files changed, 13 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
index 336b48ef6a..fcf94343be 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.gmf.xpand;bundle-version="[2.1.0,3.0.0)",
org.eclipse.emf.mwe.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.mwe.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.cdo.dawn.codegen;bundle-version="[0.2.100,1.0.0)",
+ org.eclipse.emf.cdo.dawn.codegen;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.cdo.tests.ui;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.dawn.examples.acore.editor;bundle-version="[1.0.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java
index cc90020521..98d9214857 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java
@@ -54,6 +54,9 @@ public class DawnCodeGenGMFFragmentTest extends AbstractDawnTest
String diagramFolder = ouputFolder + "/" + "src/org/eclipse/emf/cdo/dawn/examples/acore/diagram";
assertEquals(true, new File(outputFolder + "/META-INF/Manifest.MF").exists());
+ assertEquals(true, new File(outputFolder + "/fragment.xml").exists());
+ assertEquals(true, new File(outputFolder + "/build.properties").exists());
+
assertEquals(true, new File(diagramFolder + "/edit/").exists());
assertEquals(true, new File(diagramFolder + "/edit/parts/DawnAcoreEditPartFactory.java").exists());
assertEquals(true, new File(diagramFolder + "/edit/parts/DawnACoreRootEditPart.java").exists());
@@ -68,6 +71,7 @@ public class DawnCodeGenGMFFragmentTest extends AbstractDawnTest
assertEquals(true, new File(diagramFolder + "/providers/").exists());
assertEquals(true, new File(diagramFolder + "/providers/DawnAcoreEditPartProvider.java").exists());
assertEquals(true, new File(diagramFolder + "/providers/DawnAcoreEditPolicyProvider.java").exists());
+
basicCompare(new File(new URI(DawnTestPlatform.instance.getBundlePathForClass(DawnAcoreDiagramEditor.class)
+ ".dawn/src/")), new File(outputFolder + "/src"));
}
@@ -98,11 +102,6 @@ public class DawnCodeGenGMFFragmentTest extends AbstractDawnTest
{
for (File child : reference.listFiles())
{
- // TODO: fix the problematic files
- // if (child.getName().equals("DawnAcoreCreationWizard.java"))
- // {
- // continue;
- // }
basicCompare(child, new File(expected + "/" + child.getName()));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/testdata/model/acore.dawngenmodel b/plugins/org.eclipse.emf.cdo.dawn.tests/testdata/model/acore.dawngenmodel
index ac80bb9dd8..5bb35863d8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/testdata/model/acore.dawngenmodel
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/testdata/model/acore.dawngenmodel
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="ASCII"?>
-<dawngenmodel:DawnGMFGenerator xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:dawngenmodel="http://www.eclipse.org/emf/cdo/dawn/2010/GenModel" fragmentName="org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn" dawnEditorClassName="DawnAcoreDiagramEditor" dawnDocumentProviderClassName="DawnAcoreDocumentProvider" dawnEditorUtilClassName="DawnAcoreDiagramEditorUtil" dawnCreationWizardClassName="DawnAcoreCreationWizard" dawnCanonicalEditingPolicyClassName="DawnACoreRootCanonicalEditPolicy" dawnDiagramEditPartClassName="DawnACoreRootEditPart" dawnEditPartFactoryClassName="DawnAcoreEditPartFactory" dawnEditPartProviderClassName="DawnAcoreEditPartProvider" dawnEditPolicyProviderClassName="DawnAcoreEditPolicyProvider">
- <GMFGenEditorGenerator href="acore.gmfgen#/"/>
-</dawngenmodel:DawnGMFGenerator>
+<dawngenmodel:DawnGenerator xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:dawngenmodel="http://www.eclipse.org/emf/cdo/dawn/2010/GenModel">
+ <emfFragmentgenerator fragmentName="org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn" dawnEditorClassName="DawnAcoreEditor">
+ <emfGenModel href="acore.genmodel#/"/>
+ </emfFragmentgenerator>
+ <gmfFragmentgenerator fragmentName="org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn" dawnEditorClassName="DawnAcoreDiagramEditor" dawnDocumentProviderClassName="DawnAcoreDocumentProvider" dawnEditorUtilClassName="DawnAcoreDiagramEditorUtil" dawnCreationWizardClassName="DawnAcoreCreationWizard" dawnCanonicalEditingPolicyClassName="DawnACoreRootCanonicalEditPolicy" dawnDiagramEditPartClassName="DawnACoreRootEditPart" dawnEditPartFactoryClassName="DawnAcoreEditPartFactory" dawnEditPartProviderClassName="DawnAcoreEditPartProvider" dawnEditPolicyProviderClassName="DawnAcoreEditPolicyProvider">
+ <GMFGenEditorGenerator href="acore.gmfgen#/"/>
+ </gmfFragmentgenerator>
+</dawngenmodel:DawnGenerator>

Back to the top