Merge branch 'master' into hvdc

itesla · Feb 14, 2017 · af7b7c8 · af7b7c8
2 parents 603b3cf + a90e874
commit af7b7c8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/commons/src/test/java/eu/itesla_project/commons/io/table/TableFormatterTest.java b/commons/src/test/java/eu/itesla_project/commons/io/table/TableFormatterTest.java
@@ -48,10 +48,10 @@ public void testCsv() throws IOException {
             write(formatter);
         }
         assertEquals(new String(bos.toByteArray(), StandardCharsets.UTF_8),
-                "csv test\n" +
-                "int;double;float;bool;empty;char;string;empty2\n" +
-                "2;inv;2.40000;true;;a;aaa;\n" +
-                "3;4.20000;inv;false;;b;bbb;\n");
+                "csv test" + System.lineSeparator() +
+                "int;double;float;bool;empty;char;string;empty2" + System.lineSeparator() +
+                "2;inv;2.40000;true;;a;aaa;" + System.lineSeparator() +
+                "3;4.20000;inv;false;;b;bbb;" + System.lineSeparator());
     }
 
     @Test
@@ -63,12 +63,12 @@ public void testAcsii() throws IOException {
             write(formatter);
         }
         assertEquals(new String(bos.toByteArray(), StandardCharsets.UTF_8),
-                "ascii test:\n" +
+                "ascii test:" + System.lineSeparator() +
                 "+-----+---------+---------+-------+-------+------+--------+--------+\n" +
                 "| int | double  | float   | bool  | empty | char | string | empty2 |\n" +
                 "+-----+---------+---------+-------+-------+------+--------+--------+\n" +
                 "| 2   | inv     | 2.40000 | true  |       | a    | aaa    |        |\n" +
                 "| 3   | 4.20000 | inv     | false |       | b    | bbb    |        |\n" +
-                "+-----+---------+---------+-------+-------+------+--------+--------+\n");
+                "+-----+---------+---------+-------+-------+------+--------+--------+" + System.lineSeparator());
     }
 }
diff --git a/security-analysis/src/test/java/eu/itesla_project/security/SecurityTest.java b/security-analysis/src/test/java/eu/itesla_project/security/SecurityTest.java
@@ -53,9 +53,9 @@ public void printPreContingencyViolations() throws Exception {
         } finally {
             writer.close();
         }
-        assertEquals(writer.toString(), "Pre-contingency violations\n" +
-                                               "Action,Equipment,Violation type,Violation name,Value,Limit,Charge %\n" +
-                                               ",line1,CURRENT,20',1100.00,1000.0,110\n");
+        assertEquals(writer.toString(), "Pre-contingency violations" + System.lineSeparator() +
+                                               "Action,Equipment,Violation type,Violation name,Value,Limit,Charge %" + System.lineSeparator() +
+                                               ",line1,CURRENT,20',1100.00,1000.0,110" + System.lineSeparator());
     }
 
     @Test
@@ -66,11 +66,11 @@ public void printPostContingencyViolations() throws Exception {
         } finally {
             writer.close();
         }
-        assertEquals(writer.toString(), "Post-contingency limit violations\n" +
-                                               "Contingency,Status,Action,Equipment,Violation type,Violation name,Value,Limit,Charge %\n" +
-                                               "contingency1,converge,,,,,,,\n" +
-                                               ",,,line1,CURRENT,20',1100.00,1000.0,110\n" +
-                                               ",,,line2,CURRENT,10',950.000,900.0,106\n");
+        assertEquals(writer.toString(), "Post-contingency limit violations" + System.lineSeparator() +
+                                               "Contingency,Status,Action,Equipment,Violation type,Violation name,Value,Limit,Charge %" + System.lineSeparator() +
+                                               "contingency1,converge,,,,,,," + System.lineSeparator() +
+                                               ",,,line1,CURRENT,20',1100.00,1000.0,110" + System.lineSeparator() +
+                                               ",,,line2,CURRENT,10',950.000,900.0,106" + System.lineSeparator());
     }
 
     @Test
@@ -81,9 +81,9 @@ public void printPostContingencyViolationsWithPreContingencyViolationsFiltering(
         } finally {
             writer.close();
         }
-        assertEquals(writer.toString(), "Post-contingency limit violations\n" +
-                                               "Contingency,Status,Action,Equipment,Violation type,Violation name,Value,Limit,Charge %\n" +
-                                               "contingency1,converge,,,,,,,\n" +
-                                               ",,,line2,CURRENT,10',950.000,900.0,106\n");
+        assertEquals(writer.toString(), "Post-contingency limit violations" + System.lineSeparator() +
+                                               "Contingency,Status,Action,Equipment,Violation type,Violation name,Value,Limit,Charge %" + System.lineSeparator() +
+                                               "contingency1,converge,,,,,,," + System.lineSeparator() +
+                                               ",,,line2,CURRENT,10',950.000,900.0,106" + System.lineSeparator());
     }
 }