Skip to content
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

Fix the extraction of DMN and TCK extensions from configuration #709

Merged
merged 1 commit into from
Sep 10, 2024
Merged

Fix the extraction of DMN and TCK extensions from configuration #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions dmn-core/src/main/java/com/gs/dmn/transformation/InputParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ public InputParameters(Map<String, String> inputParameters) {
this.schemaNamespace = InputParameters.getOptionalParam(inputParameters, "signavioSchemaNamespace");
this.prefix = InputParameters.getOptionalParam(inputParameters, "prefix");
this.format = SerializationFormat.valueOf(InputParameters.getOptionalParam(inputParameters, "format", "XML"));
this.dmnFileExtension = InputParameters.getOptionalParam(inputParameters, "format", DMNConstants.DMN_FILE_EXTENSION);
this.tckFileExtension = InputParameters.getOptionalParam(inputParameters, "format", DMNConstants.TCK_FILE_EXTENSION);
this.dmnFileExtension = InputParameters.getOptionalParam(inputParameters, "dmnFileExtension", DMNConstants.DMN_FILE_EXTENSION);
this.tckFileExtension = InputParameters.getOptionalParam(inputParameters, "tckFileExtension", DMNConstants.TCK_FILE_EXTENSION);
String charsetName = InputParameters.getOptionalParam(inputParameters, "encoding");
this.charset = charsetName == null ? StandardCharsets.UTF_8 : Charset.forName(charsetName);

Expand Down
159 changes: 150 additions & 9 deletions dmn-core/src/test/java/com/gs/dmn/transformation/InputParametersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
*/
package com.gs.dmn.transformation;

import com.gs.dmn.serialization.DMNConstants;
import com.gs.dmn.serialization.SerializationFormat;
import org.junit.jupiter.api.Test;

