[EOL acceptance tests] Simplify some EUnitRunner-based tests by using a private package registry (refs #511514)
diff --git a/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/CollectionPropertyTests.eol b/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/CollectionPropertyTests.eol
index b3d2c6d..b340ded 100644
--- a/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/CollectionPropertyTests.eol
+++ b/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/CollectionPropertyTests.eol
@@ -1,17 +1,17 @@
@test
operation collectEClassNames() {
- assertEquals(ecore::EClass.all.name.size(), 20);
+ assertEquals(EClass.all.name.size(), 20);
}
@test
operation collectEClassUnknownProperties() {
- assertError(ecore::EClass.all.unknownProperty);
+ assertError(EClass.all.unknownProperty);
}
@test
operation collectMixedCollectionProperties() {
var col : Sequence;
- col.addAll(ecore::EClass.all);
- col.addAll(ecore::EPackage.all);
+ col.addAll(EClass.all);
+ col.addAll(EPackage.all);
assertEquals(21, col.name.size());
}
\ No newline at end of file
diff --git a/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/CreateDeleteTests.eol b/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/CreateDeleteTests.eol
index dfc6b77..aa577df 100644
--- a/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/CreateDeleteTests.eol
+++ b/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/CreateDeleteTests.eol
@@ -1,23 +1,23 @@
@test
operation testCreate() {
- var prev = ecore::EClass.all.size();
- var x : new ecore::EClass;
- var next = ecore::EClass.all.size();
+ var prev = EClass.all.size();
+ var x : new EClass;
+ var next = EClass.all.size();
assertEquals(prev+1, next);
}
---@test
+@test
operation testDelete() {
- var prev = ecore::EClass.all.size();
- var x = ecore::EClass.all.random();
+ var prev = EClass.all.size();
+ var x = EClass.all.random();
delete x;
- var next = ecore::EClass.all.size();
+ var next = EClass.all.size();
assertEquals(prev-1, next);
}
---@test
+@test
operation testDeleteAll() {
- delete ecore::EClass.all;
- var next = ecore::EClass.all.size();
+ delete EClass.all;
+ var next = EClass.all.size();
assertEquals(0, next);
}
\ No newline at end of file
diff --git a/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/TransactionTests.eol b/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/TransactionTests.eol
index 03ee3ba..c3abbf0 100644
--- a/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/TransactionTests.eol
+++ b/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/TransactionTests.eol
@@ -1,14 +1,14 @@
@test
operation testCommit() {
- var oldName = ecore::EClass.all.first.name;
+ var oldName = EClass.all.first.name;
transaction {
- ecore::EClass.all.first.name = "foo";
+ EClass.all.first.name = "foo";
}
- assertEquals("foo", ecore::EClass.all.first.name);
+ assertEquals("foo", EClass.all.first.name);
// We need to reset the name as models
// are not re-initialised before every @test
- ecore::EClass.all.first.name = oldName;
+ EClass.all.first.name = oldName;
}
@test
@@ -17,9 +17,9 @@
oldName.println();
transaction Ecore {
- ecore::EClass.all.first.name = "foo";
+ EClass.all.first.name = "foo";
abort;
}
- assertEquals(oldName, ecore::EClass.all.first.name);
+ assertEquals(oldName, EClass.all.first.name);
}
diff --git a/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/eunit/EUnitRunner.java b/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/eunit/EUnitRunner.java
index d82eee8..c75bbd9 100644
--- a/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/eunit/EUnitRunner.java
+++ b/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/eunit/EUnitRunner.java
@@ -143,7 +143,7 @@
ResourceSet rs = new ResourceSetImpl();
rs.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl());
Resource r = rs.createResource(URI.createFileURI("foo.xmi"));
- InMemoryEmfModel ecore = new InMemoryEmfModel("Ecore", r);
+ InMemoryEmfModel ecore = new InMemoryEmfModel("Ecore", r, EcorePackage.eINSTANCE);
EObject copy = EcoreUtil.copy(EcorePackage.eINSTANCE.eResource().getContents().get(0));
r.getContents().add(copy);
rs.getResources().add(r);
