fixTest

Netflix · Jun 2, 2024 · ab3057f · ab3057f
1 parent 55fe85b
commit ab3057f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/...ts/src/functionalTest/groovy/com/netflix/metacat/ParentChildRelMetadataServiceSpec.groovy b/...ts/src/functionalTest/groovy/com/netflix/metacat/ParentChildRelMetadataServiceSpec.groovy
@@ -171,7 +171,7 @@ class ParentChildRelMetadataServiceSpec extends Specification{
         assert service.getChildren(newParent) == newParent_children_expected
 
         // Test Child
-        def child_parent_expected = new ParentInfo(parent.toString(), type)
+        def child_parent_expected = new ParentInfo(newParent.toString(), type)
         assert child_parent_expected == service.getParent(child)
         assert service.getChildren(child).size() == 0
     }
@@ -206,7 +206,7 @@ class ParentChildRelMetadataServiceSpec extends Specification{
 
         // Test Parent
         assert service.getParent(parent) == null
-        def parent_children_expected  = [new ChildInfo(child.toString(), type)] as Set
+        def parent_children_expected  = [new ChildInfo(newChild.toString(), type)] as Set
         assert parent_children_expected == service.getChildren(parent)
 
         // Test Child
@@ -226,6 +226,8 @@ class ParentChildRelMetadataServiceSpec extends Specification{
         def child = QualifiedName.ofTable(catalog, database, "c")
         def type = "clone";
         service.createParentChildRelation(parent, child, type)
+        when:
+        service.drop(child)
 
         // Test Parent
         def parent_parent_actual = service.getParent(parent)
@@ -248,8 +250,11 @@ class ParentChildRelMetadataServiceSpec extends Specification{
         def child = QualifiedName.ofTable(catalog, database, "c")
         def type = "clone";
         service.createParentChildRelation(parent, child, type)
-        assertThrows(RuntimeException.class, service.drop(parent))
 
+        when:
+        service.drop(parent)
+        then:
+        def e = thrown(RuntimeException)
         // Test Parent
         def parent_parent_actual = service.getParent(parent)
         assert parent_parent_actual == null

diff --git a/.../src/main/java/com/netflix/metacat/metadata/mysql/MySqlParentChildRelMetaDataService.java b/.../src/main/java/com/netflix/metacat/metadata/mysql/MySqlParentChildRelMetaDataService.java
@@ -104,14 +104,16 @@ public void rename(final QualifiedName oldName, final QualifiedName newName) {
             retryTemplate.execute((RetryCallback<Void, RuntimeException>) context -> {
                 jdbcTemplate.update(connection -> {
                     // Rename Parent Entity
-                    try (final PreparedStatement renameParentPS = connection.prepareStatement(SQL_RENAME_PARENT_ENTITY)) {
+                    try (final PreparedStatement renameParentPS =
+                             connection.prepareStatement(SQL_RENAME_PARENT_ENTITY)) {
                         renameParentPS.setString(1, newName.toString());
                         renameParentPS.setString(2, oldName.toString());
                         renameParentPS.executeUpdate();
                     }
 
                     // Rename Child Entity
-                    try (final PreparedStatement renameChildPS = connection.prepareStatement(SQL_RENAME_CHILD_ENTITY)) {
+                    try (final PreparedStatement renameChildPS =
+                             connection.prepareStatement(SQL_RENAME_CHILD_ENTITY)) {
                         renameChildPS.setString(1, newName.toString());
                         renameChildPS.setString(2, oldName.toString());
                         renameChildPS.executeUpdate();