Adds test for switch with arrow (#183)

* Adds test for switch with arrow

* Run switch test only if java >= 14

---------

Co-authored-by: Caesar Ralf <[email protected]>

src/test/java/com/spotify/fmt/FMTTest.java

@@ -43,8 +43,8 @@
 import org.mockito.Mockito;
 
 public class FMTTest {
-  private static String FORMAT = "format";
-  private static String CHECK = "check";
+  private static final String FORMAT = "format";
+  private static final String CHECK = "check";
 
   @Rule public MojoRule mojoRule = new MojoRule();
 
@@ -177,7 +177,7 @@ public void forkAlways() throws Exception {
 
   @Test
   public void forkNeverBeforeJDK16() throws Exception {
-    assumeFalse(javaRuntimeStronglyEncapsulatesByDefault()); // Skip if forking is needed.
+    assumeFalse(isJavaVersionEqualOrHigherThan("16")); // Skip if forking is needed.
     FMT fmt = loadMojo("fork_never_beforejdk16", FORMAT);
     assertThat(fmt.shouldFork()).isFalse();
     fmt.execute();
@@ -189,7 +189,7 @@ public void forkNeverBeforeJDK16() throws Exception {
       expected =
           IllegalAccessError.class) // Could stop throwing this if google-java-format is fixed.
   public void forkNeverAfterJDK16() throws Exception {
-    assumeTrue(javaRuntimeStronglyEncapsulatesByDefault()); // Skip if forking is not needed.
+    assumeTrue(isJavaVersionEqualOrHigherThan("16"));
     FMT fmt = loadMojo("fork_never_afterjdk16", FORMAT);
     assertThat(fmt.shouldFork()).isFalse();
     fmt.execute();
@@ -205,6 +205,16 @@ public void unsupportedForkMode() throws Exception {
     assertThat(fmt.getResult().processedFiles()).hasSize(1);
   }
 
+  @Test
+  public void switchWithArrows() throws Exception {
+    assumeTrue(isJavaVersionEqualOrHigherThan("14"));
+    FMT fmt = loadMojo("switchwitharrows", FORMAT);
+
+    fmt.execute();
+
+    assertThat(fmt.getResult().processedFiles()).hasSize(1);
+  }
+
   @Test(expected = MojoFailureException.class)
   public void validateOnlyFailsWhenNotFormatted() throws Exception {
     Check check = loadMojo("validateonly_notformatted", CHECK);
@@ -322,7 +332,7 @@ private Log setupLogSpy(Mojo mojo) {
     return spy;
   }
 
-  private static boolean javaRuntimeStronglyEncapsulatesByDefault() {
-    return Runtime.version().compareTo(Runtime.Version.parse("16")) >= 0;
+  private static boolean isJavaVersionEqualOrHigherThan(final String javaVersion) {
+    return Runtime.version().compareTo(Runtime.Version.parse(javaVersion)) >= 0;
   }
 }

src/test/resources/switchwitharrows/invoker.properties

@@ -0,0 +1,2 @@
+invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:format
+invoker.java.version=14+

src/test/resources/switchwitharrows/pom.xml

@@ -0,0 +1,29 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.plugin.my.unit</groupId>
+  <artifactId>project-to-test</artifactId>
+  <version>1.0.0</version>
+  <packaging>jar</packaging>
+  <name>Test MyMojo</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
+
+
+
+
+
+
+
+
+

src/test/resources/switchwitharrows/src/main/java/com.spotify.fmt.test/Main.java

@@ -0,0 +1,13 @@
+package com.spotify.fmt.test;
+
+public class Main {
+  public static void main(String[] args) {
+    var test = "a";
+    var result =
+        switch (test) {
+          case "videos" -> null;
+          case "images" -> null;
+          default -> null;
+        };
+  }
+}