[SPARK-57778][SQL][TESTS] Use namedGridTest for the non-selectable object cases

Author: ivan-leventsov

connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/OracleIntegrationSuite.scala

@@ -206,58 +206,56 @@ class OracleIntegrationSuite extends DockerJDBCIntegrationV2Suite with V2JDBCTes
     }
   }
 
-  test("SPARK-57778: objects that are not selectable as tables are handled gracefully") {
-    // Each case: (description, setup DDL, object name in SYSTEM, teardown DDL). Oracle's table
-    // listing surfaces these objects, but they cannot be read as tables.
-    val cases = Seq(
-      (
-        "synonym to a procedure (ORA-04044)",
-        Seq(
-          "CREATE PROCEDURE test_proc AS BEGIN NULL; END;",
-          "CREATE SYNONYM proc_synonym FOR test_proc"),
-        "PROC_SYNONYM",
-        Seq("DROP SYNONYM proc_synonym", "DROP PROCEDURE test_proc")),
-      (
-        "synonym to a broken function (ORA-04044)",
-        Seq(
-          """CREATE FUNCTION broken_func RETURN NUMBER AS
-            |  x NUMBER;
-            |BEGIN
-            |  SELECT col INTO x FROM non_existent_table_xyz;
-            |  RETURN x;
-            |END;""".stripMargin,
-          "CREATE SYNONYM func_synonym FOR broken_func"),
-        "FUNC_SYNONYM",
-        Seq("DROP SYNONYM func_synonym", "DROP FUNCTION broken_func")),
-      (
-        "invalid view (ORA-04063)",
-        Seq("CREATE FORCE VIEW invalid_view AS SELECT * FROM non_existent_table_xyz"),
-        "INVALID_VIEW",
-        Seq("DROP VIEW invalid_view")))
-
-    val tableCatalog =
-      spark.sessionState.catalogManager.catalog(catalogName).asInstanceOf[TableCatalog]
-
-    cases.foreach { case (desc, setup, objectName, teardown) =>
-      withClue(s"[$desc] ") {
-        Using.resource(getConnection()) { conn =>
-          setup.foreach(conn.prepareStatement(_).executeUpdate())
-        }
-        try {
-          // tableExists treats a non-selectable object as non-existent instead of throwing.
-          assert(!tableCatalog.tableExists(Identifier.of(Array("SYSTEM"), objectName)))
-
-          // Reading it surfaces a dedicated, clear error instead of a raw JDBC failure.
-          val e = intercept[AnalysisException] {
-            sql(s"SELECT * FROM $catalogName.SYSTEM.$objectName").collect()
-          }
-          assert(e.getCondition == "JDBC_OBJECT_NOT_SELECTABLE")
-          assert(e.getMessageParameters.get("objectName").contains(objectName))
-        } finally {
-          Using.resource(getConnection()) { conn =>
-            teardown.foreach(conn.prepareStatement(_).executeUpdate())
-          }
-        }
+  // An object that Oracle's table listing surfaces but that cannot be read as a table.
+  // `setup`/`teardown` are the DDL to create/drop it; `objectName` is its name in SYSTEM.
+  case class NonSelectableObjectCase(setup: Seq[String], objectName: String, teardown: Seq[String])
+
+  private val nonSelectableObjectCases = Map(
+    "synonym to a procedure (ORA-04044)" -> NonSelectableObjectCase(
+      setup = Seq(
+        "CREATE PROCEDURE test_proc AS BEGIN NULL; END;",
+        "CREATE SYNONYM proc_synonym FOR test_proc"),
+      objectName = "PROC_SYNONYM",
+      teardown = Seq("DROP SYNONYM proc_synonym", "DROP PROCEDURE test_proc")),
+    "synonym to a broken function (ORA-04044)" -> NonSelectableObjectCase(
+      // Function referencing a missing object -> created INVALID.
+      setup = Seq(
+        """CREATE FUNCTION broken_func RETURN NUMBER AS
+          |  x NUMBER;
+          |BEGIN
+          |  SELECT col INTO x FROM non_existent_table_xyz;
+          |  RETURN x;
+          |END;""".stripMargin,
+        "CREATE SYNONYM func_synonym FOR broken_func"),
+      objectName = "FUNC_SYNONYM",
+      teardown = Seq("DROP SYNONYM func_synonym", "DROP FUNCTION broken_func")),
+    "invalid view (ORA-04063)" -> NonSelectableObjectCase(
+      // FORCE-create a view over a missing table -> view is INVALID; SELECT raises ORA-04063.
+      setup = Seq("CREATE FORCE VIEW invalid_view AS SELECT * FROM non_existent_table_xyz"),
+      objectName = "INVALID_VIEW",
+      teardown = Seq("DROP VIEW invalid_view")))
+
+  namedGridTest("SPARK-57778: non-selectable object is handled gracefully")(
+      nonSelectableObjectCases) { testCase =>
+    Using.resource(getConnection()) { conn =>
+      testCase.setup.foreach(conn.prepareStatement(_).executeUpdate())
+    }
+    try {
+      val tableCatalog =
+        spark.sessionState.catalogManager.catalog(catalogName).asInstanceOf[TableCatalog]
+
+      // tableExists treats a non-selectable object as non-existent instead of throwing.
+      assert(!tableCatalog.tableExists(Identifier.of(Array("SYSTEM"), testCase.objectName)))
+
+      // Reading it surfaces a dedicated, clear error instead of a raw JDBC failure.
+      val e = intercept[AnalysisException] {
+        sql(s"SELECT * FROM $catalogName.SYSTEM.${testCase.objectName}").collect()
+      }
+      assert(e.getCondition == "JDBC_OBJECT_NOT_SELECTABLE")
+      assert(e.getMessageParameters.get("objectName").contains(testCase.objectName))
+    } finally {
+      Using.resource(getConnection()) { conn =>
+        testCase.teardown.foreach(conn.prepareStatement(_).executeUpdate())
       }
     }
   }