simplify repeated code in tests

Author: szehon-ho

sql/core/src/test/scala/org/apache/spark/sql/connector/AlterTableTests.scala

@@ -1591,6 +1591,13 @@ trait AlterTableTests extends SharedSparkSession with QueryErrorsBase {
     }
   }
 
+  private def checkConflictSpecialColNameResult(table: String): Unit = {
+    val result = sql(s"SELECT * FROM $table").collect()
+    assert(result.length == 1)
+    assert(!result(0).getBoolean(0))
+    assert(result(0).get(1) != null)
+  }
+
   test("Add column with special column name default value conflicting with column name") {
     withSQLConf(SQLConf.DEFAULT_COLUMN_ALLOWED_PROVIDERS.key -> s"$v2Format, ") {
       val t = fullTableName("table_name")
@@ -1599,40 +1606,28 @@ trait AlterTableTests extends SharedSparkSession with QueryErrorsBase {
         sql(s"CREATE TABLE $t (i boolean) USING $v2Format")
         sql(s"ALTER TABLE $t ADD COLUMN s timestamp DEFAULT current_timestamp")
         sql(s"INSERT INTO $t(i) VALUES(false)")
-        val result = sql(s"SELECT * FROM $t").collect()
-        assert(result.length == 1)
-        assert(!result(0).getBoolean(0))
-        assert(result(0).getTimestamp(1) != null)
+        checkConflictSpecialColNameResult(t)
       }
       // There is a default value with special column name 'current_user' but in uppercase.
       withTable(t) {
         sql(s"CREATE TABLE $t (i boolean) USING $v2Format")
         sql(s"ALTER TABLE $t ADD COLUMN s string DEFAULT CURRENT_USER")
         sql(s"INSERT INTO $t(i) VALUES(false)")
-        val result = sql(s"SELECT * FROM $t").collect()
-        assert(result.length == 1)
-        assert(!result(0).getBoolean(0))
-        assert(result(0).getString(1) != null)
+        checkConflictSpecialColNameResult(t)
       }
       // There is a default value with special column name same as current column name
       withTable(t) {
         sql(s"CREATE TABLE $t (b boolean) USING $v2Format")
         sql(s"ALTER TABLE $t ADD COLUMN current_timestamp timestamp DEFAULT current_timestamp")
         sql(s"INSERT INTO $t(b) VALUES(false)")
-        val result = sql(s"SELECT * FROM $t").collect()
-        assert(result.length == 1)
-        assert(!result(0).getBoolean(0))
-        assert(result(0).getTimestamp(1) != null)
+        checkConflictSpecialColNameResult(t)
       }
       // There is a default value with special column name same as another column name
       withTable(t) {
         sql(s"CREATE TABLE $t (current_date boolean) USING $v2Format")
         sql(s"ALTER TABLE $t ADD COLUMN s date DEFAULT current_date")
         sql(s"INSERT INTO $t(current_date) VALUES(false)")
-        val result = sql(s"SELECT * FROM $t").collect()
-        assert(result.length == 1)
-        assert(!result(0).getBoolean(0))
-        assert(result(0).getDate(1) != null)
+        checkConflictSpecialColNameResult(t)
       }
     }
   }
@@ -1645,40 +1640,28 @@ trait AlterTableTests extends SharedSparkSession with QueryErrorsBase {
         sql(s"CREATE TABLE $t (i boolean, s timestamp) USING $v2Format")
         sql(s"ALTER TABLE $t ALTER COLUMN s SET DEFAULT current_timestamp")
         sql(s"INSERT INTO $t(i) VALUES(false)")
-        val result = sql(s"SELECT * FROM $t").collect()
-        assert(result.length == 1)
-        assert(!result(0).getBoolean(0))
-        assert(result(0).getTimestamp(1) != null)
+        checkConflictSpecialColNameResult(t)
       }
       // There is a default value with special column name 'current_user' but in uppercase.
       withTable(t) {
         sql(s"CREATE TABLE $t (i boolean, s string) USING $v2Format")
         sql(s"ALTER TABLE $t ALTER COLUMN s SET DEFAULT CURRENT_USER")
         sql(s"INSERT INTO $t(i) VALUES(false)")
-        val result = sql(s"SELECT * FROM $t").collect()
-        assert(result.length == 1)
-        assert(!result(0).getBoolean(0))
-        assert(result(0).getString(1) != null)
+        checkConflictSpecialColNameResult(t)
       }
       // There is a default value with special column name same as current column name
       withTable(t) {
-        sql(s"CREATE TABLE $t (current_timestamp timestamp, b boolean) USING $v2Format")
+        sql(s"CREATE TABLE $t (b boolean, current_timestamp timestamp) USING $v2Format")
         sql(s"ALTER TABLE $t ALTER COLUMN current_timestamp SET DEFAULT current_timestamp")
         sql(s"INSERT INTO $t(b) VALUES(false)")
-        val result = sql(s"SELECT * FROM $t").collect()
-        assert(result.length == 1)
-        assert(result(0).getTimestamp(0) != null)
-        assert(!result(0).getBoolean(1))
+        checkConflictSpecialColNameResult(t)
       }
       // There is a default value with special column name same as another column name
       withTable(t) {
         sql(s"CREATE TABLE $t (current_date boolean, s date) USING $v2Format")
         sql(s"ALTER TABLE $t ALTER COLUMN s SET DEFAULT current_date")
         sql(s"INSERT INTO $t(current_date) VALUES(false)")
-        val result = sql(s"SELECT * FROM $t").collect()
-        assert(result.length == 1)
-        assert(!result(0).getBoolean(0))
-        assert(result(0).getDate(1) != null)
+        checkConflictSpecialColNameResult(t)
       }
     }
   }

sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala

@@ -3887,14 +3887,7 @@ class DataSourceV2SQLSuiteV1Filter
       val result = sql(s"SELECT * FROM $t").collect()
       assert(result.length == 1)
       assert(result(0).getString(0) == "a")
-      assert(result(0).get(1) != null)
-      assert(result(0).get(2) != null)
-      assert(result(0).get(3) != null)
-      assert(result(0).get(4) != null)
-      assert(result(0).get(5) != null)
-      assert(result(0).get(6) != null)
-      assert(result(0).get(7) != null)
-      assert(result(0).get(8) != null)
+      Seq(1 to 8: _*).foreach(i => assert(result(0).get(i) != null))
     }
   }