125: disabled FJ and FJ cached tests

Task-Url: #125
eclipse · Dec 3, 2019 · ed210c4 · ed210c4
1 parent 9965ba3
commit ed210c4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/examples/org.eclipse.xsemantics.example.fj.tests/pom.xml b/examples/org.eclipse.xsemantics.example.fj.tests/pom.xml
@@ -30,7 +30,7 @@ Contributors:
 				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
-					<skip>${dsl.tests.skip}</skip>
+					<skip>true</skip>
 					<useUIHarness>false</useUIHarness>
 					<useUIThread>false</useUIThread>
 					<!-- tycho.testArgLine repeated to re-use the configuration for argLine 

diff --git a/examples/org.eclipse.xsemantics.example.fj/build.properties b/examples/org.eclipse.xsemantics.example.fj/build.properties
@@ -12,8 +12,8 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.eclipse.emf.codegen.ecore,\
                      org.eclipse.emf.mwe.utils,\
                      org.eclipse.emf.mwe2.launch,\
-                     org.eclipse.emf.mwe2.lib,\
                      org.objectweb.asm,\
                      org.apache.commons.logging,\
                      org.apache.log4j,\
-                     com.ibm.icu
+                     com.ibm.icu
+
diff --git a/examples/org.eclipse.xsemantics.example.fjcached.tests/pom.xml b/examples/org.eclipse.xsemantics.example.fjcached.tests/pom.xml
@@ -35,7 +35,7 @@ Contributors:
 						<id>default-test</id>
 						<phase>integration-test</phase>
 						<configuration>
-							<skip>${dsl.tests.skip}</skip>
+							<skip>true</skip>
 							<useUIHarness>false</useUIHarness>
 							<useUIThread>false</useUIThread>
 							<!-- tycho.testArgLine repeated to re-use the configuration for argLine 
@@ -53,7 +53,7 @@ Contributors:
 						<id>TychoSurefirePluginUiTest</id>
 						<phase>integration-test</phase>
 						<configuration>
-							<skip>${dsl.tests.skip}</skip>
+							<skip>true</skip>
 							<useUIHarness>true</useUIHarness>
 							<useUIThread>true</useUIThread>
 							<!-- tycho.testArgLine repeated to re-use the configuration for argLine 

diff --git a/...hed/xsemantics-gen/org/eclipse/xsemantics/example/fjcached/typing/FjCachedTypeSystem.java b/...hed/xsemantics-gen/org/eclipse/xsemantics/example/fjcached/typing/FjCachedTypeSystem.java
@@ -1,18 +1,19 @@
-/*******************************************************************************
+/**
  * Copyright (c) 2013-2017 Lorenzo Bettini.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Contributors:
  *   Lorenzo Bettini - Initial contribution and API
- *******************************************************************************/
-
+ */
 package org.eclipse.xsemantics.example.fjcached.typing;
 
 import com.google.common.base.Objects;
 import com.google.inject.Provider;
+import java.util.List;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xsemantics.example.fj.fj.BasicType;
 import org.eclipse.xsemantics.example.fj.fj.ClassType;
 import org.eclipse.xsemantics.example.fj.fj.Expression;
@@ -26,24 +27,22 @@
 import org.eclipse.xsemantics.runtime.RuleEnvironment;
 import org.eclipse.xsemantics.runtime.RuleFailedException;
 import org.eclipse.xsemantics.runtime.XsemanticsProvider;
-import java.util.List;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.util.PolymorphicDispatcher;
 
 /**
  * A version of the FJ system where caching is used.
  */
 @SuppressWarnings("all")
 public class FjCachedTypeSystem extends FjTypeSystem {
-  public final static String SUPERCLASSES = "org.eclipse.xsemantics.example.fjcached.typing.Superclasses";
+  public static final String SUPERCLASSES = "org.eclipse.xsemantics.example.fjcached.typing.Superclasses";
 
-  public final static String FIELDS = "org.eclipse.xsemantics.example.fjcached.typing.Fields";
+  public static final String FIELDS = "org.eclipse.xsemantics.example.fjcached.typing.Fields";
 
-  public final static String METHODS = "org.eclipse.xsemantics.example.fjcached.typing.Methods";
+  public static final String METHODS = "org.eclipse.xsemantics.example.fjcached.typing.Methods";
 
-  public final static String CLASSSUBTYPING = "org.eclipse.xsemantics.example.fjcached.typing.ClassSubtyping";
+  public static final String CLASSSUBTYPING = "org.eclipse.xsemantics.example.fjcached.typing.ClassSubtyping";
 
-  public final static String SUBCLASSING = "org.eclipse.xsemantics.example.fjcached.typing.Subclassing";
+  public static final String SUBCLASSING = "org.eclipse.xsemantics.example.fjcached.typing.Subclassing";
 
   private PolymorphicDispatcher<List<org.eclipse.xsemantics.example.fj.fj.Class>> superclassesDispatcher;
 

diff --git a/...rg/eclipse/xsemantics/example/fjcached/typing/validation/FjCachedTypeSystemValidator.java b/...rg/eclipse/xsemantics/example/fjcached/typing/validation/FjCachedTypeSystemValidator.java
@@ -1,14 +1,13 @@
-/*******************************************************************************
+/**
  * Copyright (c) 2013-2017 Lorenzo Bettini.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Contributors:
  *   Lorenzo Bettini - Initial contribution and API
- *******************************************************************************/
-
+ */
 package org.eclipse.xsemantics.example.fjcached.typing.validation;
 
 import com.google.inject.Inject;