Merge pull request #2643 from ControlSystemStudio/CI-with-tests

Update .travis.yml
ControlSystemStudio · Jul 23, 2020 · 54ddae4 · 54ddae4
2 parents 0f5ae62 + 616b5f8
commit 54ddae4
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 53 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,7 @@ script:
    # Build everything else.
    # -q is required so the log doesn't exceed Travis's 4MB limit.
    # Skip the tests because otherwise the build exceeds Travis's time limit.
- - travis_wait 30 mvn -q clean verify -Dcsstudio.composite.repo=${REPO} -DskipTests=true
+ - travis_wait 30 mvn -q clean verify -Dcsstudio.composite.repo=${REPO}
 
 after_failure:
  - find ./ -type d -name "surefire-reports" -print0 | xargs -0 -I {} find {} -iname "*.txt" -type f | xargs cat

diff --git a/...est/src/org/csstudio/archive/reader/appliance/ApplianceArchiveReaderNewOptimizedTest.java b/...est/src/org/csstudio/archive/reader/appliance/ApplianceArchiveReaderNewOptimizedTest.java
@@ -45,13 +45,13 @@ public void testDataRetrievalWhenThereAreNotManyPoints() throws Exception {
 
         ArchiveVNumber val = null;
         for (int i = 0; i < vals.length; i++) {
-            val = (ArchiveVNumber) vals[i];
+            val = vals[i];
             assertEquals(
                     "Value comparison",
                     Double.valueOf(TestGenMsgIteratorRaw.VALUES_DOUBLE[i % TestGenMsgIteratorRaw.VALUES_DOUBLE.length]),
                     (Double) val.getValue(), 0.0001);
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i%TestGenMsgIteratorRaw.SEVERITIES.length]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i%TestGenMsgIteratorRaw.SEVERITIES.length]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i%TestGenMsgIteratorRaw.SEVERITIES.length], val.getAlarmName());
         }
     }
 

diff --git a/.../org/csstudio/archive/reader/appliance/ApplianceArchiveReaderOptimizedStatisticsTest.java b/.../org/csstudio/archive/reader/appliance/ApplianceArchiveReaderOptimizedStatisticsTest.java
@@ -53,7 +53,7 @@ public void testDataRetrievalWhenThereAreNotManyPoints() throws Exception{
             assertEquals("Value comparison", Double.valueOf(TestGenMsgIteratorRaw.VALUES_DOUBLE[i%TestGenMsgIteratorRaw.VALUES_DOUBLE.length]),(Double)val.getValue(),0.0001);
             assertEquals("Timestamp comparison", start.toEpochMilli() + i,val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i], val.getAlarmName());
         }
     }
 
@@ -247,7 +247,7 @@ public void testDataRetrievalString() throws Exception {
             assertEquals("Value comparison", "9554.0",val.getValue());
             assertEquals("Timestamp comparison", start.toEpochMilli() + i,val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorOptimized.SEVERITIES[i]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorOptimized.STATUS[i]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorOptimized.STATUS_STRING[i], val.getAlarmName());
         }
     }
 
@@ -272,7 +272,7 @@ public void testDataRetrievalEnum() throws Exception {
             assertEquals("Value comparison", "Enum <" + (i+1) + ">",val.getValue());
             assertEquals("Timestamp comparison", start.toEpochMilli() + i, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorOptimized.SEVERITIES[i]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorOptimized.STATUS[i]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorOptimized.STATUS_STRING[i], val.getAlarmName());
         }
     }
 }
diff --git a/...e.test/src/org/csstudio/archive/reader/appliance/ApplianceArchiveReaderOptimizedTest.java b/...e.test/src/org/csstudio/archive/reader/appliance/ApplianceArchiveReaderOptimizedTest.java
@@ -48,11 +48,11 @@ public void testDataRetrievalWhenThereAreNotManyPoints() throws Exception{
 
         ArchiveVNumber val = null;
         for (int i = 0; i < vals.length; i++) {
-            val = (ArchiveVNumber)vals[i];
+            val = vals[i];
             assertEquals("Value comparison", Double.valueOf(TestGenMsgIteratorRaw.VALUES_DOUBLE[i%TestGenMsgIteratorRaw.VALUES_DOUBLE.length]),(Double)val.getValue(),0.0001);
             assertEquals("Timestamp comparison", start.toEpochMilli() + i, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i%TestGenMsgIteratorRaw.SEVERITIES.length]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i%TestGenMsgIteratorRaw.SEVERITIES.length]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i%TestGenMsgIteratorRaw.SEVERITIES.length], val.getAlarmName());
         }
     }
 
