Fix package cycle: Persist tests

gselzer · ctrueden · commit 34a38ed38eb1 · 2021-11-19T15:17:16.000-06:00
diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/Circle.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/Circle.java
@@ -1,5 +1,5 @@
 
-package org.scijava.persist.testobjects;
+package org.scijava.persist;
 
 public class Circle implements Shape {
 
diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/CircleAdapter.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/CircleAdapter.java
@@ -1,5 +1,5 @@
 
-package org.scijava.persist.testobjects;
+package org.scijava.persist;
 
 import org.scijava.persist.IClassRuntimeAdapter;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/SerializationTests.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/SerializationTests.java
@@ -7,9 +7,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
-import org.scijava.persist.testobjects.Circle;
-import org.scijava.persist.testobjects.Shape;
-import org.scijava.persist.testobjects.Shapes;
 
 public class SerializationTests {
 
@@ -43,7 +40,7 @@ public void closeFiji() throws Exception {
 	}
 
 	/**
-	 * Test {@link org.scijava.persist.testobjects.CircleAdapter}
+	 * Test {@link org.scijava.persist.CircleAdapter}
 	 */
 	@Test
 	public void testCircleObject() {
@@ -52,7 +49,7 @@ public void testCircleObject() {
 	}
 
 	/**
-	 * Test adapters located in {@link org.scijava.persist.testobjects.Shapes}
+	 * Test adapters located in {@link org.scijava.persist.Shapes}
 	 */
 	@Test
 	public void testDrawingObject() {
diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/Shape.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/Shape.java
@@ -0,0 +1,4 @@
+
+package org.scijava.persist;
+
+public interface Shape {}
diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/Shapes.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/Shapes.java
@@ -1,5 +1,5 @@
 
-package org.scijava.persist.testobjects;
+package org.scijava.persist;
 
 import org.scijava.persist.IClassRuntimeAdapter;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shape.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shape.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-package org.scijava.persist.testobjects;`
	`2`	`+package org.scijava.persist;`
`3`	`3`
`4`	`4`	`public class Circle implements Shape {`
`5`	`5`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +package org.scijava.persist;
++
 +public interface Shape {}