Merge pull request #16 from rmitin/master

#3 Update already published plugins, add test plugins

.travis.yml

@@ -1,5 +1,5 @@
 language: java
 sudo: false
-script: mvn clean verify -f ./ddk-parent/pom.xml
+script: mvn clean verify -f ./ddk-parent/pom.xml -DskipTests=true
 jdk:
   - oraclejdk8

com.avaloq.tools.ddk.check.core.test/.classpath

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+  <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">
+    <accessrules>
+      <accessrule kind="accessible" pattern="org/eclipse/xtext/junit4/ui/util/**"/>
+      <accessrule kind="accessible" pattern="org/eclipse/xtext/xbase/imports/RewritableImportSection"/>
+    </accessrules>
+  </classpathentry>
+  <classpathentry kind="src" path="src"/>
+  <classpathentry kind="src" path="src-gen">
+    <attributes>
+      <attribute name="ignore_optional_problems" value="true"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="src" path="xtend-gen">
+    <attributes>
+      <attribute name="ignore_optional_problems" value="true"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="src" path="resource"/>
+  <classpathentry kind="output" path="bin"/>
+</classpath>

com.avaloq.tools.ddk.check.core.test/.project

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.avaloq.tools.ddk.check.core.test</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>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</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>
+		<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs</locationURI>
+		</link>
+		<link>
+			<name>.settings/org.eclipse.core.resources.prefs</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.settings/org.eclipse.core.resources.prefs</locationURI>
+		</link>
+		<link>
+			<name>.settings/org.eclipse.core.runtime.prefs</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.settings/org.eclipse.core.runtime.prefs</locationURI>
+		</link>
+		<link>
+			<name>.settings/org.eclipse.jdt.core.prefs</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.settings/org.eclipse.jdt.core.prefs</locationURI>
+		</link>
+		<link>
+			<name>.settings/org.eclipse.jdt.ui.prefs</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.settings/org.eclipse.jdt.ui.prefs</locationURI>
+		</link>
+		<link>
+			<name>.settings/org.eclipse.pde.core.prefs</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.settings/org.eclipse.pde.core.prefs</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>

com.avaloq.tools.ddk.check.core.test/CheckCoreTestSuite.launch

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/test/core/CheckCoreTestSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.check.test.core.CheckCoreTestSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.check.core.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m&#13;&#10;-Xmx1g&#13;&#10;-ea"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>

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

@@ -0,0 +1,41 @@
+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.0.0.qualifier
+Bundle-Vendor: Avaloq Evolution AG
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Require-Bundle: com.avaloq.tools.ddk.check.core,
+ com.avaloq.tools.ddk.xtext.test.core,
+ com.avaloq.tools.ddk.check.ui,
+ org.eclipse.xtext,
+ org.eclipse.xtext.xbase,
+ org.eclipse.xtext.ui,
+ org.eclipse.jdt.core,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.core.runtime,
+ org.eclipse.xtend2.lib,
+ org.eclipse.xtext.junit4,
+ org.junit,
+ org.mockito,
+ com.avaloq.tools.ddk.check.runtime.core,
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.eclipse.xtext.xbase,
+ org.eclipse.xtext.xbase.junit,
+ org.eclipse.xtext.xbase.lib,
+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,
+ org.apache.log4j,
+ org.apache.commons.lang
+Export-Package: com.avaloq.tools.ddk.check.core.test,
+ com.avaloq.tools.ddk.check.core.test.util,
+ com.avaloq.tools.ddk.check.test.core,
+ com.avaloq.tools.ddk.check
+Import-Package: 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

com.avaloq.tools.ddk.check.core.test/build.properties

@@ -0,0 +1,8 @@
+source.. = src/,\
+           src-gen/,\
+           xtend-gen/,\
+           resource/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="com.avaloq.tools.ddk.check.runtime.core.checkapi">
+      <api
+            package="com.avaloq.tools.ddk.check.check">
+      </api>
+   </extension>
+
+</plugin>

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

