Issue #1490: complete test classes

Author: thboileau

changes.md

@@ -4,6 +4,8 @@ Changes log
 - 2.7 Milestone 3 (??-??-2025)
   - Bugs fixed
     - Reuse an instance of Random class in RandomUtils. Issue #1487.
+    - Complete test classes. Issue #1490.
+
 - 2.7 Milestone 2 (29-06-2025)
     - Misc
       - Removed deprecated Servlet extension and related classes in Spring extension

org.restlet.ext.spring/src/test/java/org/restlet/ext/spring/SpringTestCase.java

@@ -18,6 +18,8 @@
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Unit test case for the Spring extension.
@@ -33,7 +35,9 @@ public void testSpring() throws Exception {
         // Start the Restlet component
         Component component = (Component) ctx.getBean("component");
         component.start();
+        assertTrue(component.isStarted());
         component.stop();
+        assertFalse(component.isStarted());
     }
 
     @Test

org.restlet/src/main/java/org/restlet/engine/util/AlphaNumericComparator.java

@@ -12,28 +12,28 @@
 /**
  * Optimized public-domain implementation of a Java alphanumeric sort.
  * <p>
- * 
+ *
  * This implementation uses a single comparison pass over the characters in a
- * CharSequence, and returns as soon as a differing character is found, unless
+ *  CharSequence and returns as soon as a differing character is found, unless
  * the difference occurs in a series of numeric characters, in which case that
  * series is followed to its end. Numeric series of equal length are compared
  * numerically, that is, according to the most significant (leftmost) differing
  * digit. Series of unequal length are compared by their length.
  * <p>
- * 
+ *
  * This implementation appears to be 2-5 times faster than alphanumeric
- * comparators based based on substring analysis, with a lighter memory
+ * comparators based on substring analysis, with a lighter memory
  * footprint.
  * <p>
- * 
+ *
  * This alphanumeric comparator has approximately 20%-50% the performance of the
  * lexical String.compareTo() operation. Character sequences without numeric
  * data are compared more quickly.
  * <p>
- * 
+ *
  * Dedicated to the public domain by the original author:
- * http://creativecommons.org/licenses/publicdomain/
- * 
+ * <a href="https://creativecommons.org/licenses/publicdomain/">Public Domain List</a>
+ *
  * @author Rob Heittman, <a href="http://www.solertium.com">Solertium
  *         Corporation</a>
  */