@@ -79,7 +79,7 @@ public void testDataRetrievalDouble() throws Exception {
             assertEquals("Value comparison", Double.valueOf(TestGenMsgIteratorOptimized.VALUES_DOUBLE[i%TestGenMsgIteratorOptimized.VALUES_DOUBLE.length]),(Double)val.getValue(),0.0001);
             assertEquals("Timestamp comparison", startM + i*step, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorOptimized.SEVERITIES[i%TestGenMsgIteratorOptimized.SEVERITIES.length]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorOptimized.STATUS[i%TestGenMsgIteratorOptimized.STATUS.length]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorOptimized.STATUS_STRING[i%TestGenMsgIteratorOptimized.STATUS.length], val.getAlarmName());
         }
     }
 
@@ -106,7 +106,7 @@ public void testDataRetrievalFloat() throws Exception {
             assertEquals("Value comparison", Float.valueOf(TestGenMsgIteratorOptimized.VALUES_FLOAT[i%TestGenMsgIteratorOptimized.VALUES_FLOAT.length]),(Float)val.getValue(),0.0001);
             assertEquals("Timestamp comparison", startM + i*step, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorOptimized.SEVERITIES[i%TestGenMsgIteratorOptimized.SEVERITIES.length]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorOptimized.STATUS[i%TestGenMsgIteratorOptimized.STATUS.length]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorOptimized.STATUS_STRING[i%TestGenMsgIteratorOptimized.STATUS.length], val.getAlarmName());
         }
     }
 
@@ -130,10 +130,10 @@ public void testDataRetrievalInt() throws Exception {
         ArchiveVNumber val = null;
         for (int i = 0; i < vals.length; i++) {
             val = vals[i];
-            assertEquals("Value comparison", Integer.valueOf(TestGenMsgIteratorOptimized.VALUES_INT[i%TestGenMsgIteratorOptimized.VALUES_INT.length]),(Integer)val.getValue());
+            assertEquals("Value comparison", Integer.valueOf(TestGenMsgIteratorOptimized.VALUES_INT[i%TestGenMsgIteratorOptimized.VALUES_INT.length]),val.getValue());
             assertEquals("Timestamp comparison", startM + i*step, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorOptimized.SEVERITIES[i%TestGenMsgIteratorOptimized.SEVERITIES.length]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorOptimized.STATUS[i%TestGenMsgIteratorOptimized.STATUS.length]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorOptimized.STATUS_STRING[i%TestGenMsgIteratorOptimized.STATUS.length], val.getAlarmName());
         }
     }
 
@@ -157,10 +157,10 @@ public void testDataRetrievalShort() throws Exception {
         ArchiveVNumber val = null;
         for (int i = 0; i < vals.length; i++) {
             val = vals[i];
-            assertEquals("Value comparison", Short.valueOf(TestGenMsgIteratorOptimized.VALUES_SHORT[i%TestGenMsgIteratorOptimized.VALUES_SHORT.length]),(Short)val.getValue());
+            assertEquals("Value comparison", Short.valueOf(TestGenMsgIteratorOptimized.VALUES_SHORT[i%TestGenMsgIteratorOptimized.VALUES_SHORT.length]),val.getValue());
             assertEquals("Timestamp comparison", startM + i*step, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorOptimized.SEVERITIES[i%TestGenMsgIteratorOptimized.SEVERITIES.length]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorOptimized.STATUS[i%TestGenMsgIteratorOptimized.STATUS.length]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorOptimized.STATUS_STRING[i%TestGenMsgIteratorOptimized.STATUS.length], val.getAlarmName());
         }
     }
 