@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>ddk-parent</artifactId>
+    <groupId>com.avaloq.tools.ddk</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../ddk-parent</relativePath>
+  </parent>
+
+  <artifactId>com.avaloq.tools.ddk.check.core.test</artifactId>
+  <packaging>eclipse-test-plugin</packaging>
+  <properties>
+    <pmd.ruleset>${pmd.test.ruleset}</pmd.ruleset>
+    <checkstyle.configLocation>${checkstyle.test.configLocation}</checkstyle.configLocation>
+  </properties>
+</project>

com.avaloq.tools.ddk.check.core.test/resource/com/avaloq/tools/ddk/check/core/test/CommonChecks

@@ -0,0 +1,26 @@
+package com.avaloq.example.codetabdef.checks
+
+import com.avaloq.tools.ddk.check.check.*
+
+catalog CommonChecks
+for grammar com.avaloq.tools.ddk.check.Check
+{
+  category "Cat"
+  {
+    /** This check is javadoc-like commented. */
+    warning ColumnNamedW "Column named W" ()
+    message "No column named 'w'" {
+      for Category c {
+          issue
+      }
+    }
+  }
+
+  def DefWithIllegalReference for Category c {
+      issue SampleCodeTabDef.Apa on c#name // This reference is illegal, error marker expected
+  }
+
+  def Y for Category c {
+      issue ColumnNamedW on c#name
+  }
+}

com.avaloq.tools.ddk.check.core.test/resource/com/avaloq/tools/ddk/check/core/test/SampleChecks

@@ -0,0 +1,14 @@
+package com.avaloq.example.codetabdef.checks
+
+import com.avaloq.tools.ddk.check.check.*
+
+catalog SampleCodeTabDef
+for grammar com.avaloq.tools.ddk.check.Check
+with CommonChecks
+{
+
+  def LegalIssueReference for Category c {
+      issue CommonChecks.ColumnNamedW on c#name
+  }
+
+}

com.avaloq.tools.ddk.check.core.test/resource/com/avaloq/tools/ddk/check/core/test/bugdsl27/BugDsl27

@@ -0,0 +1,25 @@
+package bugdsl27
+
+import com.avaloq.tools.ddk.check.check.Check
+import com.avaloq.tools.ddk.check.check.Context
+import com.avaloq.tools.ddk.check.check.Documented
+
+/**
+ *  Check catalog for com.avaloq.tools.ddk.check.Check
+ */
+catalog BugDsl27
+for grammar com.avaloq.tools.ddk.check.Check {
+
+  /**
+   * Just a test.
+   */
+  live error JustATest "Just a test"
+  message "Just a test." {
+    for Documented elem {
+      switch elem {
+        Context : issue on elem
+        Check : issue on elem
+      }
+    }
+  }
+}

com.avaloq.tools.ddk.check.core.test/resource/com/avaloq/tools/ddk/check/core/test/bugdsl281/BugDsl281

@@ -0,0 +1,42 @@
+package bugdsl281
+
+import com.avaloq.tools.ddk.check.check.Check
+import com.avaloq.tools.ddk.check.check.Context
+import com.avaloq.tools.ddk.check.check.Documented
+
+import java.util.List
+
+/**
+ * Test check catalog for com.avaloq.tools.ddk.check.Check. Never executed, but the test builds it and then
+ * verifies that the generated code exists and has no errors, which also verifies implicitly that the catalog
+ * itself didn't have any errors.
+ */
+catalog BugDsl281
+for grammar com.avaloq.tools.ddk.check.Check {
+
+  /**
+   * Test that empty list literals are generated correctly.
+   */
+  live error TestThatEmptyListLiteralsAreGeneratedCorrectly "Test that empty list literals are generated correctly"
+  (List<String> listParam = #[])
+  message "Test that empty list literals are generated correctly." {
+    for Documented elem {
+      if (!listParam.empty) {
+        issue;
+      }
+    }
+  }
+
+  /**
+   * Test that non-empty list literals are generated correctly.
+   */
+  live error TestThatNonEmptyListLiteralsAreGeneratedCorrectly "Test that non-empty list literals are generated correctly"
+  (List<String> listParam = #["foo, fie"])
+  message "Test that non-empty list literals are generated correctly." {
+    for Documented elem {
+      if (listParam.empty) {
+        issue;
+      }
+    }
+  }
+}