import java.util.HashMap;
Expand All @@ -22,16 +24,15 @@
public class InputParametersTest {
@Test
public void testGetRequiredParamWherePresent() {
Map<String, String> params = new HashMap<String, String>(){{
Map<String, String> params = new HashMap<String, String>() {{
put("paramKey", "paramValue");
}};
assertEquals("paramValue", InputParameters.getRequiredParam(params, "paramKey"));
}

@Test
public void testGetRequiredParamWhereNotPresent() {
Map<String, String> params = new HashMap<String, String>(){{
}};
Map<String, String> params = new HashMap<>();
try {
InputParameters.getRequiredParam(params, "paramKey");
fail();
Expand All @@ -42,31 +43,171 @@ public void testGetRequiredParamWhereNotPresent() {

@Test
public void testGetOptionalParamWherePresent() {
Map<String, String> params = new HashMap<String, String>(){{
Map<String, String> params = new HashMap<String, String>() {{
put("paramKey", "paramValue");
}};
assertEquals("paramValue", InputParameters.getOptionalParam(params, "paramKey"));
}

@Test
public void testGetOptionalParamWhereNotPresent() {
Map<String, String> params = new HashMap<String, String>(){{
}};
Map<String, String> params = new HashMap<>();
assertNull(InputParameters.getOptionalParam(params, "paramKey"));
}

@Test
public void testGetOptionalBooleanParamWherePresent() {
Map<String, String> params = new HashMap<String, String>(){{
Map<String, String> params = new HashMap<String, String>() {{
put("paramKey", "true");
}};
assertTrue(InputParameters.getOptionalBooleanParam(params, "paramKey"));
}

@Test
public void testGetOptionalBooleanParamWhereNotPresent() {
Map<String, String> params = new HashMap<String, String>(){{
}};
Map<String, String> params = new HashMap<>();
assertFalse(InputParameters.getOptionalBooleanParam(params, "paramKey"));
}

@Test
public void testDefaultValues() {
Map<String, String> params = new HashMap<>();
InputParameters inputParameters = new InputParameters(params);
assertNull(inputParameters.getDmnVersion());
assertNull(inputParameters.getModelVersion());
assertNull(inputParameters.getPlatformVersion());

assertFalse(inputParameters.isXsdValidation());
assertNull(inputParameters.getSchemaNamespace());
assertNull(inputParameters.getNamespace());
assertNull(inputParameters.getPrefix());
assertEquals(SerializationFormat.XML, inputParameters.getFormat());
assertEquals(DMNConstants.DMN_FILE_EXTENSION, inputParameters.getDmnFileExtension());
assertEquals(DMNConstants.TCK_FILE_EXTENSION, inputParameters.getTckFileExtension());
assertEquals("UTF-8", inputParameters.getCharset().displayName());

assertNull(inputParameters.getJavaRootPackage());
assertFalse(inputParameters.isOnePackage());
assertTrue(inputParameters.isSingletonInputData());
assertFalse(inputParameters.isSingletonDecision());
assertTrue(inputParameters.isStrongTyping());

assertFalse(inputParameters.isCaching());
assertEquals(1, inputParameters.getCachingThreshold());
assertEquals(0.0, inputParameters.getSparsityThreshold());
assertFalse(inputParameters.isParallelStream());

assertFalse(inputParameters.isGenerateProtoMessages());
assertFalse(inputParameters.isGenerateProtoServices());
assertEquals("proto3", inputParameters.getProtoVersion());

assertFalse(inputParameters.isMockTesting());
assertFalse(inputParameters.isGenerateExtra());

assertFalse(inputParameters.isCheckConstraints());
}

@Test
public void testSetValues() {
String dmnVersion = "dmnVersion";
String modelVersion = "modelVersion";
String platformVersion = "platformVersion";

String xsdValidation = "true";
String schemaNamespace = "schemaNamespace";
String namespace = "namespace";
String prefix = "prefix";
String format = "JSON";
String dmnFileExtension = "dmnFileExtension";
String tckFileExtension = "tckFileExtension";
String charset = "charset";

String javaRootPackage = "javaRootPackage";
String onePackage = "false";
String singletonInputData = "false";
String singletonDecision = "false";
String strongTyping = "false";

String caching = "false";
String cachingThreshold = "0";
String sparsityThreshold = "0.2";
String parallelStream = "false";

String generateProtoMessages = "true";
String generateProtoServices = "true";
String protoVersion = "protoVersion";

String mockTesting = "true";
String generateExtra = "true";

String checkConstraints = "true";

Map<String, String> params = new HashMap<String, String>() {{
put("dmnVersion", dmnVersion);
put("modelVersion", modelVersion);
put("platformVersion", platformVersion);

put("xsdValidation", xsdValidation);
put("signavioSchemaNamespace", schemaNamespace);
put("namespace", namespace);
put("prefix", prefix);
put("format", format);
put("dmnFileExtension", dmnFileExtension);
put("tckFileExtension", tckFileExtension);
put("charset", charset);

put("javaRootPackage", javaRootPackage);
put("onePackage", onePackage);
put("singletonInputData", singletonInputData);
put("singletonDecision", singletonDecision);
put("strongTyping", strongTyping);

put("caching", caching);
put("cachingThreshold", cachingThreshold);
put("sparsityThreshold", sparsityThreshold);
put("parallelStream", parallelStream);

put("generateProtoMessages", generateProtoMessages);
put("generateProtoServices", generateProtoServices);
put("protoVersion", protoVersion);

put("mockTesting", mockTesting);
put("generateExtra", generateExtra);

put("checkConstraints", checkConstraints);
}};
InputParameters inputParameters = new InputParameters(params);
assertEquals(dmnVersion, inputParameters.getDmnVersion());
assertEquals(modelVersion, inputParameters.getModelVersion());
assertEquals(platformVersion, inputParameters.getPlatformVersion());

assertTrue(inputParameters.isXsdValidation());
assertEquals(schemaNamespace, inputParameters.getSchemaNamespace());
assertEquals(namespace, inputParameters.getNamespace());
assertEquals(prefix, inputParameters.getPrefix());
assertEquals(SerializationFormat.JSON, inputParameters.getFormat());
assertEquals(dmnFileExtension, inputParameters.getDmnFileExtension());
assertEquals(tckFileExtension, inputParameters.getTckFileExtension());
assertEquals("UTF-8", inputParameters.getCharset().displayName());

assertEquals(javaRootPackage, inputParameters.getJavaRootPackage());
assertFalse(inputParameters.isOnePackage());
assertFalse(inputParameters.isSingletonInputData());
assertFalse(inputParameters.isSingletonDecision());
assertFalse(inputParameters.isStrongTyping());

assertFalse(inputParameters.isCaching());
assertEquals(0, inputParameters.getCachingThreshold());
assertEquals(0.2, inputParameters.getSparsityThreshold());
assertFalse(inputParameters.isParallelStream());

assertTrue(inputParameters.isGenerateProtoMessages());
assertTrue(inputParameters.isGenerateProtoServices());
assertEquals("protoVersion", inputParameters.getProtoVersion());

assertTrue(inputParameters.isMockTesting());
assertTrue(inputParameters.isGenerateExtra());

assertTrue(inputParameters.isCheckConstraints());
}
}