cleanup test cases

David Baum · David Baum · commit 0d202d6a5c36 · 2018-07-18T20:41:48.000+02:00
remove old comments and unused import
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/dynamix/Bank_MethodInvocationTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/dynamix/Bank_MethodInvocationTest.xtend
@@ -3,7 +3,6 @@ package org.svis.generator.tests.city.dynamix
 import static org.junit.Assert.*
 import org.junit.Test
 import org.junit.BeforeClass
-import org.custommonkey.xmlunit.XMLUnit
 import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
@@ -17,10 +16,7 @@ class Bank_MethodInvocationTest {
 	
 	@BeforeClass
 	def static void launch() {
-		XMLUnit::ignoreWhitespace = true
-		XMLUnit::ignoreComments = true
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/bank/input/BankMethodInvocationTest.properties")
-		//CitySettings::BUILDING_TYPE = BuildingType.CITY_DYNAMIC
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/city/Dynamix2City.mwe2", "-p", "inputPath=testdata/bank/input/famixDyn",
 			"dynamixPath=testdata/bank/input/dynamix","outputPath=output/city/dynamix/bank/method_invocation"])
 		json = JSONUtil::read("./output/city/dynamix/bank/method_invocation/metaData.json")
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/dynamix/Prawn_MethodInvocationTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/dynamix/Prawn_MethodInvocationTest.xtend
@@ -3,7 +3,6 @@ package org.svis.generator.tests.city.dynamix
 import static org.junit.Assert.*
 import org.junit.Test
 import org.junit.BeforeClass
-import org.custommonkey.xmlunit.XMLUnit
 import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
@@ -17,9 +16,6 @@ class Prawn_MethodInvocationTest {
 	
 	@BeforeClass
 	def static void launch() {
-		XMLUnit::ignoreWhitespace = true
-		XMLUnit::ignoreComments = true
-		//CitySettings::BUILDING_TYPE = BuildingType.CITY_DYNAMIC
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/prawn/input/PrawnMethodInvocationTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/city/Dynamix2City.mwe2", "-p", "inputPath=testdata/prawn/input/famixDyn",
 			"dynamixPath=testdata/prawn/input/dynamix","outputPath=output/city/dynamix/prawn/method_invocation"])
@@ -68,6 +64,4 @@ class Prawn_MethodInvocationTest {
 
 		assertEquals(FileUtils.checksumCRC32(file1), FileUtils.checksumCRC32(file2))
 	}