@@ -184,10 +184,10 @@ public void testDataRetrievalByte() throws Exception {
         ArchiveVNumber val = null;
         for (int i = 0; i < vals.length; i++) {
             val = vals[i];
-            assertEquals("Value comparison", Byte.valueOf(TestGenMsgIteratorOptimized.VALUES_BYTE[i%TestGenMsgIteratorOptimized.VALUES_BYTE.length]),(Byte)val.getValue());
+            assertEquals("Value comparison", Byte.valueOf(TestGenMsgIteratorOptimized.VALUES_BYTE[i%TestGenMsgIteratorOptimized.VALUES_BYTE.length]),val.getValue());
             assertEquals("Timestamp comparison", startM + i*step, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorOptimized.SEVERITIES[i%TestGenMsgIteratorOptimized.SEVERITIES.length]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorOptimized.STATUS[i%TestGenMsgIteratorOptimized.STATUS.length]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorOptimized.STATUS_STRING[i%TestGenMsgIteratorOptimized.STATUS.length], val.getAlarmName());
         }
     }
 
@@ -212,7 +212,7 @@ public void testDataRetrievalString() throws Exception {
             assertEquals("Value comparison", "9554.0",val.getValue());
             assertEquals("Timestamp comparison", start.toEpochMilli() + i, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorOptimized.SEVERITIES[i%TestGenMsgIteratorOptimized.SEVERITIES.length]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorOptimized.STATUS[i%TestGenMsgIteratorOptimized.STATUS.length]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorOptimized.STATUS_STRING[i%TestGenMsgIteratorOptimized.STATUS.length], val.getAlarmName());
         }
     }
 
@@ -237,7 +237,7 @@ public void testataRetrievalEnum() throws Exception {
             assertEquals("Value comparison", "Enum <" + TestGenMsgIteratorOptimized.VALUES_INT[i%TestGenMsgIteratorOptimized.VALUES_INT.length] + ">",val.getValue());
             assertEquals("Timestamp comparison", start.toEpochMilli() + i, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorOptimized.SEVERITIES[i%TestGenMsgIteratorOptimized.SEVERITIES.length]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorOptimized.STATUS[i%TestGenMsgIteratorOptimized.STATUS.length]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorOptimized.STATUS_STRING[i%TestGenMsgIteratorOptimized.STATUS.length], val.getAlarmName());
         }
     }
 }
diff --git a/...rc/org/csstudio/archive/reader/appliance/ApplianceArchiveReaderOptimizedWaveformTest.java b/...rc/org/csstudio/archive/reader/appliance/ApplianceArchiveReaderOptimizedWaveformTest.java
@@ -54,7 +54,7 @@ public void testDataRetrievalDouble() throws Exception {
             assertArrayEquals("Value comparison", TestGenMsgIteratorWaveform.VALUE_DOUBLE[i*2],array,0.000001);
             assertEquals("Timestamp comparison", start.toEpochMilli() + i*2,  val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i*2]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i*2]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i*2], val.getAlarmName());
         }
     }
 
@@ -82,7 +82,7 @@ public void testDataRetrievalFloat() throws Exception {
             assertArrayEquals("Value comparison", TestGenMsgIteratorWaveform.VALUE_FLOAT[i*2],array,0.000001);
             assertEquals("Timestamp comparison", start.toEpochMilli() + i*2, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i*2]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i*2]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i*2], val.getAlarmName());
         }
     }
 
@@ -110,7 +110,7 @@ public void testDataRetrievalInt() throws Exception {
             assertArrayEquals("Value comparison", TestGenMsgIteratorWaveform.VALUE_INT[i*2],array);
             assertEquals("Timestamp comparison", start.toEpochMilli() + i*2, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i*2]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i*2]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i*2], val.getAlarmName());
         }
     }
 
@@ -138,7 +138,7 @@ public void testDataRetrievalShort() throws Exception {
             assertArrayEquals("Value comparison", TestGenMsgIteratorWaveform.VALUE_SHORT[i*2],array);
             assertEquals("Timestamp comparison", start.toEpochMilli() + i*2, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i*2]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i*2]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i*2], val.getAlarmName());
         }
     }
 
