moving test to MetastoreDataSourcesSuite

Author: mgaido91

sql/hive/src/test/scala/org/apache/spark/sql/hive/MetastoreDataSourcesSuite.scala

@@ -993,7 +993,6 @@ class MetastoreDataSourcesSuite extends QueryTest with SQLTestUtils with TestHiv
     spark.sql("""drop database if exists testdb8156 CASCADE""")
   }
 
-
   test("skip hive metadata on table creation") {
     withTempDir { tempPath =>
       val schema = StructType((1 to 5).map(i => StructField(s"c_$i", StringType)))
@@ -1345,6 +1344,17 @@ class MetastoreDataSourcesSuite extends QueryTest with SQLTestUtils with TestHiv
     }
   }
 
+  Seq("orc", "parquet").foreach { format =>
+    test(s"SPARK-22146: read files containing special characters using $format") {
+      val nameWithSpecialChars = s"sp&cial%chars"
+      withTempDir { dir =>
+        val tmpFile = s"$dir/$nameWithSpecialChars"
+        spark.createDataset(Seq("a", "b")).write.format(format).save(tmpFile)
+        spark.read.format(format).load(tmpFile)
+      }
+    }
+  }
+
   private def withDebugMode(f: => Unit): Unit = {
     val previousValue = sparkSession.sparkContext.conf.get(DEBUG_MODE)
     try {

sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/OrcSourceSuite.scala

@@ -274,16 +274,4 @@ class OrcSourceSuite extends OrcSuite {
       )).get.toString
     }
   }
-
-  test("SPARK-22146: read ORC files containing special characters") {
-    val dir = Utils.createTempDir().getCanonicalFile
-    import spark.implicits._
-    try {
-      val nameWithSpecialChars = s"$dir/a%3Abad name.orc"
-      spark.createDataset(Seq("a", "b")).write.format("orc").save(nameWithSpecialChars)
-      spark.read.format("orc").load(nameWithSpecialChars)
-    } finally {
-      Utils.deleteRecursively(dir)
-    }
-  }
 }