Changeset 54 for timeline/src/test/java/geniusweb/progress/ProgressTimeTest.java

Timestamp:

Jul 23, 2025, 10:16:55 AM (2 months ago)

Author:

ruud

Message:

Modifications for automatic java to python conversion. Overloaded methods now have different names.

File:

• timeline/src/test/java/geniusweb/progress/ProgressTimeTest.java (modified) (6 diffs)

timeline/src/test/java/geniusweb/progress/ProgressTimeTest.java

@@ -11 +11 @@
 import java.util.List;
 
+import org.eclipse.jdt.annotation.NonNull;
 import org.junit.Test;
+import org.junit.internal.runners.JUnit4ClassRunner;
+import org.junit.runner.RunWith;
 
 import com.fasterxml.jackson.core.JsonParseException;
@@ -20 +23 @@
 import tudelft.utilities.junit.GeneralTests;
 
+@RunWith(JUnit4ClassRunner.class)
 public class ProgressTimeTest extends GeneralTests<Progress> {
         // we set T0 quite high because Python has trouble handling small datetime
         private static final long T0 = 100000l;
-        private static final Date TIMEZERO = new Date(T0);
+        private static final @NonNull Date TIMEZERO = new Date(T0);
         private final static long TESTTIME = 10; // milliseconds!
-        private final ProgressTime progress1 = new ProgressTime(TESTTIME, TIMEZERO);
-        private final ProgressTime progress1a = new ProgressTime(TESTTIME,
+        private final @NonNull ProgressTime progress1 = new ProgressTime(TESTTIME,
                         TIMEZERO);
-        private final ProgressTime progress2 = new ProgressTime(200l, TIMEZERO);
+        private final @NonNull ProgressTime progress1a = new ProgressTime(TESTTIME,
+                        TIMEZERO);
+        private final @NonNull ProgressTime progress2 = new ProgressTime(200l,
+                        TIMEZERO);
 
-        private final ObjectMapper jackson = new ObjectMapper();
-        private final String progressstring = "{\"ProgressTime\":{\"duration\":10,\"start\":100000}}";
+        private final static ObjectMapper jackson = new ObjectMapper();
+        private final @NonNull String progressstring = "{\"ProgressTime\":{\"duration\":10,\"start\":100000}}";
 
         private final long start = 1234;
-        private final ProgressTime pr = new ProgressTime(TESTTIME, new Date(start));
+        private final @NonNull ProgressTime pr = new ProgressTime(TESTTIME,
+                        new Date(start));
 
         @Override
         public List<List<Progress>> getGeneralTestData() {
-                List<List<Progress>> list = new LinkedList<>();
-                list.add(Arrays.asList(progress1, progress1a));
-                list.add(Arrays.asList(progress2));
-                return list;
+                List<List<Progress>> alist = new LinkedList<>();
+                alist.add(Arrays.asList(progress1, progress1a));
+                alist.add(Arrays.asList(progress2));
+                return alist;
         }
 
@@ -57 +64 @@
         @Test
         public void testAdvancingTime() throws InterruptedException {
-                for (long n = 0; n <= TESTTIME; n++) {
+                for (long n = 0; n <= TESTTIME; n += 1) {
                         assertEquals((Double) ((double) n / TESTTIME),
                                         progress1.get(T0 + n));
@@ -65 +72 @@
         @Test
         public void testAdvanceWhenDeadlineReached() throws InterruptedException {
-                ProgressTime progress = new ProgressTime(TESTTIME, TIMEZERO);
+                final @NonNull ProgressTime progress = new ProgressTime(TESTTIME,
+                                TIMEZERO);
                 assertEquals((Double) 1d, progress1.get(T0 + TESTTIME));
         }
@@ -71 +79 @@
         @Test
         public void testSerialize() throws JsonProcessingException {
-                String actual = jackson.writeValueAsString(progress1);
-                System.out.println(actual);
+                final @NonNull String actual = jackson.writeValueAsString(progress1);
+                //System.out.println(actual);
                 assertEquals(progressstring, actual);
 
@@ -80 +88 @@
         public void testDeserialize()
                         throws JsonParseException, JsonMappingException, IOException {
-                ProgressTime newprog = jackson.readValue(progressstring,
+                final @NonNull ProgressTime newprog = jackson.readValue(progressstring,
                                 ProgressTime.class);
-                // we can't directly compare with progress since that's a hacked
-                // object...
+                // we can't directly compare with progress : that's a hacked object.
                 assertEquals(TESTTIME, newprog.getDuration().intValue());
                 assertEquals(T0, newprog.getStart().getTime());