diff --git a/pom.xml b/pom.xml
index d4e2ed7..c2a07da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,15 +35,15 @@
3.2.2
- 2.5
+ 2.7
4.13.1
- 1.7.5
+ 2.0.7
- 3.17
+ 5.2.3
2.1.1
- 3.0
+ 5.3.0
3.3
2.4
diff --git a/providers/excel-provider/src/main/java/ru/sbtqa/tag/datajack/providers/excel/ExcelDataProvider.java b/providers/excel-provider/src/main/java/ru/sbtqa/tag/datajack/providers/excel/ExcelDataProvider.java
index 31d2b91..f6e8bb4 100644
--- a/providers/excel-provider/src/main/java/ru/sbtqa/tag/datajack/providers/excel/ExcelDataProvider.java
+++ b/providers/excel-provider/src/main/java/ru/sbtqa/tag/datajack/providers/excel/ExcelDataProvider.java
@@ -273,13 +273,13 @@ private Map getObjectMappedToName(XSSFRow row) {
*/
private String getCellValue(Cell cell) {
//noinspection deprecation
- if (cell.getCellTypeEnum() == CellType.FORMULA) {
+ if (cell.getCellType() == CellType.FORMULA) {
String value = "";
try {
value = cell.getRichStringCellValue().getString();
} catch (Exception e) {
LOG.debug("Failed to get raw cell value, now trying to get typified", e);
- switch (evaluator.evaluateFormulaCellEnum(cell)) {
+ switch (evaluator.evaluateFormulaCell(cell)) {
case BOOLEAN:
value = String.valueOf(cell.getBooleanCellValue());
break;
diff --git a/providers/mongo-provider/pom.xml b/providers/mongo-provider/pom.xml
index 20843a3..183fc28 100644
--- a/providers/mongo-provider/pom.xml
+++ b/providers/mongo-provider/pom.xml
@@ -38,7 +38,7 @@
org.slf4j
slf4j-log4j12
- 1.7.25
+ ${slf4j.version}
test
diff --git a/providers/properties-provider/pom.xml b/providers/properties-provider/pom.xml
index bf694e2..63e0d2c 100644
--- a/providers/properties-provider/pom.xml
+++ b/providers/properties-provider/pom.xml
@@ -34,11 +34,21 @@
pl.jalokim.propertiestojson
java-properties-to-json
${java.properties.to.json.version}
+
+
+ lombok
+ org.projectlombok
+
+
+ commons-io
+ commons-io
+
+
org.projectlombok
lombok
- 1.18.2
+ 1.18.26
diff --git a/providers/properties-provider/src/main/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataProvider.java b/providers/properties-provider/src/main/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataProvider.java
index a3d84de..6e9aca2 100644
--- a/providers/properties-provider/src/main/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataProvider.java
+++ b/providers/properties-provider/src/main/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataProvider.java
@@ -7,7 +7,16 @@
import pl.jalokim.propertiestojson.resolvers.primitives.ObjectFromTextJsonTypeResolver;
import pl.jalokim.propertiestojson.resolvers.primitives.PrimitiveArrayJsonTypeResolver;
import pl.jalokim.propertiestojson.resolvers.primitives.StringJsonTypeResolver;
+import pl.jalokim.propertiestojson.resolvers.primitives.adapter.PrimitiveJsonTypeResolverToNewApiAdapter;
+import pl.jalokim.propertiestojson.resolvers.primitives.object.BooleanToJsonTypeConverter;
+import pl.jalokim.propertiestojson.resolvers.primitives.object.ElementsToJsonTypeConverter;
+import pl.jalokim.propertiestojson.resolvers.primitives.object.ObjectToJsonTypeConverter;
+import pl.jalokim.propertiestojson.resolvers.primitives.object.StringToJsonTypeConverter;
+import pl.jalokim.propertiestojson.resolvers.primitives.object.SuperObjectToJsonTypeConverter;
+import pl.jalokim.propertiestojson.resolvers.primitives.string.TextToElementsResolver;
import pl.jalokim.propertiestojson.util.PropertiesToJsonConverter;
+import pl.jalokim.propertiestojson.util.PropertiesToJsonConverterBuilder;
+import pl.jalokim.propertiestojson.util.exception.ReadInputException;
import ru.sbtqa.tag.datajack.TestDataProvider;
import ru.sbtqa.tag.datajack.exceptions.CollectionNotFoundException;
import ru.sbtqa.tag.datajack.exceptions.CyclicReferencesException;
@@ -162,15 +171,12 @@ private String readFile(String testDataFolder, String collectionName) throws Col
String json;
try {
File targetFile = new File(testDataFolder + separator + collectionName + "." + this.extension);
- Properties properties = getProperties(targetFile);
- json = new PropertiesToJsonConverter(
- new PrimitiveArrayJsonTypeResolver(arrayDelimiter),
- new ObjectFromTextJsonTypeResolver(),
- new BooleanJsonTypeResolver(),
- new StringJsonTypeResolver()
- ).parseToJson(properties);
-
- } catch (DataException ex) {
+ json = new PropertiesToJsonConverterBuilder()
+ .onlyCustomTextToObjectResolvers(new TextToElementsResolver(true, arrayDelimiter))
+ .build()
+ .convertPropertiesFromFileToJson(targetFile);
+
+ } catch (ReadInputException ex) {
throw new CollectionNotFoundException(String.format("File %s.%s not found in %s",
collectionName, extension, testDataFolder), ex);
}
diff --git a/providers/properties-provider/src/test/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataTest.java b/providers/properties-provider/src/test/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataTest.java
index 36d1871..e06e85c 100644
--- a/providers/properties-provider/src/test/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataTest.java
+++ b/providers/properties-provider/src/test/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataTest.java
@@ -246,7 +246,7 @@ public void failWithCyclicReference() throws DataException {
String collectionName = "DataBlocks";
String cyclicPath = "Common.cyclic";
TestDataProvider dataProvider = new PropertiesDataProvider(this.propertiesDataPath, collectionName);
- String cyclicObject = format("{ \"comment\" : \"Cyclic\", \"$ref\" : \"%s:Common.cyclic\" }", collectionName);
+ String cyclicObject = format("{ \"$ref\" : \"%s:Common.cyclic\", \"comment\" : \"Cyclic\" }", collectionName);
expectDataExceptions
.expect(CyclicReferencesException.class);
expectDataExceptions.expectMessage(format("Cyclic references in database:\n%s", cyclicObject));
@@ -403,7 +403,7 @@ public void getStringValuesTest() throws DataException {
public void getJsonTest() throws DataException {
TestDataProvider testDataProvider = new PropertiesDataProvider(propertiesDataPath, "DataBlocks");
String stringJson = testDataProvider.get("Params Group 1").getValue();
- String expectedJson = "{ \"password\" : 123 , \"login\" : 123}";
+ String expectedJson = "{ \"login\" : 123 , \"password\" : 123}";
Assert.assertEquals(expectedJson, stringJson);
}