@@ -166,7 +166,7 @@ public void testDataRetrievalByte() throws Exception {
             assertArrayEquals("Value comparison", TestGenMsgIteratorWaveform.VALUE_BYTE[i*2],array);
             assertEquals("Timestamp comparison", start.toEpochMilli() + i*2, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i*2]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i*2]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i*2], val.getAlarmName());
         }
     }
 

diff --git a/...pliance.test/src/org/csstudio/archive/reader/appliance/ApplianceArchiveReaderRawTest.java b/...pliance.test/src/org/csstudio/archive/reader/appliance/ApplianceArchiveReaderRawTest.java
@@ -48,7 +48,7 @@ public void testDataRetrievalDouble() throws Exception {
             assertEquals("Value comparison", Double.valueOf(TestGenMsgIteratorRaw.VALUES_DOUBLE[i]),(Double)val.getValue(),0.0001);
             assertEquals("Timestamp comparison", start.toEpochMilli() + i,val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i], val.getAlarmName());
         }
     }
 
@@ -72,7 +72,7 @@ public void testDataRetrievalFloat() throws Exception {
             assertEquals("Value comparison", Float.valueOf(TestGenMsgIteratorRaw.VALUES_FLOAT[i]),(Float)val.getValue(),0.0001);
             assertEquals("Timestamp comparison", start.toEpochMilli() + i,val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i], val.getAlarmName());
         }
     }
 
@@ -93,10 +93,10 @@ public void testDataRetrievalInt() throws Exception {
         ArchiveVNumber val = null;
         for (int i = 0; i < vals.length; i++) {
             val = vals[i];
-            assertEquals("Value comparison", Integer.valueOf(TestGenMsgIteratorRaw.VALUES_INT[i]),(Integer)val.getValue());
+            assertEquals("Value comparison", Integer.valueOf(TestGenMsgIteratorRaw.VALUES_INT[i]),val.getValue());
             assertEquals("Timestamp comparison", start.toEpochMilli() + i, val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i], val.getAlarmName());
         }
     }
 
@@ -117,10 +117,10 @@ public void testDataRetrievalShort() throws Exception {
         ArchiveVNumber val = null;
         for (int i = 0; i < vals.length; i++) {
             val = vals[i];
-            assertEquals("Value comparison", Short.valueOf(TestGenMsgIteratorRaw.VALUES_SHORT[i] ),(Short)val.getValue());
+            assertEquals("Value comparison", Short.valueOf(TestGenMsgIteratorRaw.VALUES_SHORT[i] ),val.getValue());
             assertEquals("Timestamp comparison", start.toEpochMilli() + i,val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i], val.getAlarmName());
         }
     }
 
@@ -141,10 +141,10 @@ public void testDataRetrievalByte() throws Exception {
         ArchiveVNumber val = null;
         for (int i = 0; i < vals.length; i++) {
             val = vals[i];
-            assertEquals("Value comparison", Byte.valueOf(TestGenMsgIteratorRaw.VALUES_BYTE[i]) ,(Byte)val.getValue());
+            assertEquals("Value comparison", Byte.valueOf(TestGenMsgIteratorRaw.VALUES_BYTE[i]) ,val.getValue());
             assertEquals("Timestamp comparison", start.toEpochMilli() + i,val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i], val.getAlarmName());
         }
     }
 
@@ -168,7 +168,7 @@ public void testDataRetrievalString() throws Exception {
             assertEquals("Value comparison", "9554.0",val.getValue());
             assertEquals("Timestamp comparison", start.toEpochMilli() + i,val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i], val.getAlarmName());
         }
     }
 
@@ -192,7 +192,7 @@ public void testDataRetrievalEnum() throws Exception {
             assertEquals("Value comparison", "Enum <" + TestGenMsgIteratorRaw.VALUES_INT[i] + ">",val.getValue());
             assertEquals("Timestamp comparison", start.toEpochMilli() + i,val.getTimestamp().toEpochMilli());
             assertEquals("Severity", getSeverity(TestGenMsgIteratorRaw.SEVERITIES[i]), val.getAlarmSeverity());
-            assertEquals("Status", String.valueOf(TestGenMsgIteratorRaw.STATUS[i]), val.getAlarmName());
+            assertEquals("Status", TestGenMsgIteratorRaw.STATUS_STRING[i], val.getAlarmName());
         }
     }
 }