Fix generated test class names

aalbu · May 14, 2020 · b56801c · b56801c
1 parent 7a33e73
commit b56801c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.../main/java/io/prestosql/tempto/internal/convention/ConventionBasedTestProxyGenerator.java b/.../main/java/io/prestosql/tempto/internal/convention/ConventionBasedTestProxyGenerator.java
@@ -82,7 +82,10 @@ public ConventionBasedTest generateProxy(ConventionBasedTest conventionBasedTest
 
     private String generatedClassName(ConventionBasedTest conventionBasedTest)
     {
-        List<String> testNameParts = Splitter.on('.').splitToList(conventionBasedTest.getTestName());
+        List<String> testNameParts = Splitter.on('.').omitEmptyStrings().splitToList(conventionBasedTest.getTestName());
+        if (testNameParts.size() == 1) {
+            return testPackage;
+        }
         return testPackage + "." + toJavaSymbol(testNameParts.get(testNameParts.size() - 2));
     }
 

diff --git a/...oovy/io/prestosql/tempto/internal/convention/ConventionBasedTestProxyGeneratorTest.groovy b/...oovy/io/prestosql/tempto/internal/convention/ConventionBasedTestProxyGeneratorTest.groovy
@@ -87,6 +87,11 @@ class ConventionBasedTestProxyGeneratorTest
 
         where:
         testName                       | expectedClassName                 | expectedMethodName
+        'a'                            | 'io.prestosql.tempto'             | 'a'
+        '.a'                           | 'io.prestosql.tempto'             | 'a'
+        'a.b'                          | 'io.prestosql.tempto.a'           | 'b'
+        '.a.b'                         | 'io.prestosql.tempto.a'           | 'b'
+        'a.b.c'                        | 'io.prestosql.tempto.b'           | 'c'
         'a.b.c.d'                      | 'io.prestosql.tempto.c'           | 'd'
         'a.b.9c.1d'                    | 'io.prestosql.tempto._9c'         | '_1d'
         'a.b.ala ma kota.a-kot-ma ale' | 'io.prestosql.tempto.ala_ma_kota' | 'a_kot_ma_ale'