Add test cases for type annotations on classes (#1368)

Author: nedtwigg

plugin-maven/src/test/java/com/diffplug/spotless/maven/java/FormatAnnotationsStepTest.java

@@ -30,4 +30,14 @@ void testFormatAnnotations() throws Exception {
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile(path).sameAsResource("java/formatannotations/FormatAnnotationsTestOutput.test");
 	}
+
+	@Test
+	void testFormatAnnotationsAccessModifiers() throws Exception {
+		writePomWithJavaSteps("<formatAnnotations/>");
+
+		String path = "src/main/java/test.java";
+		setFile(path).toResource("java/formatannotations/FormatAnnotationsAccessModifiersInput.test");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("java/formatannotations/FormatAnnotationsAccessModifiersOutput.test");
+	}
 }

testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersInput.test

@@ -0,0 +1,63 @@
+// Annotations in the wrong order.  The preferred order is:
+//  * declaration annotations
+//  * access modifiers such as `public`
+//  * type annotations
+//  * type
+
+class FormatAnnotationsAccessModifiers {
+
+  @Nullable public Object myMethod1() {
+    return null;
+  }
+
+  @Nullable
+  public Object myMethod2() {
+    return null;
+  }
+
+  @Nullable
+  public
+  Object myMethod3() {
+    return null;
+  }
+
+  @Nullable
+  @Deprecated
+  public Object myMethod4() {
+    return null;
+  }
+
+  @Deprecated
+  @Nullable
+  public Object myMethod4a() {
+    return null;
+  }
+
+  @Override
+  @Nullable
+  @Deprecated
+  public Object myMethod5() {
+    return null;
+  }
+
+  @Nullable @Deprecated public Object myMethod6() {
+    return null;
+  }
+}
+
+@Deprecated
+@Interned
+@MustCall("close")
+@SuppressWarnings
+public class MyClass3 {
+  // No body
+}
+
+public
+@Deprecated
+@SuppressWarnings
+@Interned
+@MustCall("close")
+class MyClass4 {
+  // No body
+}

testlib/src/main/resources/java/formatannotations/FormatAnnotationsAccessModifiersOutput.test

@@ -0,0 +1,54 @@
+// Annotations in the wrong order.  The preferred order is:
+//  * declaration annotations
+//  * access modifiers such as `public`
+//  * type annotations
+//  * type
+
+class FormatAnnotationsAccessModifiers {
+
+  @Nullable public Object myMethod1() {
+    return null;
+  }
+
+  @Nullable public Object myMethod2() {
+    return null;
+  }
+
+  @Nullable public
+  Object myMethod3() {
+    return null;
+  }
+
+  @Nullable @Deprecated
+  public Object myMethod4() {
+    return null;
+  }
+
+  @Deprecated
+  @Nullable public Object myMethod4a() {
+    return null;
+  }
+
+  @Override
+  @Nullable @Deprecated
+  public Object myMethod5() {
+    return null;
+  }
+
+  @Nullable @Deprecated public Object myMethod6() {
+    return null;
+  }
+}
+
+@Deprecated
+@Interned @MustCall("close") @SuppressWarnings
+public class MyClass3 {
+  // No body
+}
+
+public
+@Deprecated
+@SuppressWarnings
+@Interned @MustCall("close") class MyClass4 {
+  // No body
+}

testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestInput.test

@@ -75,3 +75,12 @@ class FormatAnnotationsTest {
   @Localized
   String localized;
 }
+
+@Deprecated
+@SuppressWarnings
+public
+@Interned
+@MustCall("close")
+class MyClass1 {
+  // No body
+}

testlib/src/main/resources/java/formatannotations/FormatAnnotationsTestOutput.test

@@ -49,3 +49,10 @@ class FormatAnnotationsTest {
 
   @Localized String localized;
 }
+
+@Deprecated
+@SuppressWarnings
+public
+@Interned @MustCall("close") class MyClass1 {
+  // No body
+}