test: remove redundant formatter tests (#747)

Closes #745 ### Summary of Changes Formatting tests were difficult to maintain since several tests were testing the same rules in different contexts, including the formatting for * lists of constraints, * lists of parameters, * lists of results, * lists of type parameter, * classes (global vs. nested), * enum (global vs. nested), * functions (global vs. method). This made changes and additions cumbersome. This PR extracts the tests for these rules and removes the redundant ones.
Safe-DS · Nov 9, 2023 · 6510555 · 6510555
1 parent fe1a115
commit 6510555
Show file tree

Hide file tree

Showing 284 changed files with 68 additions and 2,369 deletions.
diff --git a/...s-lang/tests/resources/formatting/declarations/annotations/complex parameter list.sdstest b/...s-lang/tests/resources/formatting/declarations/annotations/complex parameter list.sdstest
diff --git a/...e-ds-lang/tests/resources/formatting/declarations/annotations/long parameter list.sdstest b/...e-ds-lang/tests/resources/formatting/declarations/annotations/long parameter list.sdstest
diff --git a/...e-ds-lang/tests/resources/formatting/declarations/annotations/multiple parameters.sdstest b/...e-ds-lang/tests/resources/formatting/declarations/annotations/multiple parameters.sdstest
diff --git a/...resources/formatting/declarations/annotations/with const typed optional parameter.sdstest b/...resources/formatting/declarations/annotations/with const typed optional parameter.sdstest
diff --git a/...resources/formatting/declarations/annotations/with const typed required parameter.sdstest b/...resources/formatting/declarations/annotations/with const typed required parameter.sdstest
diff --git a/...sources/formatting/declarations/annotations/with const untyped optional parameter.sdstest b/...sources/formatting/declarations/annotations/with const untyped optional parameter.sdstest
diff --git a/...sources/formatting/declarations/annotations/with const untyped required parameter.sdstest b/...sources/formatting/declarations/annotations/with const untyped required parameter.sdstest
diff --git a/...ons/with typed required parameter.sdstest → .../annotations/with constraint list.sdstest b/...ons/with typed required parameter.sdstest → .../annotations/with constraint list.sdstest
@@ -1,5 +1,6 @@
-annotation  MyAnnotation ( a :  Int )
+annotation  MyAnnotation  where  {
+ }
 
 // -----------------------------------------------------------------------------
 
-annotation MyAnnotation(a: Int)
+annotation MyAnnotation where {}
diff --git a/.../annotations/empty parameter list.sdstest → ...s/annotations/with parameter list.sdstest b/.../annotations/empty parameter list.sdstest → ...s/annotations/with parameter list.sdstest
diff --git a/...tests/resources/formatting/declarations/annotations/with typed optional parameter.sdstest b/...tests/resources/formatting/declarations/annotations/with typed optional parameter.sdstest
diff --git a/...sts/resources/formatting/declarations/annotations/with untyped optional parameter.sdstest b/...sts/resources/formatting/declarations/annotations/with untyped optional parameter.sdstest
diff --git a/...-ds-lang/tests/resources/formatting/declarations/classes/annotated type parameter.sdstest b/...-ds-lang/tests/resources/formatting/declarations/classes/annotated type parameter.sdstest
diff --git a/...formatting/declarations/classes/contravariant type parameter with annotation call.sdstest b/...formatting/declarations/classes/contravariant type parameter with annotation call.sdstest
diff --git a/...lang/tests/resources/formatting/declarations/classes/contravariant type parameter.sdstest b/...lang/tests/resources/formatting/declarations/classes/contravariant type parameter.sdstest
diff --git a/...ces/formatting/declarations/classes/covariant type parameter with annotation call.sdstest b/...ces/formatting/declarations/classes/covariant type parameter with annotation call.sdstest
diff --git a/...-ds-lang/tests/resources/formatting/declarations/classes/invariant type parameter.sdstest b/...-ds-lang/tests/resources/formatting/declarations/classes/invariant type parameter.sdstest
diff --git a/...-ds-lang/tests/resources/formatting/declarations/classes/long type parameter list.sdstest b/...-ds-lang/tests/resources/formatting/declarations/classes/long type parameter list.sdstest
diff --git a/...s/classes/methods/annotation call.sdstest → ...methods/annotated instance method.sdstest b/...s/classes/methods/annotation call.sdstest → ...methods/annotated instance method.sdstest
@@ -1,10 +1,11 @@
 class MyClass {
-    @Annotation fun  myFunction ( )
+    @MyAnnotation  fun  myFunction ( )
 }
 
+
 // -----------------------------------------------------------------------------
 
 class MyClass {
-    @Annotation
+    @MyAnnotation
     fun myFunction()
 }
diff --git a/.../methods/covariant type parameter.sdstest → ...s/methods/annotated static method.sdstest b/.../methods/covariant type parameter.sdstest → ...s/methods/annotated static method.sdstest
@@ -1,9 +1,10 @@
 class MyClass {
-    fun  myFunction < out  T > ( )
+    @MyAnnotation  static  fun myFunction ( )
 }
 
 // -----------------------------------------------------------------------------
 
 class MyClass {
-    fun myFunction<out T>()
+    @MyAnnotation
+    static fun myFunction()
 }
diff --git a/.../tests/resources/formatting/declarations/classes/methods/annotated type parameter.sdstest b/.../tests/resources/formatting/declarations/classes/methods/annotated type parameter.sdstest
diff --git a/...ng/declarations/classes/methods/contravariant type parameter with annotation call.sdstest b/...ng/declarations/classes/methods/contravariant type parameter with annotation call.sdstest
diff --git a/...ts/resources/formatting/declarations/classes/methods/contravariant type parameter.sdstest b/...ts/resources/formatting/declarations/classes/methods/contravariant type parameter.sdstest
diff --git a/...atting/declarations/classes/methods/covariant type parameter with annotation call.sdstest b/...atting/declarations/classes/methods/covariant type parameter with annotation call.sdstest
diff --git a/...ang/tests/resources/formatting/declarations/classes/methods/empty constraint list.sdstest b/...ang/tests/resources/formatting/declarations/classes/methods/empty constraint list.sdstest
diff --git a/...tests/resources/formatting/declarations/classes/methods/empty type parameter list.sdstest b/...tests/resources/formatting/declarations/classes/methods/empty type parameter list.sdstest
diff --git a/...hods/no parameters and no results.sdstest → ...s/classes/methods/instance method.sdstest b/...hods/no parameters and no results.sdstest → ...s/classes/methods/instance method.sdstest
diff --git a/.../tests/resources/formatting/declarations/classes/methods/invariant type parameter.sdstest b/.../tests/resources/formatting/declarations/classes/methods/invariant type parameter.sdstest
diff --git a/...-lang/tests/resources/formatting/declarations/classes/methods/multiple parameters.sdstest b/...-lang/tests/resources/formatting/declarations/classes/methods/multiple parameters.sdstest
diff --git a/...-ds-lang/tests/resources/formatting/declarations/classes/methods/multiple results.sdstest b/...-ds-lang/tests/resources/formatting/declarations/classes/methods/multiple results.sdstest
diff --git a/.../tests/resources/formatting/declarations/classes/methods/multiple type parameters.sdstest b/.../tests/resources/formatting/declarations/classes/methods/multiple type parameters.sdstest
diff --git a/...ang/tests/resources/formatting/declarations/classes/methods/no results (explicit).sdstest b/...ang/tests/resources/formatting/declarations/classes/methods/no results (explicit).sdstest
diff --git a/...sources/formatting/declarations/classes/methods/one typed result (in parentheses).sdstest b/...sources/formatting/declarations/classes/methods/one typed result (in parentheses).sdstest
diff --git a/...sources/formatting/declarations/classes/methods/one typed result (no parentheses).sdstest b/...sources/formatting/declarations/classes/methods/one typed result (no parentheses).sdstest
diff --git a/...urces/formatting/declarations/classes/methods/one untyped result (no parentheses).sdstest b/...urces/formatting/declarations/classes/methods/one untyped result (no parentheses).sdstest
diff --git a/...ces/formatting/declarations/classes/methods/one untyped result (with parentheses).sdstest b/...ces/formatting/declarations/classes/methods/one untyped result (with parentheses).sdstest
diff --git a/...clarations/classes/methods/static.sdstest → ...ons/classes/methods/static method.sdstest b/...clarations/classes/methods/static.sdstest → ...ons/classes/methods/static method.sdstest
diff --git a/...urces/formatting/declarations/classes/methods/with const typed optional parameter.sdstest b/...urces/formatting/declarations/classes/methods/with const typed optional parameter.sdstest