Fixed Java test sources so mvn test actually builds

The new CI step runs mvn test for real instead of swallowing its exit code like test_v3.py does, and it exposed two pre-existing bugs: SerializationExample was a public class in a wrongly named file, and its CustomClass collided with the one already in OneTest.java (renamed to Issue60CustomClass). Also skip testSwingObject when there's no display (CI, containers) instead of failing on HeadlessException; its fixture is already committed.

Signed-off-by: Thomas Calmant <thomas.calmant@gmail.com>

Author: tcalmant

tests/java/src/test/java/OneTest.java

@@ -28,6 +28,7 @@
 import javax.swing.JScrollPane;
 import javax.swing.SwingUtilities;
 
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -402,6 +403,10 @@ public void testBoolIntLong() throws Exception {
 
 	@Test
 	public void testSwingObject() throws Exception {
+		// The fixture this test writes is already committed under tests/:
+		// skip it where there is no real display to back the JFrame (CI,
+		// containers) rather than fail the build.
+		Assume.assumeFalse(java.awt.GraphicsEnvironment.isHeadless());
 
 		// Start the frame in the UI thread
 		SwingUtilities.invokeAndWait(new Runnable() {

…st/java/Issue60CustomReaderEndblock.java …/src/test/java/SerializationExample.javatests/java/src/test/java/Issue60CustomReaderEndblock.java renamed to tests/java/src/test/java/SerializationExample.java tests/java/src/test/java/Issue60CustomReaderEndblock.java renamed to tests/java/src/test/java/SerializationExample.java

@@ -18,14 +18,14 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
     }
 }
 
-class CustomClass extends SuperClass {
+class Issue60CustomClass extends SuperClass {
     private static final long serialVersionUID = 1L;
 
     private String name;
     private List<String> items = null;
     private int port = 443;
 
-    public CustomClass(String name) {
+    public Issue60CustomClass(String name) {
         this.name = name;
     }
 
@@ -43,15 +43,15 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
 
     @Override
     public String toString() {
-        return "CustomClass{name='" + name + "', items=" + items + "', port=" + port + "}";
+        return "Issue60CustomClass{name='" + name + "', items=" + items + "', port=" + port + "}";
     }
 }
 
 public class SerializationExample {
     public static void main(String[] args) {
         try {
             // Create and serialize
-            CustomClass obj = new CustomClass("test");
+            Issue60CustomClass obj = new Issue60CustomClass("test");
             System.out.println("Original: " + obj);
 
             // Serialize to file
@@ -61,7 +61,7 @@ public static void main(String[] args) {
 
             // Deserialize from file
             try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream("issue60_custom_reader_endblock.ser"))) {
-                CustomClass deserialized = (CustomClass) ois.readObject();
+                Issue60CustomClass deserialized = (Issue60CustomClass) ois.readObject();
                 System.out.println("Deserialized: " + deserialized);
             }