Xtext214

com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core.test;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
@@ -19,6 +19,8 @@ Require-Bundle: com.avaloq.tools.ddk.check.core,
  org.eclipse.core.runtime,
  org.eclipse.xtend.lib,
  org.eclipse.xtext.junit4,
+ org.eclipse.xtext.ui.testing,
+ org.eclipse.xtext.testing,
  org.junit,
  org.mockito,
  com.avaloq.tools.ddk.check.runtime.core,

com.avaloq.tools.ddk.check.core.test/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 

com.avaloq.tools.ddk.check.core.test/src-gen/com/avaloq/tools/ddk/check/CheckInjectorProvider.java

@@ -3,46 +3,46 @@
  */
 package com.avaloq.tools.ddk.check;
 
-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 org.eclipse.xtext.testing.GlobalRegistries;
+import org.eclipse.xtext.testing.GlobalRegistries.GlobalStateMemento;
+import org.eclipse.xtext.testing.IInjectorProvider;
+import org.eclipse.xtext.testing.IRegistryConfigurator;
 
 import com.google.inject.Injector;
 
+
 public class CheckInjectorProvider 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 CheckStandaloneSetup().createInjectorAndDoEMFRegistration();
-	}
-
-	@Override
-	public void restoreRegistry() {
-		stateBeforeInjectorCreation.restoreGlobalState();
-	}
-
-	@Override
-	public void setupRegistry() {
-		getInjector();
-		stateAfterInjectorCreation.restoreGlobalState();
-	}
+
+  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 CheckStandaloneSetup().createInjectorAndDoEMFRegistration();
+  }
+
+  @Override
+  public void restoreRegistry() {
+    stateBeforeInjectorCreation.restoreGlobalState();
+  }
+
+  @Override
+  public void setupRegistry() {
+    getInjector();
+    stateAfterInjectorCreation.restoreGlobalState();
+  }
 }

com.avaloq.tools.ddk.check.core.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java

@@ -3,15 +3,16 @@
  */
 package com.avaloq.tools.ddk.check;
 
-import org.eclipse.xtext.junit4.IInjectorProvider;
+import org.eclipse.xtext.testing.IInjectorProvider;
 
 import com.google.inject.Injector;
 
+
 public class CheckUiInjectorProvider implements IInjectorProvider {
-	
-	@Override
-	public Injector getInjector() {
-		return com.avaloq.tools.ddk.check.ui.internal.CheckActivator.getInstance().getInjector("com.avaloq.tools.ddk.check.Check");
-	}
-	
+
+  @Override
+  public Injector getInjector() {
+    return com.avaloq.tools.ddk.check.ui.internal.CheckActivator.getInstance().getInjector("com.avaloq.tools.ddk.check.Check");
+  }
+
 }

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java

@@ -29,8 +29,8 @@
 import org.eclipse.xtext.generator.IOutputConfigurationProvider;
 import org.eclipse.xtext.generator.InMemoryFileSystemAccess;
 import org.eclipse.xtext.generator.OutputConfiguration;
-import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil;
 import org.eclipse.xtext.resource.XtextResourceSet;
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
 import org.eclipse.xtext.xbase.compiler.OnTheFlyJavaCompiler.EclipseRuntimeDependentJavaCompiler;
 
 import com.avaloq.tools.ddk.check.check.CheckCatalog;
@@ -119,7 +119,7 @@ public Map<String, Class<?>> generateAndCompile(final InputStream sourceStream)
       // own class loader, let eclipse do the work: create our test project and then get the resolved classpath entries from
       // that.
       IProject project = getOrCreatePluginProject();
-      IResourcesSetupUtil.waitForAutoBuild();
+      IResourcesSetupUtil.reallyWaitForAutoBuild();
       // enumerateContents(project);
       IJavaProject javaProject = JavaCore.create(project);
       javaCompiler.clearClassPath();

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckTestCase.java

