dsldevkit#22: SCA configuration - unify configuration

- Remove explicit test configuration for pmd and checkstyle - Cleanup new PMD in tests - Add checkstyle suppressions for Test and TestUtil classes - Disable CPD from parent to not check generated source Issue: dsldevkit#22
RGHenderson · Dec 21, 2017 · c134074 · c134074
1 parent a91fcb3
commit c134074
Show file tree

Hide file tree

Showing 52 changed files with 145 additions and 633 deletions.
diff --git a/com.avaloq.tools.ddk.check.core.test/.project b/com.avaloq.tools.ddk.check.core.test/.project
@@ -53,7 +53,7 @@
 	  <link>
       <name>.checkstyle</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle</locationURI>
     </link>
     <link>
       <name>.fbprefs</name>
@@ -63,7 +63,7 @@
     <link>
       <name>.pmd</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd</locationURI>
     </link>
 		<link>
 			<name>.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs</name>

diff --git a/com.avaloq.tools.ddk.check.core.test/pom.xml b/com.avaloq.tools.ddk.check.core.test/pom.xml
@@ -9,8 +9,4 @@
 
   <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>
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/.project b/com.avaloq.tools.ddk.check.runtime.core.test/.project
@@ -53,7 +53,7 @@
 	  <link>
       <name>.checkstyle</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle</locationURI>
     </link>
     <link>
       <name>.fbprefs</name>
@@ -63,7 +63,7 @@
     <link>
       <name>.pmd</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd</locationURI>
     </link>
 		<link>
 			<name>.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs</name>

diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml b/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
@@ -9,8 +9,4 @@
 
   <artifactId>com.avaloq.tools.ddk.check.runtime.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>
