Просмотр исходного кода

Adapt Java version test cases to compare new features with old ones.

Timur Sağlam 4 лет назад
Родитель
Сommit
adffc71b82

+ 1 - 4
jplag/src/test/java/de/jplag/NewJavaFeaturesTest.java

@@ -18,13 +18,10 @@ public class NewJavaFeaturesTest extends TestBase {
         assertEquals(2, result.getNumberOfSubmissions());
         assertEquals(1, result.getComparisons().size());
         var comparison = result.getComparisons().get(0);
-        assertEquals(100, comparison.similarity(), Double.MIN_NORMAL);
+        assertEquals(92.1, comparison.similarity(), DELTA);
 
         // Five matches that each start at the same position:
         assertEquals(4, comparison.getMatches().size());
-        for (Match match : comparison.getMatches()) {
-            assertEquals(match.getStartOfFirst(), match.getStartOfSecond());
-        }
     }
 
 }

+ 0 - 17
jplag/src/test/resources/de/jplag/samples/NewJavaFeatures/A/Java11.java

@@ -13,23 +13,6 @@ public class Java11 {
         Cal cal = (var a, var b) -> a + b;
         int result = cal.sum(10, 20);
         System.out.println(result);
-        
-        // New HTTP Client API:
-        HttpClient client = HttpClient.newBuilder()
-                .version(Version.HTTP_1_1)
-                .followRedirects(Redirect.NORMAL)
-                .connectTimeout(Duration.ofSeconds(20))
-                .proxy(ProxySelector.of(new InetSocketAddress("proxy.example.com", 80)))
-                .authenticator(Authenticator.getDefault())
-                .build();
-        System.out.println(client);
-        
-        // New string methods:
-        String text = "ABCD";
-        text.repeat(2);
-        text.isBlank();
-        text.strip();
-        text.lines();
     }
     
     interface Cal {

+ 1 - 1
jplag/src/test/resources/de/jplag/samples/NewJavaFeatures/A/Java12.java

@@ -1,7 +1,7 @@
 import java.text.NumberFormat;
 import java.util.Locale;
 
-public class Java12 {
+public class Java12 { // Java 12 has no new relevant structural features
     public static void main(String[] args) {
         // New String methods:
         String text = "ABCD";

+ 2 - 2
jplag/src/test/resources/de/jplag/samples/NewJavaFeatures/A/Java14.java

@@ -8,8 +8,8 @@ public enum Java14 {
     public static void main(String[] args) {
         // Advanced switch expressions (JEP 361):
         boolean isWeekend = switch (MONDAY) {
-        case SATURDAY, SUNDAY -> true;
-        default -> false;
+            case SATURDAY, SUNDAY -> true;
+            default -> false;
         };
         System.out.println(isWeekend);
     }

+ 2 - 2
jplag/src/test/resources/de/jplag/samples/NewJavaFeatures/B/Java10.java

@@ -7,9 +7,9 @@ public class Java10 {
     List<Optional<String>> test;
     
     public Java10() {
-        // Var type for local variables (JEP 286):
+        // Typed variables as usual:
         test = new ArrayList<>();
-        var variable = test;
+        List<Optional<String>> variable = test;
         int length = variable.toString().length();
         test = variable;
         test.add(Optional.of(variable.toString()));

+ 1 - 18
jplag/src/test/resources/de/jplag/samples/NewJavaFeatures/B/Java11.java

@@ -10,26 +10,9 @@ public class Java11 {
 
     public static void main(String[] args) {
         // Var type allowed in lambda paramters (JEP 323):
-        Cal cal = (a, b) -> a + b;
+        Cal cal = (int a, int b) -> a + b;
         int result = cal.sum(10, 20);
         System.out.println(result);
-        
-        // New HTTP Client API:
-        HttpClient client = HttpClient.newBuilder()
-                .version(Version.HTTP_1_1)
-                .followRedirects(Redirect.ALWAYS)
-                .connectTimeout(Duration.ofSeconds(15))
-                .proxy(ProxySelector.of(new InetSocketAddress("proxy.example.de", 90)))
-                .authenticator(Authenticator.getDefault())
-                .build();
-        System.out.println(client);
-        
-        // New string methods:
-        String text = "ABCD";
-        text.repeat(4);
-        text.isBlank();
-        text.strip();
-        text.lines();
     }
     
     interface Cal {

+ 1 - 1
jplag/src/test/resources/de/jplag/samples/NewJavaFeatures/B/Java12.java

@@ -1,7 +1,7 @@
 import java.text.NumberFormat;
 import java.util.Locale;
 
-public class Java12 {
+public class Java12 { // Java 12 has no new relevant structural features
     public static void main(String[] args) {
         // New String methods:
         String text = "ABCD";

+ 7 - 5
jplag/src/test/resources/de/jplag/samples/NewJavaFeatures/B/Java14.java

@@ -6,11 +6,13 @@ public enum Java14 {
     SUNDAY;
 
     public static void main(String[] args) {
-        // Advanced switch expressions (JEP 361):
-        boolean isWeekend = switch (MONDAY) {
-        case FRIDAY, SATURDAY, SUNDAY -> true;
-        default -> false;
-        };
+        // Old switch expressions:
+        boolean isWeekend;
+        switch (MONDAY) {
+            case SATURDAY:
+            case SUNDAY: isWeekend = true; break;
+            default: isWeekend = false;
+        }
         System.out.println(isWeekend);
     }