diff --git a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/migration/MigrationService.java b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/migration/MigrationService.java index 932e39c3a05574aafeeb839a2da41c373df8b8d3..aea5bf6112604eeb16715674ed1e0287ad7bd20a 100644 --- a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/migration/MigrationService.java +++ b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/migration/MigrationService.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import de.fhmuenster.masterthesis.Testgenerator.rest.dto.MigrationResultWrapperDTO; import de.fhmuenster.masterthesis.Testgenerator.rest.service.change.ChangeService; +import de.fhmuenster.masterthesis.Testgenerator.rest.service.test.TestService; import de.fhmuenster.masterthesis.Testgenerator.yaml.MigrationResultStatus; import de.fhmuenster.masterthesis.Testgenerator.yaml.MigrationYaml; import de.fhmuenster.masterthesis.Testgenerator.yaml.YamlReader; @@ -53,8 +54,6 @@ public class MigrationService { MigrationResultWrapper migrationResultWrapper = new MigrationResultWrapper(); List<FlowChangeWrapper> result = new ArrayList<>(); - //oldDSL.getVariables().get(0). - // 1. Schritt: Prüfen, ob in einem Flow neue Elemente hinzugekommen sind List<FlowChangeWrapper> activityAddActionResults = detectActivityAddActions(oldDSL.getFlows(), newDSL.getFlows()); transferResultsToCorrespondingCategory(migrationResultWrapper, activityAddActionResults); diff --git a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/change/ChangeController.java b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/change/ChangeController.java index 7c29fa92a78a053ab5ba89bb296689acde67220d..c5d0fafca5adb8824298a84b7dc4fdfd02299ffb 100644 --- a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/change/ChangeController.java +++ b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/change/ChangeController.java @@ -4,8 +4,10 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -57,6 +59,8 @@ public class ChangeController { private ChangeService changeService; @Autowired private MigrationService migrationService; + @Autowired + private TestService testService; @RequestMapping(path = "/project/{projectId}/match", method = RequestMethod.GET) public void getNewFlows(@PathVariable(required = true) Long projectId) { @@ -91,10 +95,33 @@ public class ChangeController { Project project = projectService.getProjectForId(projectId); MigrationResultWrapperDTO migrationResultWrapperDTO = new MigrationResultWrapperDTO(); - //Alte und neue DSL einlesen + + //Alte DSL kopieren und neu generieren Path testFilePath = ProjectDirectoryUtils.getTestspecificationPath(project.getProjectDirectories()); + Path source = Paths.get(testFilePath.toString()); + Path target = Paths.get(project.getProjectDirectories().getProjectRootPath().toString(), + project.getProjectDirectories().getModelPath(), this.projectService.getBackupFolderName(), + "Testcollection.bpmn-testgen"); + + try { + Files.move(source, target, StandardCopyOption.REPLACE_EXISTING); + } + catch(Exception e) { + + } + + + + //Path testFilePath = ProjectDirectoryUtils.getTestspecificationPath(project.getProjectDirectories()); Path newDSLFile = Paths.get(testFilePath.toString()); - Path oldDSLFile = Paths.get(project.getProjectDirectories().resolveTestPath(), "Testcollection-old.bpmn-testgen"); + //Path oldDSLFile = Paths.get(project.getProjectDirectories().resolveTestPath(), "Testcollection-old.bpmn-testgen"); + Path oldDSLFile = Paths.get(project.getProjectDirectories().getProjectRootPath().toString(), + project.getProjectDirectories().getModelPath(), this.projectService.getBackupFolderName(), + "Testcollection.bpmn-testgen"); + + testService.initLoops(project); + testService.initTestcollection(project); + try { TestgeneratorDSLSerializer oldDSL = new TestgeneratorDSLSerializer(oldDSLFile.toString()); TestgeneratorDSLSerializer newDSL = new TestgeneratorDSLSerializer(newDSLFile.toString());