diff --git a/...me.core.test/src/com/avaloq/tools/ddk/check/runtime/label/CheckRuleLabelProviderTest.java b/...me.core.test/src/com/avaloq/tools/ddk/check/runtime/label/CheckRuleLabelProviderTest.java
@@ -128,7 +128,7 @@ private void mockValidatorsWithChecks() {
   @Test
   public void testBinding() {
     // ASSERT
-    assertSame(CheckRuleLabelProvider.class, checkRuleLabelProvider.getClass());
+    assertSame("Binding of label provider incorrect.", CheckRuleLabelProvider.class, checkRuleLabelProvider.getClass());
   }
 
   /**
@@ -143,7 +143,7 @@ public void testSuccess() {
     final String label = checkRuleLabelProvider.getLabel(ISSUE_CODE);
 
     // ASSERT
-    assertEquals(LABEL, label);
+    assertEquals("Label should be " + LABEL + " but was " + label, LABEL, label);
   }
 
   /**
@@ -157,7 +157,7 @@ public void testWhenIssueCodeNotPresent() {
     final String label = checkRuleLabelProvider.getLabel("some.package.SomeCheckCatalogIssueCodes.no.such.issue.code");
 
     // ASSERT
-    assertNull(label);
+    assertNull("Label should be null but was " + label, label);
   }
 
   /**
@@ -172,7 +172,7 @@ public void testWithNullID() {
     final String label = checkRuleLabelProvider.getLabel(null);
 
     // ASSERT
-    assertNull(label);
+    assertNull("Label should be null but was " + label, label);
   }
 
   /**
@@ -187,7 +187,7 @@ public void testWithNoValidators() {
     final String label = checkRuleLabelProvider.getLabel(ISSUE_CODE);
 
     // ASSERT
-    assertNull(label);
+    assertNull("Label should be null but was " + label, label);
   }
 
   /**
@@ -205,7 +205,7 @@ public void testWithNoChecks() {
     final String label = checkRuleLabelProvider.getLabel(ISSUE_CODE);
 
     // ASSERT
-    assertNull(label);
+    assertNull("Label should be null but was " + label, label);
   }
 
   /**
@@ -225,7 +225,7 @@ public void testWhenIssueCodeIsNotACheckIssueCode() {
     final String label = checkRuleLabelProvider.getLabel(notACheckIssueCode);
 
     // ASSERT
-    assertNull(label);
+    assertNull("Label should be null but was " + label, label);
   }
 
   /**
@@ -246,7 +246,7 @@ public void testCaching() {
       verify(mockValidator, times(1)).getIssueCodeToLabelMap();
     }
 
-    assertEquals(label1, label2);
+    assertEquals(label1 + " not equal to " + label2 + " . Equality expected", label1, label2);
   }
 
   /**
@@ -283,7 +283,7 @@ public void testInvalidatingCache() {
       verify(mockValidator, times(2)).getIssueCodeToLabelMap();
     }
 
-    assertEquals(label1, label2);
+    assertEquals(label1 + " not equal to " + label2 + " . Equality expected", label1, label2);
   }
 
   /**
@@ -295,7 +295,7 @@ public void testClassIsSingleton() {
     final ICheckRuleLabelProvider otherCheckRuleLabelProvider = injector.getInstance(CheckRuleLabelProvider.class);
 
     // ASSERT
-    assertSame(checkRuleLabelProvider, otherCheckRuleLabelProvider);
+    assertSame("Only one instance of CheckRuleLabelProvider expected", checkRuleLabelProvider, otherCheckRuleLabelProvider);
   }
 
 }

diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/.project b/com.avaloq.tools.ddk.check.test.runtime.tests/.project
@@ -53,7 +53,7 @@
 	  <link>
       <name>.checkstyle</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle</locationURI>
     </link>
     <link>
       <name>.fbprefs</name>
@@ -63,7 +63,7 @@
     <link>
       <name>.pmd</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd</locationURI>
     </link>
 		<link>
 			<name>.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs</name>

diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
@@ -9,8 +9,4 @@
 
   <artifactId>com.avaloq.tools.ddk.check.test.runtime.tests</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <properties>
-    <pmd.ruleset>${pmd.test.ruleset}</pmd.ruleset>
-    <checkstyle.configLocation>${checkstyle.test.configLocation}</checkstyle.configLocation>
-  </properties>
 </project>
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/.project b/com.avaloq.tools.ddk.check.test.runtime.ui/.project
@@ -53,7 +53,7 @@
 	  <link>
       <name>.checkstyle</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle</locationURI>
     </link>
     <link>
       <name>.fbprefs</name>
@@ -63,7 +63,7 @@
     <link>
       <name>.pmd</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd</locationURI>
     </link>
 		<link>
 			<name>.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs</name>

diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
@@ -9,8 +9,4 @@
 
   <artifactId>com.avaloq.tools.ddk.check.test.runtime.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <properties>
-    <pmd.ruleset>${pmd.test.ruleset}</pmd.ruleset>
-    <checkstyle.configLocation>${checkstyle.test.configLocation}</checkstyle.configLocation>
-  </properties>
 </project>
diff --git a/com.avaloq.tools.ddk.check.test.runtime/.project b/com.avaloq.tools.ddk.check.test.runtime/.project
@@ -53,7 +53,7 @@
 	  <link>
       <name>.checkstyle</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle</locationURI>
     </link>
     <link>
       <name>.fbprefs</name>
@@ -63,7 +63,7 @@
     <link>
       <name>.pmd</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd</locationURI>
     </link>
 		<link>
 			<name>.checkstyle</name>

diff --git a/com.avaloq.tools.ddk.check.test.runtime/pom.xml b/com.avaloq.tools.ddk.check.test.runtime/pom.xml
@@ -9,8 +9,4 @@
 
   <artifactId>com.avaloq.tools.ddk.check.test.runtime</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <properties>
-    <pmd.ruleset>${pmd.test.ruleset}</pmd.ruleset>
-    <checkstyle.configLocation>${checkstyle.test.configLocation}</checkstyle.configLocation>
-  </properties>
 </project>
diff --git a/com.avaloq.tools.ddk.check.ui.test/.project b/com.avaloq.tools.ddk.check.ui.test/.project
@@ -53,7 +53,7 @@
 	  <link>
       <name>.checkstyle</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle</locationURI>
     </link>
     <link>
       <name>.fbprefs</name>
@@ -63,7 +63,7 @@
     <link>
       <name>.pmd</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd</locationURI>
     </link>
 		<link>
 			<name>.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs</name>

diff --git a/com.avaloq.tools.ddk.check.ui.test/pom.xml b/com.avaloq.tools.ddk.check.ui.test/pom.xml
@@ -9,8 +9,4 @@
 
   <artifactId>com.avaloq.tools.ddk.check.ui.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
-  <properties>
-    <pmd.ruleset>${pmd.test.ruleset}</pmd.ruleset>
-    <checkstyle.configLocation>${checkstyle.test.configLocation}</checkstyle.configLocation>
-  </properties>
 </project>
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/.project b/com.avaloq.tools.ddk.checkcfg.core.test/.project
@@ -53,7 +53,7 @@
 	  <link>
       <name>.checkstyle</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle</locationURI>
     </link>
     <link>
       <name>.fbprefs</name>
@@ -63,7 +63,7 @@
     <link>
       <name>.pmd</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd</locationURI>
     </link>
 		<link>
 			<name>.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs</name>

diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
@@ -9,8 +9,4 @@
 
   <artifactId>com.avaloq.tools.ddk.checkcfg.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>
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/.project b/com.avaloq.tools.ddk.checkcfg.ui.test/.project
@@ -53,7 +53,7 @@
 	  <link>
       <name>.checkstyle</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle</locationURI>
     </link>
     <link>
       <name>.fbprefs</name>
@@ -63,7 +63,7 @@
     <link>
       <name>.pmd</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd</locationURI>
     </link>
 		<link>
 			<name>.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs</name>

diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
@@ -9,8 +9,4 @@
 
   <artifactId>com.avaloq.tools.ddk.checkcfg.ui.test</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <properties>
-    <pmd.ruleset>${pmd.test.ruleset}</pmd.ruleset>
-    <checkstyle.configLocation>${checkstyle.test.configLocation}</checkstyle.configLocation>
-  </properties>
 </project>
diff --git a/com.avaloq.tools.ddk.test.core/.project b/com.avaloq.tools.ddk.test.core/.project
@@ -53,7 +53,7 @@
 	  <link>
       <name>.checkstyle</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle</locationURI>
     </link>
     <link>
       <name>.fbprefs</name>
@@ -63,7 +63,7 @@
     <link>
       <name>.pmd</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd</locationURI>
     </link>
 		<link>
 			<name>.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs</name>

diff --git a/com.avaloq.tools.ddk.test.core/pom.xml b/com.avaloq.tools.ddk.test.core/pom.xml
@@ -9,8 +9,4 @@
 
   <artifactId>com.avaloq.tools.ddk.test.core</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <properties>
-    <pmd.ruleset>${pmd.test.ruleset}</pmd.ruleset>
-    <checkstyle.configLocation>${checkstyle.test.configLocation}</checkstyle.configLocation>
-  </properties>
 </project>
diff --git a/com.avaloq.tools.ddk.test.ui.test/.project b/com.avaloq.tools.ddk.test.ui.test/.project
@@ -53,7 +53,7 @@
 	  <link>
       <name>.checkstyle</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle</locationURI>
     </link>
     <link>
       <name>.fbprefs</name>
@@ -63,7 +63,7 @@
     <link>
       <name>.pmd</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd</locationURI>
     </link>
 		<link>
 			<name>.checkstyle</name>

diff --git a/com.avaloq.tools.ddk.test.ui.test/pom.xml b/com.avaloq.tools.ddk.test.ui.test/pom.xml
@@ -9,8 +9,4 @@
 
   <artifactId>com.avaloq.tools.ddk.test.ui.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
-  <properties>
-    <pmd.ruleset>${pmd.test.ruleset}</pmd.ruleset>
-    <checkstyle.configLocation>${checkstyle.test.configLocation}</checkstyle.configLocation>
-  </properties>
 </project>
diff --git a/com.avaloq.tools.ddk.test.ui/.project b/com.avaloq.tools.ddk.test.ui/.project
@@ -53,7 +53,7 @@
 	  <link>
       <name>.checkstyle</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.checkstyle</locationURI>
     </link>
     <link>
       <name>.fbprefs</name>
@@ -63,7 +63,7 @@
     <link>
       <name>.pmd</name>
       <type>1</type>
-      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd-test</locationURI>
+      <locationURI>PARENT-1-PROJECT_LOC/ddk-configuration/.pmd</locationURI>
     </link>
 		<link>
 			<name>.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs</name>

diff --git a/com.avaloq.tools.ddk.test.ui/pom.xml b/com.avaloq.tools.ddk.test.ui/pom.xml
@@ -9,8 +9,4 @@
 
   <artifactId>com.avaloq.tools.ddk.test.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <properties>
-    <pmd.ruleset>${pmd.test.ruleset}</pmd.ruleset>
-    <checkstyle.configLocation>${checkstyle.test.configLocation}</checkstyle.configLocation>
-  </properties>
 </project>