@@ -37,9 +37,9 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil;
 import org.eclipse.xtext.resource.FileExtensionProvider;
 import org.eclipse.xtext.resource.XtextResourceSet;
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
 import org.eclipse.xtext.util.StringInputStream;
 import org.junit.AfterClass;
 import org.junit.Before;

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.xtend

@@ -17,10 +17,10 @@ import com.avaloq.tools.ddk.check.check.XIssueExpression
 import com.avaloq.tools.ddk.check.core.test.util.CheckModelUtil
 import com.avaloq.tools.ddk.check.core.test.util.CheckTestUtil
 import com.google.inject.Inject
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
-import org.eclipse.xtext.junit4.util.ParseHelper
 import org.eclipse.xtext.resource.XtextResource
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.testing.util.ParseHelper
 import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig1314.java

@@ -21,11 +21,11 @@
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
 import org.eclipse.xtext.resource.IEObjectDescription;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.scoping.IScope;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.XtextRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -163,4 +163,3 @@ public void testDifferentScopeUseTwice() {
     assertResourceSet(rs, nofResourcesInSet, nofResourcesInMap);
   }
 }
-

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig830.xtend

@@ -15,9 +15,9 @@ import com.avaloq.tools.ddk.check.check.CheckCatalog
 import com.avaloq.tools.ddk.check.check.XIssueExpression
 import com.google.inject.Inject
 import org.eclipse.xtext.EcoreUtil2
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
-import org.eclipse.xtext.junit4.util.ParseHelper
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.testing.util.ParseHelper
 import org.eclipse.xtext.xbase.XbasePackage
 import org.junit.Assert
 import org.junit.Test

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugDsl27.java

@@ -13,8 +13,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.XtextRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend

@@ -19,9 +19,9 @@ import com.avaloq.tools.ddk.check.core.test.util.CheckTestUtil
 import com.google.common.collect.Lists
 import com.google.inject.Inject
 import java.util.List
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
-import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -46,23 +46,7 @@ class CheckScopingTest extends AbstractCheckTestCase {
     addSourcesToWorkspace(typeof(CheckScopingTest), requiredSourceFileNames)
 
     // wait for build to finish, otherwise included catalog may not be resolvable
-    IResourcesSetupUtil::waitForAutoBuild
-  }
-
-  /*
-   * Tests that Catalogs can be included in one another.
-   */
-  @Test
-  def void testResolutionOfIncludedCatalog() {
-    initializeTestProject
-
-    // test that our model is available
-    val sampleCheckModel = getModel("SampleChecks") as CheckCatalog
-
-    // test that the included catalog exists and is resolved
-    val includedCategory = sampleCheckModel.includedCatalogs
-    assertNotNull("The included Category is not null", includedCategory)
-    assertFalse("The included Category could be resolved", includedCategory.eIsProxy)
+    IResourcesSetupUtil.reallyWaitForAutoBuild
   }
 
   /*

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/IssueCodeToLabelMapGenerationTest.xtend

@@ -17,8 +17,8 @@ import com.google.common.collect.ImmutableMap
 import java.io.ByteArrayInputStream
 import java.util.Collections
 import java.util.Map
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.xtend

@@ -18,25 +18,25 @@ import org.eclipse.core.resources.IFile
 import org.eclipse.core.resources.IMarker
 import org.eclipse.core.resources.IProject
 import org.eclipse.core.resources.IResource
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil
 
 @InjectWith(typeof(CheckUiInjectorProvider))
 @RunWith(typeof(XtextRunner))
 class ProjectBasedTests extends AbstractCheckTestCase {
 
-  private boolean initialized;
+  boolean initialized;
 
   def List<String> getRequiredSourceFileNames() {
     // No file extension to prevent code generation in development workbench. Will get .check extension when copied into
     // runtime workspace the test runs in.
     Lists::newArrayList("bugdsl27/BugDsl27", "bugdsl281/BugDsl281")
   }
 
-  override def getFullFileName(String fileName) {
+  override getFullFileName(String fileName) {
     // Make sure it is put into the src folder even if the name contains a dash!
     return getSourceFolderPath() + getFileName(fileName);
   }
@@ -48,7 +48,7 @@ class ProjectBasedTests extends AbstractCheckTestCase {
       addSourcesToWorkspace(typeof(ProjectBasedTests), requiredSourceFileNames)
 
       // wait for build to finish, otherwise included catalog may not be resolvable
-      IResourcesSetupUtil::waitForAutoBuild
+      IResourcesSetupUtil.reallyWaitForAutoBuild
     }
   }
 

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend

@@ -17,9 +17,8 @@ import com.google.inject.Inject
 import org.eclipse.emf.common.util.BasicEList
 import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.EObject
-import org.eclipse.xtext.junit4.XtextRunner
 import org.eclipse.xtext.resource.XtextResource
-import org.eclipse.xtext.xbase.imports.RewritableImportSection
+import org.eclipse.xtext.testing.XtextRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -57,7 +56,6 @@ class CheckRewritableImportSectionFactoryTest extends AbstractCheckTestCase {
 
     // ASSERT
     assertNotNull("parse() should return an object", rewritableImportSection)
-    assertTrue("parse() should return a RewritableImportSection", rewritableImportSection instanceof RewritableImportSection)
     assertTrue("parse() should return a RewritableImportSection with sort=true", rewritableImportSection.sort)
   }
 

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckApiAccessValidationsTest.xtend

@@ -9,15 +9,15 @@
  */
 package com.avaloq.tools.ddk.check.validation
 
