Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorashatalin2009-01-14 09:26:53 -0500
committerashatalin2009-01-14 09:26:53 -0500
commit079c4c6741917fc7e5c1ebd1d4a9e6fdb9219811 (patch)
tree4fca80f575ddb4b97da292ee31d658fafc628491
parent75c7fa1a125de7ab72d524957e16418b491e0c48 (diff)
downloadorg.eclipse.gmf-tooling-079c4c6741917fc7e5c1ebd1d4a9e6fdb9219811.tar.gz
org.eclipse.gmf-tooling-079c4c6741917fc7e5c1ebd1d4a9e6fdb9219811.tar.xz
org.eclipse.gmf-tooling-079c4c6741917fc7e5c1ebd1d4a9e6fdb9219811.zip
Test was updated in accordance with latest changes in templates.v20090114-0930
-rw-r--r--tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/RuntimeCompilationTest.java15
1 files changed, 5 insertions, 10 deletions
diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/RuntimeCompilationTest.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/RuntimeCompilationTest.java
index a4bffba0f..3abdf2bab 100644
--- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/RuntimeCompilationTest.java
+++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/RuntimeCompilationTest.java
@@ -225,21 +225,16 @@ public class RuntimeCompilationTest extends CompilationTest {
xe = xf.compile("/plugin/extension[@point = 'org.eclipse.ui.commands']/command[starts-with(@name,'testaction-')]");
result = (NodeList) xe.evaluate(parsedManifest, XPathConstants.NODESET);
assertEquals(3, result.getLength());
- // XXX perhaps, should use either defaultHandler or oe.ui.handlers extp contribution, not both?
- String dh1 = result.item(0).getAttributes().getNamedItem("defaultHandler").getNodeValue();
- String dh2 = result.item(1).getAttributes().getNamedItem("defaultHandler").getNodeValue();
- String dh3 = result.item(2).getAttributes().getNamedItem("defaultHandler").getNodeValue();
- assertEquals(a1.getQualifiedClassName(), dh1); // ordering change might affect test result
- assertEquals(a2.getQualifiedClassName(), dh2);
- assertEquals(a3.getQualifiedClassName(), dh3);
//
xe = xf.compile("/plugin/extension[@point = 'org.eclipse.ui.handlers']/handler");
result = (NodeList) xe.evaluate(parsedManifest, XPathConstants.NODESET);
- assertEquals(2, result.getLength());
+ assertEquals(3, result.getLength());
String h1 = result.item(0).getAttributes().getNamedItem("class").getNodeValue();
String h2 = result.item(1).getAttributes().getNamedItem("class").getNodeValue();
- assertEquals(a2.getQualifiedClassName(), h1);
- assertEquals(a3.getQualifiedClassName(), h2);
+ String h3 = result.item(2).getAttributes().getNamedItem("class").getNodeValue();
+ assertEquals(a1.getQualifiedClassName(), h1);
+ assertEquals(a2.getQualifiedClassName(), h2);
+ assertEquals(a3.getQualifiedClassName(), h3);
// check real files for handlers
IFile file_a1 = generatedProject.getFile("/src/" + a1.getQualifiedClassName().replace('.', '/') + ".java");

Back to the top