-	
-	
 }
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityAFrame_BricksAndroidPhoneTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityAFrame_BricksAndroidPhoneTest.xtend
@@ -29,16 +29,8 @@ class CityAFrame_BricksAndroidPhoneTest {
 	def static void launch() {
 		XMLUnit::ignoreWhitespace = true
 		XMLUnit::ignoreComments = true
-		/*
-		CitySettings::OUTPUT_FORMAT = OutputFormat::AFrame
-		CitySettings::BUILDING_TYPE = BuildingType.CITY_BRICKS
-		*/
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/android_phone/input/CityAFrameBricksAndroidPhoneTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/city/Famix2City.mwe2", "-p", "inputPath=testdata/android_phone/input/famix", "outputPath=./output/city/famix/aframe/bricks/android_phone"])
-		/*
-		CitySettings::BUILDING_TYPE = BuildingType.CITY_ORIGINAL
-		CitySettings::OUTPUT_FORMAT = OutputFormat::X3D
-		*/
 		json = JSONUtil::read("./output/city/famix/aframe/bricks/android_phone/metaData.json")
 	}
 
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityAFrame_FloorsAndroidPhoneTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityAFrame_FloorsAndroidPhoneTest.xtend
@@ -29,16 +29,8 @@ class CityAFrame_FloorsAndroidPhoneTest {
 	def static void launch() {
 		XMLUnit::ignoreWhitespace = true
 		XMLUnit::ignoreComments = true
-		/*
-		CitySettings::OUTPUT_FORMAT = OutputFormat::AFrame
-		CitySettings::BUILDING_TYPE = BuildingType.CITY_FLOOR
-		*/
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/android_phone/input/CityAFrameFloorsAndroidPhoneTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/city/Famix2City.mwe2", "-p", "inputPath=testdata/android_phone/input/famix", "outputPath=./output/city/famix/aframe/floors/android_phone"])
-		/*
-		CitySettings::BUILDING_TYPE = BuildingType.CITY_ORIGINAL
-		CitySettings::OUTPUT_FORMAT = OutputFormat::X3D
-		*/
 		json = JSONUtil::read("./output/city/famix/aframe/floors/android_phone/metaData.json")
 	}
 
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityAFrame_OriginalAndroidPhoneTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityAFrame_OriginalAndroidPhoneTest.xtend
@@ -29,13 +29,8 @@ class CityAFrame_OriginalAndroidPhoneTest {
 	def static void launch() {
 		XMLUnit::ignoreWhitespace = true
 		XMLUnit::ignoreComments = true
-		/*
-		CitySettings::OUTPUT_FORMAT = OutputFormat::AFrame
-		CitySettings::BUILDING_TYPE = BuildingType.CITY_ORIGINAL
-		*/
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/android_phone/input/CityAFrameOriginalAndroidPhoneTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/city/Famix2City.mwe2", "-p", "inputPath=testdata/android_phone/input/famix", "outputPath=./output/city/famix/aframe/original/android_phone"])
-		//CitySettings::OUTPUT_FORMAT = OutputFormat::X3D
 		json = JSONUtil::read("./output/city/famix/aframe/original/android_phone/metaData.json")
 	}
 
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityAFrame_PanelsAndroidPhoneTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityAFrame_PanelsAndroidPhoneTest.xtend
@@ -29,16 +29,8 @@ class CityAFrame_PanelsAndroidPhoneTest {
 	def static void launch() {
 		XMLUnit::ignoreWhitespace = true
 		XMLUnit::ignoreComments = true
-		/*
-		CitySettings::OUTPUT_FORMAT = OutputFormat::AFrame
-		CitySettings::BUILDING_TYPE = BuildingType.CITY_PANELS
-		*/
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/android_phone/input/CityAFramePanelsAndroidPhoneTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/city/Famix2City.mwe2", "-p", "inputPath=testdata/android_phone/input/famix", "outputPath=./output/city/famix/aframe/panels/android_phone"])
-		/*
-		CitySettings::BUILDING_TYPE = BuildingType.CITY_ORIGINAL
-		CitySettings::OUTPUT_FORMAT = OutputFormat::X3D
-		*/
 		json = JSONUtil::read("./output/city/famix/aframe/panels/android_phone/metaData.json")
 	}
 
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityBricks_AndroidPhoneTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityBricks_AndroidPhoneTest.xtend
@@ -29,10 +29,8 @@ class CityBricks_AndroidPhoneTest {
 	def static void launch() {
 		XMLUnit::ignoreWhitespace = true
 		XMLUnit::ignoreComments = true
-		//CitySettings::BUILDING_TYPE = BuildingType.CITY_BRICKS
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/android_phone/input/CityBricksAndroidPhoneTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/city/Famix2City.mwe2", "-p", "inputPath=testdata/android_phone/input/famix", "outputPath=./output/city/famix/bricks/android_phone"])
-		//CitySettings::BUILDING_TYPE = BuildingType.CITY_ORIGINAL
 		json = JSONUtil::read("./output/city/famix/bricks/android_phone/metaData.json")
 	}
 
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityFloors_AndroidPhoneTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityFloors_AndroidPhoneTest.xtend
@@ -29,10 +29,8 @@ class CityFloors_AndroidPhoneTest {
 	def static void launch() {
 		XMLUnit::ignoreWhitespace = true
 		XMLUnit::ignoreComments = true
-		//CitySettings::BUILDING_TYPE = BuildingType.CITY_FLOOR
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/android_phone/input/CityFloorsAndroidPhoneTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/city/Famix2City.mwe2", "-p", "inputPath=testdata/android_phone/input/famix", "outputPath=./output/city/famix/floors/android_phone"])
-		//CitySettings::BUILDING_TYPE = BuildingType.CITY_ORIGINAL
 		json = JSONUtil::read("./output/city/famix/floors/android_phone/metaData.json")
 	}
 
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityOriginal_AndroidPhoneTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityOriginal_AndroidPhoneTest.xtend
@@ -29,7 +29,6 @@ class CityOriginal_AndroidPhoneTest {
 	def static void launch() {
 		XMLUnit::ignoreWhitespace = true
 		XMLUnit::ignoreComments = true
-		//CitySettings::BUILDING_TYPE = BuildingType.CITY_ORIGINAL
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/android_phone/input/CityOriginalAndroidPhoneTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/city/Famix2City.mwe2", "-p", "inputPath=testdata/android_phone/input/famix", "outputPath=./output/city/famix/original/android_phone"])
 		json = JSONUtil::read("./output/city/famix/original/android_phone/metaData.json")
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityPanels_AndroidPhoneTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/CityPanels_AndroidPhoneTest.xtend
@@ -29,10 +29,8 @@ class CityPanels_AndroidPhoneTest {
 	def static void launch() {
 		XMLUnit::ignoreWhitespace = true
 		XMLUnit::ignoreComments = true
-		//CitySettings::BUILDING_TYPE = BuildingType.CITY_PANELS
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/android_phone/input/CityPanelsAndroidPhoneTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/city/Famix2City.mwe2", "-p", "inputPath=testdata/android_phone/input/famix", "outputPath=./output/city/famix/panels/android_phone"])
-		//CitySettings::BUILDING_TYPE = BuildingType.CITY_ORIGINAL
 		json = JSONUtil::read("./output/city/famix/panels/android_phone/metaData.json")
 	}
 
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/City_BuildingMetricNosTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/city/famix/City_BuildingMetricNosTest.xtend
@@ -29,13 +29,8 @@ class City_BuildingMetricNosTest {
 	def static void launch() {
 		XMLUnit::ignoreWhitespace = true
 		XMLUnit::ignoreComments = true
-		/*
-		CitySettings::BUILDING_TYPE = BuildingType.CITY_ORIGINAL
-		CitySettings::ORIGINAL_BuildingMetric = CitySettings::Original::BuildingMetric::NOS
-		*/
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/android_phone/input/CityBuildingMetricNosTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/city/Famix2City.mwe2", "-p", "inputPath=testdata/android_phone/input/famix", "outputPath=./output/city/famix/original/android_phone/nos_color"])
-		//CitySettings::ORIGINAL_BuildingMetric = CitySettings::Original::BuildingMetric::NONE
 		json = JSONUtil::read("./output/city/famix/original/android_phone/nos_color/metaData.json")
 	}
 
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/plant/famix/Bank_PlantTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/plant/famix/Bank_PlantTest.xtend
@@ -3,7 +3,6 @@ package org.svis.generator.tests.plant.famix
 import static org.junit.Assert.*
 import org.junit.Test
 import org.junit.BeforeClass
-import org.custommonkey.xmlunit.XMLUnit
 import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
@@ -16,8 +15,6 @@ class Bank_PlantTest {
 	
 	@BeforeClass
 	def static void launch() {
-		XMLUnit::ignoreWhitespace = true
-		XMLUnit::ignoreComments = true
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/bank/input/BankPlantTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/plant/Famix2Plant.mwe2", "-p", "path=testdata/bank/input/famix", "outputPath=" + path, "projectName=org.svis.generator.tests","texturDestinyPath=org.svis.generator.tests/output/plant/famix/bank/pics"])
 	}
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_DynamicEvolutionTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_DynamicEvolutionTest.xtend
@@ -11,21 +11,10 @@ import org.svis.generator.SettingsConfiguration
 
 class Sidekiq_DynamicEvolutionTest {
 	
-	//TODO reimplement tests for new hismo metamodel
 	@BeforeClass
 	def static void launch() {
-		/*
-		RDSettings::OUTPUT_FORMAT = OutputFormat::X3DOM 
-		RDSettings::EVOLUTION_REPRESENTATION = EvolutionRepresentation::DYNAMIC_EVOLUTION
-		RDSettings::VARIANT = Variant::DYNAMIC
-		*/
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/sidekiq/input/SidekiqDynamicEvolutionTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Hismo2RD.mwe2", "-p", "inputPath=testdata/sidekiq/input","outputPath=output/rd/hismo/sidekiq/sidekiq_dynamic_evolution/"])
-		/*
-		RDSettings::OUTPUT_FORMAT = OutputFormat::X3D 
-		RDSettings::VARIANT = Variant::STATIC
-		RDSettings::EVOLUTION_REPRESENTATION = EvolutionRepresentation::TIME_LINE
-		*/
 	}
      
     @Test
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_MultipleDynamicEvolutionTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_MultipleDynamicEvolutionTest.xtend
@@ -11,21 +11,10 @@ import org.svis.generator.SettingsConfiguration
 
 class Sidekiq_MultipleDynamicEvolutionTest {
 	
-		//TODO reimplement tests for new hismo metamodel
 	@BeforeClass
 	def static void launch() {
-		/*
-		RDSettings::OUTPUT_FORMAT = OutputFormat::X3DOM 
-		RDSettings::VARIANT = Variant::DYNAMIC
-		RDSettings::EVOLUTION_REPRESENTATION = EvolutionRepresentation::MULTIPLE_DYNAMIC_EVOLUTION
-		*/
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/sidekiq/input/SidekiqMultipleDynamicEvolutionTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Hismo2RD.mwe2", "-p", "inputPath=testdata/sidekiq/input","outputPath=output/rd/hismo/sidekiq/sidekiq_multiple_dynamic_evolution/"])
-		/*
-		RDSettings::VARIANT = Variant::STATIC
-		RDSettings::OUTPUT_FORMAT = OutputFormat::X3D 
-		RDSettings::EVOLUTION_REPRESENTATION = EvolutionRepresentation::TIME_LINE
-		*/
 	}
      
     @Test
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_MultipleTimeLineTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_MultipleTimeLineTest.xtend
@@ -11,15 +11,10 @@ import org.svis.generator.SettingsConfiguration
 
 class Sidekiq_MultipleTimeLineTest {
 	
-	//TODO reimplement tests for new hismo metamodel
 	@BeforeClass
 	def static void launch() {
-		//RDSettings::OUTPUT_FORMAT = OutputFormat::X3DOM 
-		//RDSettings::EVOLUTION_REPRESENTATION = EvolutionRepresentation::MULTIPLE_TIME_LINE
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/sidekiq/input/SidekiqMultipleTimeLineTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Hismo2RD.mwe2", "-p", "inputPath=testdata/sidekiq/input","outputPath=output/rd/hismo/sidekiq/sidekiq_multiple_time_line/"])
-		//RDSettings::OUTPUT_FORMAT = OutputFormat::X3D 
-		//RDSettings::EVOLUTION_REPRESENTATION = EvolutionRepresentation::TIME_LINE
 	}
      
     @Test
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_MultipleTimeLineX3DTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_MultipleTimeLineX3DTest.xtend
@@ -10,13 +10,10 @@ import org.apache.commons.io.FileUtils
 import org.svis.generator.SettingsConfiguration
 
 class Sidekiq_MultipleTimeLineX3DTest {
-		//TODO reimplement tests for new hismo metamodel
 	@BeforeClass
 	def static void launch() {
-		//RDSettings::EVOLUTION_REPRESENTATION = EvolutionRepresentation::MULTIPLE_TIME_LINE 
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/sidekiq/input/SidekiqMultipleTimeLineX3DTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Hismo2RD.mwe2", "-p", "inputPath=testdata/sidekiq/input","outputPath=output/rd/hismo/sidekiq/sidekiq_x3d_multiple_time_line/"])
-		//RDSettings::EVOLUTION_REPRESENTATION = EvolutionRepresentation::TIME_LINE 
 	}
      
     @Test
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_TimeLineX3DTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_TimeLineX3DTest.xtend
@@ -10,7 +10,7 @@ import org.apache.commons.io.FileUtils
 import org.svis.generator.SettingsConfiguration
 
 class Sidekiq_TimeLineX3DTest {
-		//TODO reimplement tests for new hismo metamodel
+	
 	@BeforeClass
 	def static void launch() {
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/sidekiq/input/SidekiqTimeLineX3DTest.properties")
