fix exception conversion

Addepar · Sep 1, 2024 · eed09a8 · eed09a8
1 parent 1f96297
commit eed09a8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/scripts/testng-junit/src/testng2junit5.py b/scripts/testng-junit/src/testng2junit5.py
@@ -309,10 +309,10 @@ def migrate_exceptions(content):
                 method_signature += line
 
             if '{' in line:
+                leading_space_count = len(line) - len(line.lstrip())
                 # parse out method lines
                 line = next(content_iter)
-                while not line.startswith('  }'):
-                    # 4 spaces.
+                while not line.startswith(' ' * leading_space_count + '}'):
                     method_body.append('    '+line)
                     line = next(content_iter)
 

diff --git a/scripts/testng-junit/src/tests/test_migrate_exception.py b/scripts/testng-junit/src/tests/test_migrate_exception.py
@@ -50,6 +50,11 @@
     new RateTierImpl(-1, -5.0, 0.0, 1.0);
   }
 
+  @Test(expectedExceptions = IllegalArgumentException.class)
+  void testDuplicateSignalNameThrowsException() {
+    final Config config = createConfig(120,
+      List.of(Pair.of("test", 1), Pair.of("test", 1)));
+  }
 """
 
 expected = """
@@ -129,6 +134,17 @@
       }
     );
   }
+
+  @Test
+  void testDuplicateSignalNameThrowsException() {
+    assertThrows(
+      IllegalArgumentException.class,
+      () -> {
+        final Config config = createConfig(120,
+          List.of(Pair.of("test", 1), Pair.of("test", 1)));
+      }
+    );
+  }
 """