Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit f01cf82

Browse files
clicmanclicman
authored
Merge pull request #26 from sbtqa/osji
make all submodules are OSJI generator capable
2 parents d25fedc + ade8388 commit f01cf82

7 files changed

Lines changed: 13 additions & 9 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>ru.sbtqa.tag.datajack</groupId>
66
<artifactId>datajack-parent</artifactId>
7-
<version>1.3-SNAPSHOT</version>
7+
<version>5.0-SNAPSHOT</version>
88
<packaging>pom</packaging>
99
<name>datajack</name>
1010
<description>Data management library</description>

providers/excel-provider/src/main/java/ru/sbtqa/tag/datajack/providers/ExcelDataProvider.java renamed to providers/excel-provider/src/main/java/ru/sbtqa/tag/datajack/excel/ExcelDataProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.sbtqa.tag.datajack.providers;
1+
package ru.sbtqa.tag.datajack.excel;
22

33
import com.mongodb.BasicDBObject;
44
import org.apache.commons.io.FileUtils;
@@ -15,6 +15,7 @@
1515
import org.slf4j.Logger;
1616
import org.slf4j.LoggerFactory;
1717
import ru.sbtqa.tag.datajack.exceptions.*;
18+
import ru.sbtqa.tag.datajack.providers.AbstractDataProvider;
1819

1920
import java.io.File;
2021
import java.io.IOException;

providers/excel-provider/src/test/java/ru/sbtqa/tag/datajack/providers/ExcelDataTest.java renamed to providers/excel-provider/src/test/java/ru/sbtqa/tag/datajack/excel/ExcelDataTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.sbtqa.tag.datajack.providers;
1+
package ru.sbtqa.tag.datajack.excel;
22

33
import com.mongodb.BasicDBObject;
44
import org.junit.Before;
@@ -7,6 +7,7 @@
77
import org.junit.rules.ExpectedException;
88
import ru.sbtqa.tag.datajack.TestDataProvider;
99
import ru.sbtqa.tag.datajack.callback.SampleDataGensCallback;
10+
import ru.sbtqa.tag.datajack.excel.ExcelDataProvider;
1011
import ru.sbtqa.tag.datajack.exceptions.CyclicReferencesException;
1112
import ru.sbtqa.tag.datajack.exceptions.DataException;
1213
import ru.sbtqa.tag.datajack.exceptions.FieldNotFoundException;

‎providers/json-provider/src/test/java/ru/sbtqa/tag/datajack/providers/json/JsonDataTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ public void getByPathArrayTest() throws DataException {
137137
String value = testDataProvider.getByPath("$Tests{array[0]}").getValue();
138138
String valueArrayObject = testDataProvider.getByPath("${array[1].b}").getValue();
139139

140-
assertEquals(value, "a");
141-
assertEquals(valueArrayObject, "1");
140+
assertEquals("a", value);
141+
assertEquals("1", valueArrayObject);
142142
assertEquals(testDataProvider.get("array").toString(), testDataProvider.getByPath("$Tests{array}").toString());
143143
}
144144

providers/mongo-provider/src/main/java/ru/sbtqa/tag/datajack/providers/MongoDataProvider.java renamed to providers/mongo-provider/src/main/java/ru/sbtqa/tag/datajack/mongo/MongoDataProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package ru.sbtqa.tag.datajack.providers;
1+
package ru.sbtqa.tag.datajack.mongo;
22

33
import com.mongodb.*;
44
import org.bson.BSONObject;
55
import org.bson.types.ObjectId;
66
import ru.sbtqa.tag.datajack.exceptions.*;
7+
import ru.sbtqa.tag.datajack.providers.AbstractDataProvider;
78

89
public class MongoDataProvider extends AbstractDataProvider {
910

providers/mongo-provider/src/test/java/ru/sbtqa/tag/datajack/providers/MongoDataTest.java renamed to providers/mongo-provider/src/test/java/ru/sbtqa/tag/datajack/mongo/MongoDataTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.sbtqa.tag.datajack.providers;
1+
package ru.sbtqa.tag.datajack.mongo;
22

33
import com.github.fakemongo.junit.FongoRule;
44
import com.mongodb.DB;
@@ -11,6 +11,7 @@
1111
import ru.sbtqa.tag.datajack.TestDataProvider;
1212
import ru.sbtqa.tag.datajack.callback.SampleDataGensCallback;
1313
import ru.sbtqa.tag.datajack.exceptions.*;
14+
import ru.sbtqa.tag.datajack.mongo.MongoDataProvider;
1415

1516
import java.io.IOException;
1617
import java.util.Map;

‎providers/properties-provider/src/test/java/ru/sbtqa/tag/datajack/providers/properties/PropertiesDataTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ public void getByPathArrayTest() throws DataException {
142142
String value = testDataProvider.getByPath("$Tests{array[0]}").getValue();
143143
String valueArrayObject = testDataProvider.getByPath("${array[1].b}").getValue();
144144

145-
assertEquals(value, "a");
146-
assertEquals(valueArrayObject, "1");
145+
assertEquals("a", value);
146+
assertEquals("1", valueArrayObject);
147147
assertEquals(testDataProvider.get("array").toString(), testDataProvider.getByPath("$Tests{array}").toString());
148148
}
149149

0 commit comments

Comments
 (0)