Reorganize validation test packages (#716)

* Use module names as package names
* Merge previously separate filter validation tests
* Move non-version specific tests to org.jacoco.core.test

4 files changed, 21 insertions, 21 deletions

diff --git a/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/filter/StringSwitchTest.java b/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/StringSwitchTest.java
index 15181359..778097e0 100644
--- a/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/filter/StringSwitchTest.java
+++ b/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/StringSwitchTest.java
@@ -9,11 +9,11 @@
  *    Evgeny Mandrikov - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.core.test.filter;
+package org.jacoco.core.test.validation.java7;
 
 import org.jacoco.core.analysis.ICounter;
-import org.jacoco.core.test.filter.targets.StringSwitch;
 import org.jacoco.core.test.validation.ValidationTestBase;
+import org.jacoco.core.test.validation.java7.targets.StringSwitchTarget;
 import org.junit.Test;
 
 /**
@@ -23,11 +23,11 @@ import org.junit.Test;
 public class StringSwitchTest extends ValidationTestBase {
 
 	public StringSwitchTest() {
-		super(StringSwitch.class);
+		super(StringSwitchTarget.class);
 	}
 
 	/**
-	 * {@link StringSwitch#covered(String)}
+	 * {@link StringSwitchTarget#covered(String)}
 	 */
 	@Test
 	public void covered() {
@@ -43,7 +43,7 @@ public class StringSwitchTest extends ValidationTestBase {
 	}
 
 	/**
-	 * {@link StringSwitch#notCovered(String)}
+	 * {@link StringSwitchTarget#notCovered(String)}
 	 */
 	@Test
 	public void notCovered() {
@@ -52,7 +52,7 @@ public class StringSwitchTest extends ValidationTestBase {
 	}
 
 	/**
-	 * {@link StringSwitch#handwritten(String)}
+	 * {@link StringSwitchTarget#handwritten(String)}
 	 */
 	@Test
 	public void handwritten() {
diff --git a/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/filter/TryWithResourcesTest.java b/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/TryWithResourcesTest.java
index 41c61713..0056a34a 100644
--- a/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/filter/TryWithResourcesTest.java
+++ b/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/TryWithResourcesTest.java
@@ -9,11 +9,11 @@
  *    Evgeny Mandrikov - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.core.test.filter;
+package org.jacoco.core.test.validation.java7;
 
 import org.jacoco.core.analysis.ICounter;
-import org.jacoco.core.test.filter.targets.TryWithResources;
 import org.jacoco.core.test.validation.ValidationTestBase;
+import org.jacoco.core.test.validation.java7.targets.TryWithResourcesTarget;
 import org.junit.Test;
 
 /**
@@ -23,11 +23,11 @@ import org.junit.Test;
 public class TryWithResourcesTest extends ValidationTestBase {
 
 	public TryWithResourcesTest() {
-		super(TryWithResources.class);
+		super(TryWithResourcesTarget.class);
 	}
 
 	/**
-	 * {@link TryWithResources#test()}
+	 * {@link TryWithResourcesFilterTarget#test()}
 	 */
 	@Test
 	public void test() {
@@ -49,7 +49,7 @@ public class TryWithResourcesTest extends ValidationTestBase {
 	}
 
 	/**
-	 * {@link TryWithResources#test2()}
+	 * {@link TryWithResourcesFilterTarget#test2()}
 	 */
 	@Test
 	public void test2() {
@@ -72,7 +72,7 @@ public class TryWithResourcesTest extends ValidationTestBase {
 	}
 
 	/**
-	 * {@link TryWithResources#returnInBody()}
+	 * {@link TryWithResourcesFilterTarget#returnInBody()}
 	 */
 	@Test
 	public void returnInBody() {
@@ -101,7 +101,7 @@ public class TryWithResourcesTest extends ValidationTestBase {
 	}
 
 	/**
-	 * {@link TryWithResources#nested()}
+	 * {@link TryWithResourcesFilterTarget#nested()}
 	 */
 	@Test
 	public void nested() {
@@ -142,7 +142,7 @@ public class TryWithResourcesTest extends ValidationTestBase {
 	}
 
 	/**
-	 * {@link TryWithResources#returnInCatch()}
+	 * {@link TryWithResourcesFilterTarget#returnInCatch()}
 	 */
 	@Test
 	public void returnInCatch() {
@@ -166,7 +166,7 @@ public class TryWithResourcesTest extends ValidationTestBase {
 	 */
 
 	/**
-	 * {@link TryWithResources#handwritten()}
+	 * {@link TryWithResourcesFilterTarget#handwritten()}
 	 */
 	@Test
 	public void handwritten() {
@@ -176,7 +176,7 @@ public class TryWithResourcesTest extends ValidationTestBase {
 	}
 
 	/**
-	 * {@link TryWithResources#empty()}
+	 * {@link TryWithResourcesFilterTarget#empty()}
 	 */
 	@Test
 	public void empty() {
@@ -198,7 +198,7 @@ public class TryWithResourcesTest extends ValidationTestBase {
 	}
 
 	/**
-	 * {@link TryWithResources#throwInBody()}
+	 * {@link TryWithResourcesFilterTarget#throwInBody()}
 	 */
 	@Test
 	public void throwInBody() {
diff --git a/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/filter/targets/StringSwitch.java b/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/targets/StringSwitchTarget.java
index c8b9a232..8e182a4f 100644
--- a/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/filter/targets/StringSwitch.java
+++ b/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/targets/StringSwitchTarget.java
@@ -9,14 +9,14 @@
  *    Evgeny Mandrikov - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.core.test.filter.targets;
+package org.jacoco.core.test.validation.java7.targets;
 
 import static org.jacoco.core.test.validation.targets.Stubs.nop;
 
 /**
  * This test target is a switch statement with a String.
  */
-public class StringSwitch {
+public class StringSwitchTarget {
 
 	private static void covered(Object s) {
 		switch (String.valueOf(s)) { // $line-covered.switch$
diff --git a/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/filter/targets/TryWithResources.java b/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/targets/TryWithResourcesTarget.java
index 3d3a30db..08d9cdab 100644
--- a/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/filter/targets/TryWithResources.java
+++ b/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/targets/TryWithResourcesTarget.java
@@ -9,7 +9,7 @@
  *    Evgeny Mandrikov - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.core.test.filter.targets;
+package org.jacoco.core.test.validation.java7.targets;
 
 import static org.jacoco.core.test.validation.targets.Stubs.f;
 import static org.jacoco.core.test.validation.targets.Stubs.nop;
@@ -20,7 +20,7 @@ import java.io.IOException;
 /**
  * This test target is a try-with-resources statement.
  */
-public class TryWithResources {
+public class TryWithResourcesTarget {
 
 	private static class Resource implements Closeable {
 		@Override