Tests: move echosvg-test-swing stuff inside echosvg-test, for the…

… convenience of IDEs Follow-up to c28920c
css4j · Jul 10, 2024 · 88e39cf · 88e39cf
1 parent f2cbc45
commit 88e39cf
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 61 deletions.
diff --git a/echosvg-test-swing/build.gradle b/echosvg-test-swing/build.gradle
diff --git a/echosvg-test-swing/src/main/java/module-info.java b/echosvg-test-swing/src/main/java/module-info.java
diff --git a/echosvg-test/build.gradle b/echosvg-test/build.gradle
@@ -31,8 +31,9 @@ dependencies {
 	implementation project(':echosvg-i18n')
 	implementation project(':echosvg-extension')
 	implementation project(':echosvg-transcoder')
+	api project(':echosvg-swing')
 	implementation "io.sf.jclf:jclf-text:${jclfTextVersion}"
-	testImplementation project(':echosvg-test-swing')
+	// Required by tests
 	testImplementation testFixtures(project(':echosvg-util'))
 	testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

diff --git a/...echosvg/swing/test/JSVGCanvasHandler.java → ...echosvg/test/swing/JSVGCanvasHandler.java b/...echosvg/swing/test/JSVGCanvasHandler.java → ...echosvg/test/swing/JSVGCanvasHandler.java
@@ -16,7 +16,7 @@
    limitations under the License.
 
  */
-package io.sf.carte.echosvg.swing.test;
+package io.sf.carte.echosvg.test.swing;
 
 import java.awt.Dimension;
 import java.awt.EventQueue;

diff --git a/...arte/echosvg/swing/test/TestMessages.java → ...arte/echosvg/test/swing/TestMessages.java b/...arte/echosvg/swing/test/TestMessages.java → ...arte/echosvg/test/swing/TestMessages.java
@@ -17,7 +17,7 @@
 
  */
 
-package io.sf.carte.echosvg.swing.test;
+package io.sf.carte.echosvg.test.swing;
 
 import java.util.Locale;
 import java.util.MissingResourceException;

diff --git a/echosvg-test/src/main/java/module-info.java b/echosvg-test/src/main/java/module-info.java
@@ -22,9 +22,16 @@
 	exports io.sf.carte.echosvg.test;
 	exports io.sf.carte.echosvg.test.image;
 	exports io.sf.carte.echosvg.test.svg;
+	exports io.sf.carte.echosvg.test.swing;
 
+	requires transitive io.sf.carte.echosvg.swing;
 	requires io.sf.carte.echosvg.transcoder;
 	requires io.sf.carte.echosvg.i18n;
 	requires io.sf.jclf.text;
 	requires transitive java.desktop;
+
+	/*
+	 * Required by tests.
+	 */
+	requires io.sf.carte.echosvg.constants;
 }
diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/gvt/test/TextSelectionTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/gvt/test/TextSelectionTest.java
@@ -30,8 +30,8 @@
 
 import io.sf.carte.echosvg.swing.JSVGCanvas;
 import io.sf.carte.echosvg.swing.svg.JSVGComponent;
-import io.sf.carte.echosvg.swing.test.JSVGCanvasHandler;
 import io.sf.carte.echosvg.test.svg.JSVGRenderingAccuracyTest;
+import io.sf.carte.echosvg.test.swing.JSVGCanvasHandler;
 import io.sf.carte.echosvg.transcoder.TranscoderException;
 
 /**

diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/JSVGRenderingAccuracyTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/JSVGRenderingAccuracyTest.java
@@ -29,7 +29,7 @@
 
 import io.sf.carte.echosvg.swing.JSVGCanvas;
 import io.sf.carte.echosvg.swing.gvt.Overlay;
-import io.sf.carte.echosvg.swing.test.JSVGCanvasHandler;
+import io.sf.carte.echosvg.test.swing.JSVGCanvasHandler;
 
 /**
  * One line Class Desc

diff --git a/...echosvg/swing/test/JSVGInterruptTest.java → ...echosvg/test/swing/JSVGInterruptTest.java b/...echosvg/swing/test/JSVGInterruptTest.java → ...echosvg/test/swing/JSVGInterruptTest.java
@@ -16,7 +16,7 @@
    limitations under the License.
 
  */
-package io.sf.carte.echosvg.swing.test;
+package io.sf.carte.echosvg.test.swing;
 
 import java.awt.EventQueue;
 import java.awt.geom.AffineTransform;

diff --git a/...chosvg/swing/test/JSVGMemoryLeakTest.java → ...chosvg/test/swing/JSVGMemoryLeakTest.java b/...chosvg/swing/test/JSVGMemoryLeakTest.java → ...chosvg/test/swing/JSVGMemoryLeakTest.java
@@ -16,7 +16,7 @@
    limitations under the License.
 
  */
-package io.sf.carte.echosvg.swing.test;
+package io.sf.carte.echosvg.test.swing;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;

diff --git a/...vg/swing/test/NullSetSVGDocumentTest.java → ...vg/test/swing/NullSetSVGDocumentTest.java b/...vg/swing/test/NullSetSVGDocumentTest.java → ...vg/test/swing/NullSetSVGDocumentTest.java
@@ -16,7 +16,7 @@
    limitations under the License.
 
  */
-package io.sf.carte.echosvg.swing.test;
+package io.sf.carte.echosvg.test.swing;
 
 import java.awt.EventQueue;
 import java.io.PrintWriter;

diff --git a/...carte/echosvg/swing/test/NullURITest.java → ...carte/echosvg/test/swing/NullURITest.java b/...carte/echosvg/swing/test/NullURITest.java → ...carte/echosvg/test/swing/NullURITest.java
@@ -16,7 +16,7 @@
    limitations under the License.
 
  */
-package io.sf.carte.echosvg.swing.test;
+package io.sf.carte.echosvg.test.swing;
 
 import io.sf.carte.echosvg.swing.JSVGCanvas;
 

diff --git a/...chosvg/swing/test/SetSVGDocumentTest.java → ...chosvg/test/swing/SetSVGDocumentTest.java b/...chosvg/swing/test/SetSVGDocumentTest.java → ...chosvg/test/swing/SetSVGDocumentTest.java
@@ -16,7 +16,7 @@
    limitations under the License.
 
  */
-package io.sf.carte.echosvg.swing.test;
+package io.sf.carte.echosvg.test.swing;
 
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;

diff --git a/...hosvg/swing/test/SwingMemoryLeakTest.java → ...hosvg/test/swing/SwingMemoryLeakTest.java b/...hosvg/swing/test/SwingMemoryLeakTest.java → ...hosvg/test/swing/SwingMemoryLeakTest.java
@@ -16,7 +16,7 @@
    limitations under the License.
 
  */
-package io.sf.carte.echosvg.swing.test;
+package io.sf.carte.echosvg.test.swing;
 
 import java.net.MalformedURLException;
 import java.net.URL;

diff --git a/settings.gradle b/settings.gradle
@@ -33,7 +33,6 @@ include(':echosvg-ttf2svg')
 include(':echosvg-slideshow')
 include(':echosvg-parser')
 include(':echosvg-gvt')
-include(':echosvg-test-swing')
 include(':echosvg-test-scripts')
 include(':echosvg-test')
 include(':echosvg-all')