Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMélanie Bats2015-11-06 06:03:00 -0500
committerMélanie Bats2015-11-09 09:19:46 -0500
commit179a899caf1763718596fea89109c89a05383e56 (patch)
tree073ef0d74dc38a932b907673de8a05b454ed13f3 /tests
parentd279e9aafeccdd9fa9bc8d418d855cb2bc20f0ff (diff)
downloadorg.eclipse.eef-179a899caf1763718596fea89109c89a05383e56.tar.gz
org.eclipse.eef-179a899caf1763718596fea89109c89a05383e56.tar.xz
org.eclipse.eef-179a899caf1763718596fea89109c89a05383e56.zip
Update the expression DSL
Update the ecore Update expression dsl xtext editor Rename the project to org.eclipse.sirius.expression.text Update the dsl according to the expression.ecore evolutions Change-Id: I33f9e3ed6eabc95ee24b231651c819cec3b4f1b8 Signed-off-by: Mélanie Bats<melanie.bats@obeo.fr>
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.sirius.expression.dsl.tests/.classpath9
-rw-r--r--tests/org.eclipse.sirius.expression.dsl.tests/.project34
-rw-r--r--tests/org.eclipse.sirius.expression.dsl.tests/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--tests/org.eclipse.sirius.expression.dsl.tests/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.sirius.expression.dsl.tests/META-INF/MANIFEST.MF24
-rw-r--r--tests/org.eclipse.sirius.expression.dsl.tests/build.properties5
-rw-r--r--tests/org.eclipse.sirius.expression.dsl.tests/org.eclipse.sirius.expression.dsl.tests.launch13
-rw-r--r--tests/org.eclipse.sirius.expression.dsl.tests/src-gen/org/eclipse/sirius/expression/dsl/ExpressionDSLInjectorProvider.java48
-rw-r--r--tests/org.eclipse.sirius.expression.dsl.tests/src-gen/org/eclipse/sirius/expression/dsl/ExpressionDSLUiInjectorProvider.java17
9 files changed, 0 insertions, 159 deletions
diff --git a/tests/org.eclipse.sirius.expression.dsl.tests/.classpath b/tests/org.eclipse.sirius.expression.dsl.tests/.classpath
deleted file mode 100644
index 9081d4f70..000000000
--- a/tests/org.eclipse.sirius.expression.dsl.tests/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.sirius.expression.dsl.tests/.project b/tests/org.eclipse.sirius.expression.dsl.tests/.project
deleted file mode 100644
index f8e7b17bb..000000000
--- a/tests/org.eclipse.sirius.expression.dsl.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.sirius.expression.dsl.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.sirius.expression.dsl.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.sirius.expression.dsl.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/tests/org.eclipse.sirius.expression.dsl.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/tests/org.eclipse.sirius.expression.dsl.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.sirius.expression.dsl.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/tests/org.eclipse.sirius.expression.dsl.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/tests/org.eclipse.sirius.expression.dsl.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.sirius.expression.dsl.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 5b9487a95..000000000
--- a/tests/org.eclipse.sirius.expression.dsl.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.sirius.expression.dsl.tests
-Bundle-Vendor: My Company
-Bundle-Version: 1.0.0.qualifier
-Bundle-SymbolicName: org.eclipse.sirius.expression.dsl.tests; singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.sirius.expression.dsl,
- org.eclipse.sirius.expression.dsl.ui,
- org.eclipse.core.runtime,
- org.eclipse.xtext.junit4,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.ui.workbench;resolution:=optional,
- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional
-Import-Package: org.apache.log4j,
- org.junit;version="4.5.0",
- org.junit.runner;version="4.5.0",
- org.junit.runner.manipulation;version="4.5.0",
- org.junit.runner.notification;version="4.5.0",
- org.junit.runners;version="4.5.0",
- org.junit.runners.model;version="4.5.0",
- org.hamcrest.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.sirius.expression.dsl
diff --git a/tests/org.eclipse.sirius.expression.dsl.tests/build.properties b/tests/org.eclipse.sirius.expression.dsl.tests/build.properties
deleted file mode 100644
index c22eebe28..000000000
--- a/tests/org.eclipse.sirius.expression.dsl.tests/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/,\
- src-gen/,\
- xtend-gen/
-bin.includes = META-INF/,\
- .
diff --git a/tests/org.eclipse.sirius.expression.dsl.tests/org.eclipse.sirius.expression.dsl.tests.launch b/tests/org.eclipse.sirius.expression.dsl.tests/org.eclipse.sirius.expression.dsl.tests.launch
deleted file mode 100644
index 377fd6b45..000000000
--- a/tests/org.eclipse.sirius.expression.dsl.tests/org.eclipse.sirius.expression.dsl.tests.launch
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.sirius.expression.dsl.tests"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.sirius.expression.dsl.tests"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.sirius.expression.dsl.tests"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.sirius.expression.dsl.tests/src-gen/org/eclipse/sirius/expression/dsl/ExpressionDSLInjectorProvider.java b/tests/org.eclipse.sirius.expression.dsl.tests/src-gen/org/eclipse/sirius/expression/dsl/ExpressionDSLInjectorProvider.java
deleted file mode 100644
index 1ec490a01..000000000
--- a/tests/org.eclipse.sirius.expression.dsl.tests/src-gen/org/eclipse/sirius/expression/dsl/ExpressionDSLInjectorProvider.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.sirius.expression.dsl;
-
-import org.eclipse.xtext.junit4.GlobalRegistries;
-import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
-import org.eclipse.xtext.junit4.IInjectorProvider;
-import org.eclipse.xtext.junit4.IRegistryConfigurator;
-
-import com.google.inject.Injector;
-
-public class ExpressionDSLInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
-
- protected GlobalStateMemento stateBeforeInjectorCreation;
- protected GlobalStateMemento stateAfterInjectorCreation;
- protected Injector injector;
-
- static {
- GlobalRegistries.initializeDefaults();
- }
-
- @Override
- public Injector getInjector()
- {
- if (injector == null) {
- stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
- this.injector = internalCreateInjector();
- stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
- }
- return injector;
- }
-
- protected Injector internalCreateInjector() {
- return new ExpressionDSLStandaloneSetup().createInjectorAndDoEMFRegistration();
- }
-
- @Override
- public void restoreRegistry() {
- stateBeforeInjectorCreation.restoreGlobalState();
- }
-
- @Override
- public void setupRegistry() {
- getInjector();
- stateAfterInjectorCreation.restoreGlobalState();
- }
-}
diff --git a/tests/org.eclipse.sirius.expression.dsl.tests/src-gen/org/eclipse/sirius/expression/dsl/ExpressionDSLUiInjectorProvider.java b/tests/org.eclipse.sirius.expression.dsl.tests/src-gen/org/eclipse/sirius/expression/dsl/ExpressionDSLUiInjectorProvider.java
deleted file mode 100644
index 439f58e07..000000000
--- a/tests/org.eclipse.sirius.expression.dsl.tests/src-gen/org/eclipse/sirius/expression/dsl/ExpressionDSLUiInjectorProvider.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.eclipse.sirius.expression.dsl;
-
-import org.eclipse.xtext.junit4.IInjectorProvider;
-
-import com.google.inject.Injector;
-
-public class ExpressionDSLUiInjectorProvider implements IInjectorProvider {
-
- @Override
- public Injector getInjector() {
- return org.eclipse.sirius.expression.dsl.ui.internal.ExpressionDSLActivator.getInstance().getInjector("org.eclipse.sirius.expression.dsl.ExpressionDSL");
- }
-
-}

Back to the top