Skip to content

Commit 06da623

Browse files
committed
add some tests, remove populator, and polish
1 parent 1a0abe3 commit 06da623

12 files changed

+201
-333
lines changed

src/main/java/com/antkorwin/springtestmongo/MongoPopulator.java

-113
This file was deleted.

src/main/java/com/antkorwin/springtestmongo/errorinfo/MongoDbErrorInfo.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public enum MongoDbErrorInfo implements ErrorInfo {
1919
UNRESOLVED_DOCUMENT_COLLECTION_CLASS_TYPE("Unresolved document collection class reference from the DataSet."),
2020
DOCUMENT_RECORD_PARSING_ERROR("Error while parsing the document record in the collection."),
2121
DATASET_PARSING_ERROR("Error while parsing the file with a dataset."),
22-
DATASET_FORMAT_ERROR("Wrong dataset's format.");
22+
DATASET_FORMAT_ERROR("Wrong dataset's format."),
23+
JSON_PARSING_ERROR("Error when parsing the JSON text.");
2324

2425
private final String message;
2526
private final int base = 1000;

src/main/java/com/antkorwin/springtestmongo/internal/ImportFile.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import java.io.InputStream;
99
import java.nio.charset.StandardCharsets;
1010

11+
import static com.antkorwin.springtestmongo.errorinfo.MongoDbErrorInfo.FILE_NOT_FOUND;
1112
import static com.antkorwin.springtestmongo.errorinfo.MongoDbErrorInfo.READ_DATASETS_FILE_ERROR;
12-
import static sun.management.AgentConfigurationError.FILE_NOT_FOUND;
1313

1414
/**
1515
* Load text from a file.
@@ -26,12 +26,10 @@ class ImportFile implements Text {
2626

2727
@Override
2828
public String read() {
29-
30-
InputStream inputStream = getResourceStream();
31-
Guard.check(inputStream != null, InternalException.class, FILE_NOT_FOUND);
32-
33-
try {
29+
try (InputStream inputStream = getResourceStream()) {
30+
Guard.check(inputStream != null, InternalException.class, FILE_NOT_FOUND);
3431
return IOUtils.toString(inputStream, StandardCharsets.UTF_8);
32+
3533
} catch (IOException e) {
3634
e.printStackTrace();
3735
throw new InternalException(READ_DATASETS_FILE_ERROR, e);

src/main/java/com/antkorwin/springtestmongo/internal/JsonImport.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import java.util.List;
1010
import java.util.Map;
1111

12+
import static com.antkorwin.springtestmongo.errorinfo.MongoDbErrorInfo.JSON_PARSING_ERROR;
13+
1214
/**
1315
* Convert a {@link Text} (in JSON format) to the {@link DataSet}
1416
*
@@ -30,10 +32,11 @@ public Map<String, List<?>> read() {
3032

3133
String content = text.read();
3234
try {
33-
return objectMapper.readValue(content, new TypeReference<Map<String, List<?>>>() {});
35+
return objectMapper.readValue(content, new TypeReference<Map<String, List<?>>>() {
36+
});
3437
} catch (IOException e) {
3538
e.printStackTrace();
36-
throw new InternalException(e);
39+
throw new InternalException(JSON_PARSING_ERROR, e);
3740
}
3841
}
3942
}

src/main/java/com/antkorwin/springtestmongo/internal/MongoDbTest.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package com.antkorwin.springtestmongo.internal;
22

3+
import com.antkorwin.commonutils.exceptions.InternalException;
4+
import com.antkorwin.commonutils.validation.Guard;
35
import org.springframework.data.mongodb.core.MongoTemplate;
46

7+
import static com.antkorwin.springtestmongo.errorinfo.MongoDbErrorInfo.MONGO_TEMPLATE_IS_MANDATORY;
8+
59
/**
610
* MongoDb test tools,
711
* to run importing and exporting MongoDb's data.
@@ -13,6 +17,7 @@ public class MongoDbTest {
1317
private final MongoTemplate mongoTemplate;
1418

1519
public MongoDbTest(MongoTemplate mongoTemplate) {
20+
Guard.check(mongoTemplate != null, InternalException.class, MONGO_TEMPLATE_IS_MANDATORY);
1621
this.mongoTemplate = mongoTemplate;
1722
}
1823

src/main/java/com/antkorwin/springtestmongo/junit4/MongoDbRule.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.antkorwin.commonutils.exceptions.InternalException;
44
import com.antkorwin.commonutils.validation.Guard;
5-
import com.antkorwin.springtestmongo.MongoPopulator;
65
import com.antkorwin.springtestmongo.annotation.ExportMongoDataSet;
76
import com.antkorwin.springtestmongo.annotation.MongoDataSet;
87
import com.antkorwin.springtestmongo.internal.MongoDbTest;

src/main/java/com/antkorwin/springtestmongo/junit5/MongoDbExtension.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.antkorwin.commonutils.exceptions.InternalException;
44
import com.antkorwin.commonutils.validation.Guard;
5-
import com.antkorwin.springtestmongo.MongoPopulator;
65
import com.antkorwin.springtestmongo.annotation.ExportMongoDataSet;
76
import com.antkorwin.springtestmongo.annotation.MongoDataSet;
87
import com.antkorwin.springtestmongo.internal.MongoDbTest;

src/test/java/com/antkorwin/springtestmongo/MongoPopulatorTest.java

-183
This file was deleted.

0 commit comments

Comments
 (0)