diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistence.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistence.java index 1167a38bf53..06a9bbf825b 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistence.java +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/main/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistence.java @@ -41,6 +41,7 @@ import org.w3c.dom.Document; import static org.drools.scenariosimulation.api.utils.ConstantsHolder.BACKGROUND_NODE; +import static org.drools.scenariosimulation.api.utils.ConstantsHolder.SCENARIO_SIMULATION_MODEL_NODE; import static org.drools.scenariosimulation.api.utils.ConstantsHolder.SCESIM_MODEL_DESCRIPTOR_NODE; import static org.drools.scenariosimulation.api.utils.ConstantsHolder.SETTINGS; import static org.drools.scenariosimulation.api.utils.ConstantsHolder.SIMULATION_DESCRIPTOR_NODE; @@ -50,7 +51,7 @@ public class ScenarioSimulationXMLPersistence { private static final ScenarioSimulationXMLPersistence INSTANCE = new ScenarioSimulationXMLPersistence(); private static final String CURRENT_VERSION = new ScenarioSimulationModel().getVersion(); - private static final Pattern p = Pattern.compile("version=\"([0-9]+\\.[0-9]+)"); + private static final Pattern p = Pattern.compile(SCENARIO_SIMULATION_MODEL_NODE + " version=\"([0-9]+\\.[0-9]+)"); private XStream xt; private MigrationStrategy migrationStrategy = new InMemoryMigrationStrategy(); diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java index fba4812044f..c7ae860df10 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java @@ -305,6 +305,22 @@ public void extractVersion() { assertEquals("1.0", version); } + @Test + public void extractVersionWhenXmlPrologIsPresent() { + String version = instance.extractVersion("\n" + + ""); + assertEquals("1.1", version); + } + + @Test + public void extractVersionWhenMoreVersionAttributesArePresent() { + String version = instance.extractVersion("\n" + + "\n" + + "\n" + + ""); + assertEquals("1.2", version); + } + @Test(expected = IllegalArgumentException.class) public void unmarshalEmptyContent() throws Exception { ScenarioSimulationXMLPersistence.getInstance().unmarshal(""); @@ -334,6 +350,7 @@ public void unmarshalDMN() throws Exception { /** * Verify the given Map has one single entry, whose List value also has a single children. * If expectedTextContent is given, it also check the children text content match + * * @param toCheck * @param expectedTextContent */ diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-1.scesim b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-1.scesim index 6d665c50a16..ae726e8e1b2 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-1.scesim +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-1.scesim @@ -1,4 +1,4 @@ - + diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-2.scesim b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-2.scesim index 2ecd2c9d282..52734c3d694 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-2.scesim +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-2.scesim @@ -1,3 +1,4 @@ + diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-dmn_1.scesim b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-dmn_1.scesim index 060e529cb8a..846223890ad 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-dmn_1.scesim +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-dmn_1.scesim @@ -1,3 +1,4 @@ + diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-dmn_2.scesim b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-dmn_2.scesim index bda2dbc2234..989c5cc4dbf 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-dmn_2.scesim +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-dmn_2.scesim @@ -1,3 +1,4 @@ + diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-rule.scesim b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-rule.scesim index d2697dea6f4..b8fe022d1ca 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-rule.scesim +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-rule.scesim @@ -1,3 +1,4 @@ + diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-4-rule.scesim b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-4-rule.scesim index 44fb54f4abd..ae9af96b6c4 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-4-rule.scesim +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-4-rule.scesim @@ -1,3 +1,4 @@ + diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-5-dmn.scesim b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-5-dmn.scesim index d156ef97445..5df103b777d 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-5-dmn.scesim +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-5-dmn.scesim @@ -1,3 +1,4 @@ + diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-6-dmn.scesim b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-6-dmn.scesim index 72148d933c5..68968654297 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-6-dmn.scesim +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-6-dmn.scesim @@ -1,3 +1,4 @@ + diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-6-rule.scesim b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-6-rule.scesim index 271c2803c4a..f4252094750 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-6-rule.scesim +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-6-rule.scesim @@ -1,3 +1,4 @@ + diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-7-dmn.scesim b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-7-dmn.scesim index 4746b74bdc7..23721f5ac43 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-7-dmn.scesim +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-7-dmn.scesim @@ -1,3 +1,4 @@ + diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-7-rule.scesim b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-7-rule.scesim index ea2108dd2fa..bf119ecd3b7 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-7-rule.scesim +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-7-rule.scesim @@ -1,3 +1,4 @@ + diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-dmn.scesim b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-dmn.scesim index b413ce4d2b4..44edeb4c8e3 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-dmn.scesim +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-dmn.scesim @@ -1,3 +1,4 @@ + diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-rule.scesim b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-rule.scesim index 93ab3adddb0..2b532d909c0 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-rule.scesim +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-rule.scesim @@ -1,3 +1,4 @@ +