@@ -51,7 +51,7 @@ public int compare(final String uri0, final String uri1) {
 		final int rlength = uri1.length();
 		final int min = Math.min(rlength, llength);
 
-        boolean rAtEnd, rHasNoMoreDigits;
+		boolean rAtEnd, rHasNoMoreDigits;
 
 		while (ptr < min) {
 			a = uri0.charAt(ptr);
@@ -112,7 +112,7 @@ public int compare(final String uri0, final String uri1) {
 
 	/**
 	 * Indicates if the character is a digit.
-	 * 
+	 *
 	 * @param x The character to test.
 	 * @return True if the character is a digit.
 	 */

org.restlet/src/main/java/org/restlet/engine/util/AlphabeticalComparator.java

@@ -15,7 +15,7 @@
 import java.util.Comparator;
 
 /**
- * Allows to sort the list of references set by the resource.
+ * Allows sorting the list of references set by the resource.
  * 
  * @author Jerome Louvel
  */

org.restlet/src/test/java/org/restlet/RestartTestCase.java

@@ -9,39 +9,40 @@
 
 package org.restlet;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.junit.jupiter.api.Test;
 import org.restlet.data.Protocol;
 
 import java.time.Duration;
 
 /**
  * Test the ability of a connector to be restarted.
- * 
+ *
  * @author Jerome Louvel
  */
 public class RestartTestCase {
 
-	@Test
-    public void testRestart() throws Exception {
+    @Test
+    void testRestart() throws Exception {
         final Duration waitTime = Duration.ofMillis(10);
 
         final Server connector = new Server(Protocol.HTTP, 0, (Restlet) null);
 
-        System.out.print("Starting connector... ");
         connector.start();
-        System.out.println("done");
+        assertTrue(connector.isStarted());
         Thread.sleep(waitTime.toMillis());
 
-        System.out.print("Stopping connector... ");
         connector.stop();
-        System.out.println("done");
+        assertFalse(connector.isStarted());
         Thread.sleep(waitTime.toMillis());
 
-        System.out.print("Restarting connector... ");
         connector.start();
-        System.out.println("done");
+        assertTrue(connector.isStarted());
         Thread.sleep(waitTime.toMillis());
         connector.stop();
+        assertFalse(connector.isStarted());
     }
 
 }

org.restlet/src/test/java/org/restlet/data/ZipClientTestCase.java

@@ -11,6 +11,8 @@
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.restlet.representation.EmptyRepresentation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.resource.ClientResource;
@@ -29,6 +31,7 @@
  *
  * @author Remi Dewitte
  */
+@Disabled("flaky on github")
 public class ZipClientTestCase {
 
     private File zipFile;
@@ -44,8 +47,8 @@ protected void tearDownEach() throws Exception {
         zipFile.delete();
     }
 
-    // @Test TODO seems flaky on github
-    public void testFileClient() throws IOException {
+    @Test
+    void testFileClient() throws IOException {
         String text = "Test content\r\nLine 2\r\nLine2";
         String text2 = "Test content\nLine 2";
         LocalReference fr = LocalReference.createFileReference(zipFile);

org.restlet/src/test/java/org/restlet/engine/connector/BaseConnectorsTestCase.java

@@ -63,9 +63,9 @@ protected void configureServer(final Server server) {
 
     protected abstract Application createApplication();
 
-    protected List<ConnectorTestCase> listTestCases() {
+    protected List<ConnectorsPair> listTestCases() {
         return List.of(
-                new ConnectorTestCase(HttpServer.JETTY_HTTP, HttpClient.JETTY));
+                new ConnectorsPair(HttpServer.JETTY_HTTP, HttpClient.JETTY));
     }
 
     @TestFactory

…/engine/connector/ConnectorTestCase.java …let/engine/connector/ConnectorsPair.javaorg.restlet/src/test/java/org/restlet/engine/connector/ConnectorTestCase.java renamed to org.restlet/src/test/java/org/restlet/engine/connector/ConnectorsPair.java org.restlet/src/test/java/org/restlet/engine/connector/ConnectorTestCase.java renamed to org.restlet/src/test/java/org/restlet/engine/connector/ConnectorsPair.java

@@ -2,11 +2,11 @@
 
 import static java.lang.String.format;
 
-public class ConnectorTestCase {
+public class ConnectorsPair {
     final BaseConnectorsTestCase.HttpServer httpServer;
     final BaseConnectorsTestCase.HttpClient httpClient;
 
-    public ConnectorTestCase(BaseConnectorsTestCase.HttpServer httpServer, BaseConnectorsTestCase.HttpClient httpClient) {
+    public ConnectorsPair(BaseConnectorsTestCase.HttpServer httpServer, BaseConnectorsTestCase.HttpClient httpClient) {
         this.httpServer = httpServer;
         this.httpClient = httpClient;
     }

org.restlet/src/test/java/org/restlet/engine/connector/FormDataSetTestCase.java

@@ -67,8 +67,8 @@ public static void globalSetUp() throws IOException {
     }
 
     @Override
-    protected List<ConnectorTestCase> listTestCases() {
-        return List.of(new ConnectorTestCase(HttpServer.JETTY_HTTPS,
+    protected List<ConnectorsPair> listTestCases() {
+        return List.of(new ConnectorsPair(HttpServer.JETTY_HTTPS,
                 HttpClient.JETTY));
     }