delete unit test source files

derrickoswald · Aug 2, 2018 · e6eed02 · e6eed02
1 parent a95d43c
commit e6eed02
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 36 deletions.
diff --git a/src/test/scala/ch/ninecode/SparkSuite.scala b/src/test/scala/ch/ninecode/SparkSuite.scala
@@ -87,6 +87,19 @@ class SparkSuite extends fixture.FunSuite
         }
     }
 
+    /**
+     * Delete files and directories recursively.
+     *
+     * @param path The starting path.
+     */
+    def deleteRecursive (path: File): Unit =
+    {
+        if (path.isDirectory)
+            for (subpath <- path.list)
+                deleteRecursive (new File (path, subpath))
+        path.delete
+    }
+
     /**
      * Add to the process environment.
      *

diff --git a/src/test/scala/ch/ninecode/cim/CIMAboutSuite.scala b/src/test/scala/ch/ninecode/cim/CIMAboutSuite.scala
@@ -4,24 +4,32 @@ import java.io.File
 import java.util.HashMap
 import java.util.Map
 
-import ch.ninecode.model._
 import org.apache.spark.sql.SparkSession
-import org.scalatest.BeforeAndAfter
 
-class CIMAboutSuite extends ch.ninecode.SparkSuite with BeforeAndAfter
+import ch.ninecode.model._
+
+class CIMAboutSuite
+extends
+    ch.ninecode.SparkSuite
 {
     val FILE_DEPOT = "data/"
 
-    before
+    override def run (testName: Option[String], args: org.scalatest.Args): org.scalatest.Status =
     {
         // unpack the zip file
-        if (!new File (FILE_DEPOT + "MicroGrid/BaseCase_BC/MicroGridTestConfiguration_BC_NL_DL_V2.xml").exists)
-        {
-            new Unzip ().unzip (FILE_DEPOT + "CGMES_v2.4.15_TestConfigurations_v4.0.3.zip", FILE_DEPOT)
-            new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BC_BE_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
-            new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BC_NL_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
-            new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BD_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
-        }
+        new Unzip ().unzip (FILE_DEPOT + "CGMES_v2.4.15_TestConfigurations_v4.0.3.zip", FILE_DEPOT)
+        new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BC_BE_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
+        new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BC_NL_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
+        new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BD_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
+        // run the tests
+        val ret  = super.run (testName, args)
+        // erase the unpacked files
+        deleteRecursive (new File (FILE_DEPOT + "MicroGrid/"))
+        deleteRecursive (new File (FILE_DEPOT + "MicroGrid_Error/"))
+        deleteRecursive (new File (FILE_DEPOT + "MiniGrid/"))
+        deleteRecursive (new File (FILE_DEPOT + "SmallGrid/"))
+        deleteRecursive (new File (FILE_DEPOT + "RealGrid/"))
+        ret
     }
 
     // values from MicroGrid/Documentation/CGMES_v2.4.15_MicroGridTestConfiguration_v2.docx

diff --git a/src/test/scala/ch/ninecode/cim/CIMExportSuite.scala b/src/test/scala/ch/ninecode/cim/CIMExportSuite.scala
@@ -5,13 +5,12 @@ import java.util.HashMap
 import java.util.Map
 
 import org.apache.spark.sql.SparkSession
+
 import ch.ninecode.model._
 
 class CIMExportSuite
 extends
     ch.ninecode.SparkSuite
-with
-    org.scalatest.BeforeAndAfter
 {
     val FILE_DEPOT = "data/"
 
@@ -39,20 +38,22 @@ with
         FILE_DEPOT + "RealGrid/CGMES_v2.4.15_RealGridTestConfiguration_TP_v2.xml"
     )
 
-    before
+    override def run (testName: Option[String], args: org.scalatest.Args): org.scalatest.Status =
     {
         // unpack the zip file
-        if (!new File (FILE_DEPOT + "MicroGrid/BaseCase_BC/MicroGridTestConfiguration_BC_Assembled_DL_V2.xml").exists)
-        {
-            new Unzip ().unzip (FILE_DEPOT + "CGMES_v2.4.15_TestConfigurations_v4.0.3.zip", FILE_DEPOT)
-            new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BC_Assembled_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
-        }
-        // unpack the zip file
-        if (!new File (FILE_DEPOT + "RealGrid/CGMES_v2.4.15_RealGridTestConfiguration_EQ_v2.xml").exists)
-        {
-            new Unzip ().unzip (FILE_DEPOT + "CGMES_v2.4.15_TestConfigurations_v4.0.3.zip", FILE_DEPOT)
-            new Unzip ().unzip (FILE_DEPOT + "RealGrid/CGMES_v2.4.15_RealGridTestConfiguration_v2.zip", FILE_DEPOT + "RealGrid/")
-        }
+        new Unzip ().unzip (FILE_DEPOT + "CGMES_v2.4.15_TestConfigurations_v4.0.3.zip", FILE_DEPOT)
+        new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BC_Assembled_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
+        new Unzip ().unzip (FILE_DEPOT + "CGMES_v2.4.15_TestConfigurations_v4.0.3.zip", FILE_DEPOT)
+        new Unzip ().unzip (FILE_DEPOT + "RealGrid/CGMES_v2.4.15_RealGridTestConfiguration_v2.zip", FILE_DEPOT + "RealGrid/")
+        // run the tests
+        val ret  = super.run (testName, args)
+        // erase the unpacked files
+        deleteRecursive (new File (FILE_DEPOT + "MicroGrid/"))
+        deleteRecursive (new File (FILE_DEPOT + "MicroGrid_Error/"))
+        deleteRecursive (new File (FILE_DEPOT + "MiniGrid/"))
+        deleteRecursive (new File (FILE_DEPOT + "SmallGrid/"))
+        deleteRecursive (new File (FILE_DEPOT + "RealGrid/"))
+        ret
     }
 
     test ("Basic")
@@ -194,4 +195,5 @@ voltage +
         export.exportAllIslands (FILE_DEPOT)
         assert (new File (FILE_DEPOT +"_97e00e77-7a51-4997-8456-4ca94774324d" + ".rdf").exists, "island _97e00e77-7a51-4997-8456-4ca94774324d")
     }
+
 }
diff --git a/src/test/scala/ch/ninecode/cim/CIMNormalizeSuite.scala b/src/test/scala/ch/ninecode/cim/CIMNormalizeSuite.scala
@@ -5,25 +5,32 @@ import java.util.HashMap
 import java.util.Map
 
 import org.apache.spark.sql.SparkSession
-import org.scalatest.BeforeAndAfter
 
 import ch.ninecode.model._
 
-class CIMNormalizeSuite extends ch.ninecode.SparkSuite with BeforeAndAfter
+class CIMNormalizeSuite
+extends
+    ch.ninecode.SparkSuite
 {
     val FILE_DEPOT = "data/"
 
-    before
+    override def run (testName: Option[String], args: org.scalatest.Args): org.scalatest.Status =
     {
         // unpack the zip file
-        if (!new File (FILE_DEPOT + "MicroGrid/BaseCase_BC/MicroGridTestConfiguration_BC_NL_DL_V2.xml").exists)
-        {
-            new Unzip ().unzip (FILE_DEPOT + "CGMES_v2.4.15_TestConfigurations_v4.0.3.zip", FILE_DEPOT)
-            new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BC_BE_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
-            new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BC_NL_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
-            new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BD_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
-            new Unzip ().unzip (FILE_DEPOT + "RealGrid/CGMES_v2.4.15_RealGridTestConfiguration_v2.zip", FILE_DEPOT + "RealGrid/")
-        }
+        new Unzip ().unzip (FILE_DEPOT + "CGMES_v2.4.15_TestConfigurations_v4.0.3.zip", FILE_DEPOT)
+        new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BC_BE_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
+        new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BC_NL_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
+        new Unzip ().unzip (FILE_DEPOT + "MicroGrid/BaseCase_BC/CGMES_v2.4.15_MicroGridTestConfiguration_BD_v2.zip", FILE_DEPOT + "MicroGrid/BaseCase_BC/")
+        new Unzip ().unzip (FILE_DEPOT + "RealGrid/CGMES_v2.4.15_RealGridTestConfiguration_v2.zip", FILE_DEPOT + "RealGrid/")
+        // run the tests
+        val ret  = super.run (testName, args)
+        // erase the unpacked files
+        deleteRecursive (new File (FILE_DEPOT + "MicroGrid/"))
+        deleteRecursive (new File (FILE_DEPOT + "MicroGrid_Error/"))
+        deleteRecursive (new File (FILE_DEPOT + "MiniGrid/"))
+        deleteRecursive (new File (FILE_DEPOT + "SmallGrid/"))
+        deleteRecursive (new File (FILE_DEPOT + "RealGrid/"))
+        ret
     }
 
     test ("Locations")