summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Efftinge2011-09-05 13:49:44 (EDT)
committer Ed Merks2011-09-05 13:49:44 (EDT)
commitbda416f65e60517402be12b226aa9b3684b06fdf (patch)
tree51f2c260f22fc4a0999dbab7f425a8de850cd04b
parent4840cf9652198d85ed49eb513621bd0e57727f48 (diff)
downloadorg.eclipse.emf-bda416f65e60517402be12b226aa9b3684b06fdf.zip
org.eclipse.emf-bda416f65e60517402be12b226aa9b3684b06fdf.tar.gz
org.eclipse.emf-bda416f65e60517402be12b226aa9b3684b06fdf.tar.bz2
fixed generator test
-rw-r--r--org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/generator/GeneratorTest.xtend3
-rw-r--r--org.eclipse.emf.ecore.xcore.tests/xtend-gen/org/eclipse/emf/ecore/xcore/tests/generator/GeneratorTest.java5
2 files changed, 6 insertions, 2 deletions
diff --git a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/generator/GeneratorTest.xtend b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/generator/GeneratorTest.xtend
index f3b8a6f..2adf58e 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/generator/GeneratorTest.xtend
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/generator/GeneratorTest.xtend
@@ -14,6 +14,7 @@ import org.junit.Test
import org.junit.runner.RunWith
import static org.junit.Assert.*
+import org.eclipse.xtext.generator.IFileSystemAccess
@RunWith(typeof(XtextRunner))
@InjectWith(typeof(XcoreInjectorProvider))
@@ -41,6 +42,6 @@ class GeneratorTest {
xcoreGenerator.doGenerate(xPackage.eResource, inmemFsa)
assertEquals(inmemFsa.files.keySet.toString, 8, inmemFsa.files.size)
- assertNotNull(inmemFsa.files.get('test/util/TestSwitch.java'))
+ assertNotNull(inmemFsa.files.get(IFileSystemAccess::DEFAULT_OUTPUT+'test/util/TestSwitch.java'))
}
} \ No newline at end of file
diff --git a/org.eclipse.emf.ecore.xcore.tests/xtend-gen/org/eclipse/emf/ecore/xcore/tests/generator/GeneratorTest.java b/org.eclipse.emf.ecore.xcore.tests/xtend-gen/org/eclipse/emf/ecore/xcore/tests/generator/GeneratorTest.java
index a771745..5f7e310 100644
--- a/org.eclipse.emf.ecore.xcore.tests/xtend-gen/org/eclipse/emf/ecore/xcore/tests/generator/GeneratorTest.java
+++ b/org.eclipse.emf.ecore.xcore.tests/xtend-gen/org/eclipse/emf/ecore/xcore/tests/generator/GeneratorTest.java
@@ -8,11 +8,13 @@ import org.eclipse.emf.ecore.xcore.XPackage;
import org.eclipse.emf.ecore.xcore.XcoreInjectorProvider;
import org.eclipse.emf.ecore.xcore.generator.XcoreGenerator;
import org.eclipse.emf.ecore.xcore.mappings.XcoreMapper;
+import org.eclipse.xtext.generator.IFileSystemAccess;
import org.eclipse.xtext.generator.InMemoryFileSystemAccess;
import org.eclipse.xtext.junit4.InjectWith;
import org.eclipse.xtext.junit4.XtextRunner;
import org.eclipse.xtext.junit4.util.ParseHelper;
import org.eclipse.xtext.junit4.validation.ValidationTestHelper;
+import org.eclipse.xtext.xbase.lib.StringExtensions;
import org.eclipse.xtext.xtend2.lib.StringConcatenation;
import org.junit.Assert;
import org.junit.Test;
@@ -56,7 +58,8 @@ public class GeneratorTest {
int _size = _files_1.size();
Assert.assertEquals(_string, 8, _size);
Map<String,CharSequence> _files_2 = inmemFsa.getFiles();
- CharSequence _get = _files_2.get("test/util/TestSwitch.java");
+ String _operator_plus = StringExtensions.operator_plus(IFileSystemAccess.DEFAULT_OUTPUT, "test/util/TestSwitch.java");
+ CharSequence _get = _files_2.get(_operator_plus);
Assert.assertNotNull(_get);
}
}