-import org.eclipse.xtext.junit4.InjectWith
+import org.eclipse.xtext.testing.InjectWith
 import org.junit.runner.RunWith
-import org.eclipse.xtext.junit4.XtextRunner
+import org.eclipse.xtext.testing.XtextRunner
 import com.avaloq.tools.ddk.check.CheckUiInjectorProvider
 import org.junit.Test
 import com.google.inject.Inject
-import org.eclipse.xtext.junit4.util.ParseHelper
+import org.eclipse.xtext.testing.util.ParseHelper
 import com.avaloq.tools.ddk.check.check.CheckCatalog
-import org.eclipse.xtext.junit4.validation.ValidationTestHelper
+import org.eclipse.xtext.testing.validation.ValidationTestHelper
 import org.eclipse.xtext.xtype.XtypePackage
 
 @InjectWith(typeof(CheckUiInjectorProvider))

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckJavaValidatorUtilTest.java

@@ -11,8 +11,8 @@
 package com.avaloq.tools.ddk.check.validation;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.XtextRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckValidationTest.xtend

@@ -15,10 +15,10 @@ import com.avaloq.tools.ddk.check.check.CheckCatalog
 import com.avaloq.tools.ddk.check.core.test.util.CheckModelUtil
 import com.google.common.collect.Lists
 import com.google.inject.Inject
-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.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.testing.util.ParseHelper
+import org.eclipse.xtext.testing.validation.ValidationTestHelper
 import org.eclipse.xtext.xbase.XbasePackage$Literals
 import org.junit.Ignore
 import org.junit.Test
@@ -115,13 +115,6 @@ class CheckValidationTest {
     helper.assertNoError(model, IssueCodes::CONTEXT_TYPES_NOT_UNIQUE)
   }
 
-  /* Tests checkCircularDependency(CheckCatalog) */
-  @Test
-  def void testCatalogMayNotIncludeItself() {
-    val model = parser.parse("package p catalog c for grammar g with c ")
-    helper.assertError(model, CheckPackage$Literals::CHECK_CATALOG, IssueCodes::INCLUDED_CATALOGS_WITH_CIRCULAR_DEPENDENCIES)
-  }
-
   /* Tests checkGuardsFirstInBlockExpression(Context) */
   @Test
   def void testGuardsPrecedeIssues() {