Skip to content

KOGITO-6781: XML Prolog support for .scesim files #4205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 21, 2022
Merged

KOGITO-6781: XML Prolog support for .scesim files #4205

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1a651c
KOGITO-6781: XML Prolog support in for .scesim files
yesamer Feb 15, 2022
bc15322
KOGITO-6781: Add unit tests for the ScesimXMLPersistence (#3)
Feb 15, 2022
b568069
Merge branch 'main' into KOGITO-6781
yesamer Feb 16, 2022
990b7ba
Merge branch 'main' into KOGITO-6781
yesamer Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ain/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistence.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand Down
17 changes: 17 additions & 0 deletions ...java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,22 @@ public void extractVersion() {
assertEquals("1.0", version);
}

@Test
public void extractVersionWhenXmlPrologIsPresent() {
String version = instance.extractVersion("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<ScenarioSimulationModel version=\"1.1\">");
assertEquals("1.1", version);
}

@Test
public void extractVersionWhenMoreVersionAttributesArePresent() {
String version = instance.extractVersion("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<ScenarioSimulationModel version=\"1.2\">\n" +
"<someUnknownTag version=\"1.1\"/>\n" +
"</ScenarioSimulationModel>");
assertEquals("1.2", version);
}

@Test(expected = IllegalArgumentException.class)
public void unmarshalEmptyContent() throws Exception {
ScenarioSimulationXMLPersistence.getInstance().unmarshal("");
Expand Down Expand Up @@ -334,6 +350,7 @@ public void unmarshalDMN() throws Exception {
/**
* Verify the given <code>Map</code> has one single entry, whose <code>List</code> value also has a single children.
* If <b>expectedTextContent</b> is given, it also check the children text content match
*
* @param toCheck
* @param expectedTextContent
*/
Expand Down
2 changes: 1 addition & 1 deletion ...tion/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-1.scesim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<ScenarioSimulationModel version="1.1">
<simulation>
<simulationDescriptor>
Expand Down
1 change: 1 addition & 0 deletions ...tion/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-2.scesim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ScenarioSimulationModel version="1.2">
<simulation>
<simulationDescriptor>
Expand Down
1 change: 1 addition & 0 deletions ...rools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-dmn_1.scesim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ScenarioSimulationModel version="1.3">
<simulation>
<simulationDescriptor>
Expand Down
1 change: 1 addition & 0 deletions ...rools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-dmn_2.scesim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ScenarioSimulationModel version="1.3">
<simulation>
<simulationDescriptor>
Expand Down
1 change: 1 addition & 0 deletions ...drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-3-rule.scesim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ScenarioSimulationModel version="1.3">
<simulation>
<simulationDescriptor>
Expand Down
1 change: 1 addition & 0 deletions ...drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-4-rule.scesim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ScenarioSimulationModel version="1.4">
<simulation>
<simulationDescriptor>
Expand Down
1 change: 1 addition & 0 deletions .../drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-5-dmn.scesim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ScenarioSimulationModel version="1.5">
<simulation>
<simulationDescriptor>
Expand Down
1 change: 1 addition & 0 deletions .../drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-6-dmn.scesim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ScenarioSimulationModel version="1.6">
<simulation>
<simulationDescriptor>
Expand Down
1 change: 1 addition & 0 deletions ...drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-6-rule.scesim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ScenarioSimulationModel version="1.6">
<simulation>
<simulationDescriptor>
Expand Down
1 change: 1 addition & 0 deletions .../drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-7-dmn.scesim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ScenarioSimulationModel version="1.7">
<simulation>
<simulationDescriptor>
Expand Down
1 change: 1 addition & 0 deletions ...drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-1-7-rule.scesim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ScenarioSimulationModel version="1.7">
<simulation>
<simulationDescriptor>
Expand Down
1 change: 1 addition & 0 deletions ...tion/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-dmn.scesim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ScenarioSimulationModel version="1.8">
<simulation>
<simulationDescriptor>
Expand Down
1 change: 1 addition & 0 deletions ...ion/drools-scenario-simulation-backend/src/test/resources/folderToTest/scesim-rule.scesim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ScenarioSimulationModel version="1.8">
<simulation>
<simulationDescriptor>
Expand Down