.

spark/src/test/scala/org/apache/spark/sql/delta/columnmapping/RemoveColumnMappingCDCSuite.scala

@@ -151,7 +151,7 @@ class RemoveColumnMappingCDCSuite extends RemoveColumnMappingSuiteUtils {
 
   private case object Downgrade extends Operation {
     override def runOperation(): Unit = {
-      disableColumnMapping()
+      unsetColumnMappingProperty(useUnset = false)
       insertMoreRows()
     }
   }
@@ -196,10 +196,6 @@ class RemoveColumnMappingCDCSuite extends RemoveColumnMappingSuiteUtils {
     }
   }
 
-  private val firstColumn = "first_column_name"
-  private val thirdColumn = "third_column_name"
-  private val renamedThirdColumn = "renamed_third_column_name"
-
   private def createTable(): Unit = {
     val columnMappingMode = "none"
     sql(s"""CREATE TABLE $testTableName
@@ -212,33 +208,10 @@ class RemoveColumnMappingCDCSuite extends RemoveColumnMappingSuiteUtils {
              |""".stripMargin)
   }
 
-  private def enableColumnMapping(): Unit = {
-    sql(
-      s"""ALTER TABLE $testTableName
-        SET TBLPROPERTIES (
-        '${DeltaConfigs.COLUMN_MAPPING_MODE.key}' = 'name',
-        'delta.minReaderVersion' = '2',
-        'delta.minWriterVersion' = '5')""")
-  }
-
-  private def disableColumnMapping(): Unit = {
-    unsetColumnMappingProperty(useUnset = false)
-  }
-
   private def insertMoreRows(): Unit = {
     sql(s"INSERT INTO $testTableName SELECT * FROM $testTableName LIMIT $totalRows")
   }
 
-  private def renameColumn(): Unit = {
-    sql(s"ALTER TABLE $testTableName RENAME COLUMN $thirdColumn TO $renamedThirdColumn")
-  }
-
-  private def dropColumn(): Unit = {
-    sql(s"ALTER TABLE $testTableName DROP COLUMN $thirdColumn")
-  }
-
-  private def deltaLog = DeltaLog.forTable(spark, TableIdentifier(testTableName))
-
   private def getCDCAndFailIncompatibleSchemaChange(
       startVersion: Long,
       endVersion: Option[Long]) = {

spark/src/test/scala/org/apache/spark/sql/delta/columnmapping/RemoveColumnMappingSuiteUtils.scala

@@ -35,12 +35,12 @@ import org.apache.spark.sql.functions.col
  */
 trait RemoveColumnMappingSuiteUtils extends QueryTest with DeltaColumnMappingSuiteUtils {
 
-  override def beforeAll(): Unit = {
+  override protected def beforeAll(): Unit = {
     super.beforeAll()
     spark.conf.set(ALLOW_COLUMN_MAPPING_REMOVAL.key, "true")
   }
 
-  override def afterEach(): Unit = {
+  override protected def afterEach(): Unit = {
     sql(s"DROP TABLE IF EXISTS $testTableName")
     super.afterEach()
   }
@@ -50,7 +50,12 @@ trait RemoveColumnMappingSuiteUtils extends QueryTest with DeltaColumnMappingSui
   protected val rowsPerFile = totalRows / numFiles
   protected val logicalColumnName = "logical_column_name"
   protected val secondColumn = "second_column_name"
+  protected val firstColumn = "first_column_name"
+  protected val thirdColumn = "third_column_name"
+  protected val renamedThirdColumn = "renamed_third_column_name"
+
   protected val testTableName: String = "test_table_" + this.getClass.getSimpleName
+  protected def deltaLog = DeltaLog.forTable(spark, TableIdentifier(testTableName))
 
   import testImplicits._
 
@@ -124,6 +129,23 @@ trait RemoveColumnMappingSuiteUtils extends QueryTest with DeltaColumnMappingSui
          |""".stripMargin)
   }
 
+  protected def enableColumnMapping(): Unit = {
+    sql(
+      s"""ALTER TABLE $testTableName
+        SET TBLPROPERTIES (
+        '${DeltaConfigs.COLUMN_MAPPING_MODE.key}' = 'name',
+        'delta.minReaderVersion' = '2',
+        'delta.minWriterVersion' = '5')""")
+  }
+
+  protected def renameColumn(): Unit = {
+    sql(s"ALTER TABLE $testTableName RENAME COLUMN $thirdColumn TO $renamedThirdColumn")
+  }
+
+  protected def dropColumn(): Unit = {
+    sql(s"ALTER TABLE $testTableName DROP COLUMN $thirdColumn")
+  }
+
   /**
    * Get all files in snapshot.
    */