fix refactoring

VerifAPS · Feb 21, 2025 · a81b347 · a81b347
1 parent 53ef6ea
commit a81b347
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 15 deletions.
diff --git a/aps-rvt/src/main/kotlin/edu/kit/iti/formal/automation/rvt/modularization/app.kt b/aps-rvt/src/main/kotlin/edu/kit/iti/formal/automation/rvt/modularization/app.kt
@@ -75,7 +75,7 @@ class ModularizationApp : CliktCommand() {
 
         NUXMV_PATH_DEFAULT = nuxmvPath
 
-        val (oldExec, newExec) = IEC61131Facade.readProgramsWLPN(library, listOf(old, new), builtins)
+        val (oldExec, newExec) = IEC61131Facade.readProgramsWLPN(library, listOf(old, new))
         require(oldExec != null) { "Could not find program in $old" }
         require(newExec != null) { "Could not find program in $new" }
 

diff --git a/aps-rvt/src/main/kotlin/edu/kit/iti/formal/automation/rvt/rvtapp.kt b/aps-rvt/src/main/kotlin/edu/kit/iti/formal/automation/rvt/rvtapp.kt
@@ -130,7 +130,7 @@ class RvtApsApp : CliktCommand(     name = "rvt-aps.sh") {
 internal fun loadPouExecutable(library: List<File>, file: File, name: String?): PouExecutable {
     info("Parse program ${file.absolutePath} with libraries ${library}")
     val r = if (name != null)
-        IEC61131Facade.readProgramsWLN(library, listOf(file), listOf(name), builtins).first()
+        IEC61131Facade.readProgramsWLN(library, listOf(file), listOf(name)).first()
     else
         IEC61131Facade.readProgramsWLP(library, listOf(file)).first()
     if (r == null) {

diff --git a/stvs/src/test/kotlin/edu/kit/iti/formal/stvs/TestUtils.kt b/stvs/src/test/kotlin/edu/kit/iti/formal/stvs/TestUtils.kt
@@ -124,13 +124,4 @@ object TestUtils {
             autoloadConfig().nuxmvFilename
         )
     }
-
-    fun assumeGetetaExists() {
-        val toks = autoloadConfig().getetaCommand
-            .split(" ".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-        assumeFileExists(
-            "The geteta command is not set or a non-existing file. Tests are skipped!",
-            toks[0]
-        )
-    }
 }
diff --git a/stvs/src/test/kotlin/edu/kit/iti/formal/stvs/logic/io/xml/XmlConfigImporterTest.kt b/stvs/src/test/kotlin/edu/kit/iti/formal/stvs/logic/io/xml/XmlConfigImporterTest.kt
@@ -16,12 +16,10 @@ class XmlConfigImporterTest {
     fun testDoImport() {
         val inputStream = XmlConfigImporter::class.java.getResourceAsStream("config_valid_nodeps.xml")!!
         val config: GlobalConfig = importer.doImport(inputStream)
-        Assertions.assertEquals("EN", config.uiLanguage)
         Assertions.assertEquals(100, config.verificationTimeout)
         Assertions.assertEquals(100, config.simulationTimeout)
         Assertions.assertEquals("Comic Sans", config.editorFontFamily)
         Assertions.assertEquals(12, config.editorFontSize.toLong())
-        Assertions.assertEquals(true, config.showLineNumbers)
     }
 
     @Test

diff --git a/stvs/src/test/kotlin/edu/kit/iti/formal/stvs/model/verification/VerificationScenarioTest.kt b/stvs/src/test/kotlin/edu/kit/iti/formal/stvs/model/verification/VerificationScenarioTest.kt
@@ -41,8 +41,6 @@ class VerificationScenarioTest {
     @Throws(URISyntaxException::class, IOException::class, ImportException::class)
     fun setUp() {
         TestUtils.assumeNuXmvExists()
-        TestUtils.assumeGetetaExists()
-
         scenario = VerificationScenario()
         code = importStCode(File(StvsApplication::class.java.getResource("testSets/valid_1/code_valid_1.st")!!.toURI()))
         constraintSpec = ImporterFacade.importConstraintSpec(