frosch95/SmartCSV.fx
1
0
Fork 0
mirror of https://github.com/frosch95/SmartCSV.fx.git synced 2026-04-11 13:38:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

migrated all test to junit 5

Browse Source
This commit is contained in:
Andreas Billmann
2019-10-23 05:57:06 +02:00
parent a7fce854ca
commit f41979960b
7 changed files with 89 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@@ -18,6 +18,7 @@ javafx {
dependencies { dependencies {
// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.2' testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.2'
testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.5.2'
testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2' testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'
testCompile group: 'org.mockito', name: 'mockito-core', version:'3.1.0' testCompile group: 'org.mockito', name: 'mockito-core', version:'3.1.0'
compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.0-beta-3' compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.0-beta-3'
@@ -35,6 +36,10 @@ dependencies {
compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.10.2' compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.10.2'
} }
test {
useJUnitPlatform()
}
group 'ninja.javafx' group 'ninja.javafx'
version '0.9.3-SNAPSHOT' version '0.9.3-SNAPSHOT'
mainClassName = 'ninja.javafx.smartcsv.Main' mainClassName = 'ninja.javafx.smartcsv.Main'

3
src/test/java/ninja/javafx/smartcsv/files/FileStorageTest.java
View File

@@ -2,12 +2,9 @@ package ninja.javafx.smartcsv.files;
import ninja.javafx.smartcsv.FileReader; import ninja.javafx.smartcsv.FileReader;
import ninja.javafx.smartcsv.FileWriter; import ninja.javafx.smartcsv.FileWriter;
import org.junit.Before;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;

10
src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVModelTest.java
View File

@@ -26,7 +26,7 @@
package ninja.javafx.smartcsv.fx.table.model; package ninja.javafx.smartcsv.fx.table.model;
import org.junit.Test; import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
@@ -39,14 +39,14 @@ public class CSVModelTest {
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// constants // constants
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static final String TESTHEADER = "TESTHEADER"; private static final String TESTHEADER = "TESTHEADER";
static final String TESTVALUE = "TESTVALUE"; private static final String TESTVALUE = "TESTVALUE";
static final String FILEPATH = "filepath"; private static final String FILEPATH = "filepath";
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// subject under test // subject under test
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
CSVModel sut = new CSVModel(); private CSVModel sut = new CSVModel();
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// tests // tests

8
src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVRowTest.java
View File

@@ -1,6 +1,6 @@
package ninja.javafx.smartcsv.fx.table.model; package ninja.javafx.smartcsv.fx.table.model;
import org.junit.Test; import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.hasKey;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
@@ -14,13 +14,13 @@ public class CSVRowTest {
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// constants // constants
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static final String COLUMN = "COLUMN"; private static final String COLUMN = "COLUMN";
static final String VALUE = "VALUE"; private static final String VALUE = "VALUE";
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// subject under test // subject under test
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
CSVRow sut = new CSVRow(); private CSVRow sut = new CSVRow();
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

6
src/test/java/ninja/javafx/smartcsv/preferences/CharsetHelperTest.java
View File

@@ -28,6 +28,7 @@ package ninja.javafx.smartcsv.preferences;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
@@ -38,18 +39,19 @@ public class CharsetHelperTest {
public void getCharsetName_known_charset() { public void getCharsetName_known_charset() {
String result = CharsetHelper.getCharsetName("UTF-16"); String result = CharsetHelper.getCharsetName("UTF-16");
assertEquals(StandardCharsets.UTF_16.name(), result); assertEquals(StandardCharsets.UTF_16.name(), result);
assertNotEquals(StandardCharsets.UTF_16.name(), Charset.defaultCharset());
} }
@Test @Test
public void getCharsetName_unknown_charset() { public void getCharsetName_unknown_charset() {
String result = CharsetHelper.getCharsetName("foobar"); String result = CharsetHelper.getCharsetName("foobar");
assertEquals(StandardCharsets.UTF_8.name(), result); assertEquals(Charset.defaultCharset().name(), result);
} }
@Test @Test
public void getCharsetName_null_charset() { public void getCharsetName_null_charset() {
String result = CharsetHelper.getCharsetName(null); String result = CharsetHelper.getCharsetName(null);
assertEquals(StandardCharsets.UTF_8.name(), result); assertEquals(Charset.defaultCharset().name(), result);
} }
} }

76
src/test/java/ninja/javafx/smartcsv/validation/HeaderValidationTest.java
View File

@@ -29,13 +29,12 @@ package ninja.javafx.smartcsv.validation;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration; import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
import org.junit.Before; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.Test; import org.junit.jupiter.params.provider.Arguments;
import org.junit.runner.RunWith; import org.junit.jupiter.params.provider.MethodSource;
import org.junit.runners.Parameterized;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static java.util.Collections.singletonList; import static java.util.Collections.singletonList;
@@ -46,50 +45,22 @@ import static org.junit.Assert.assertTrue;
/** /**
* unit test for header validator * unit test for header validator
*/ */
@RunWith(Parameterized.class)
public class HeaderValidationTest { public class HeaderValidationTest {
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// parameters
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
private ValidationConfiguration config;
private Boolean expectedResult;
private List<ValidationMessage> expectedErrors;
private String[] headerNames;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// subject under test
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
private Validator sut;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// parameterized constructor
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
public HeaderValidationTest(String configHeaderNames,
String[] headerNames,
Boolean expectedResult,
List<ValidationMessage> expectedErrors) {
Gson gson = new GsonBuilder().create();
this.config = gson.fromJson(configHeaderNames, ValidationConfiguration.class);
this.headerNames = headerNames;
this.expectedResult = expectedResult;
this.expectedErrors = expectedErrors;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// init
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@Before
public void initialize() {
sut = new Validator(config, new TestColumnValueProvider());
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// tests // tests
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@Test @ParameterizedTest
public void validation() { @MethodSource("validationConfigurations")
public void validation(String configHeaderNames,
String[] headerNames,
Boolean expectedResult,
List<ValidationMessage> expectedErrors) {
// setup
Gson gson = new GsonBuilder().create();
ValidationConfiguration config = gson.fromJson(configHeaderNames, ValidationConfiguration.class);
Validator sut = new Validator(config, new TestColumnValueProvider());
// execution // execution
ValidationError result = sut.isHeaderValid(headerNames); ValidationError result = sut.isHeaderValid(headerNames);
@@ -103,15 +74,14 @@ public class HeaderValidationTest {
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// parameters for tests // parameters for tests
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@Parameterized.Parameters public static Stream<Arguments> validationConfigurations() {
public static Collection validationConfigurations() { return Stream.of(
return asList(new Object[][] { Arguments.of( json(), new String[] {}, true, null ),
{ json(), new String[] {}, true, null }, Arguments.of( json("a"), new String[] {"a"}, true, null ),
{ json("a"), new String[] {"a"}, true, null }, Arguments.of( json("a"), new String[] {"b"}, false, singletonList(new ValidationMessage("validation.message.header.match", "0", "a", "b"))),
{ json("a"), new String[] {"b"}, false, singletonList(new ValidationMessage("validation.message.header.match", "0", "a", "b"))}, Arguments.of( json("a"), new String[] {"a","b"}, false, singletonList(new ValidationMessage("validation.message.header.length", "2", "1"))),
{ json("a"), new String[] {"a","b"}, false, singletonList(new ValidationMessage("validation.message.header.length", "2", "1"))}, Arguments.of( json("a", "b"), new String[] {"b", "a"}, false, asList(new ValidationMessage("validation.message.header.match", "0", "a", "b"), new ValidationMessage("validation.message.header.match", "1", "b", "a")) )
{ json("a", "b"), new String[] {"b", "a"}, false, asList(new ValidationMessage("validation.message.header.match", "0", "a", "b"), new ValidationMessage("validation.message.header.match", "1", "b", "a")) } );
});
} }
@SuppressWarnings("StringConcatenationInLoop") @SuppressWarnings("StringConcatenationInLoop")

138
src/test/java/ninja/javafx/smartcsv/validation/ValidatorTest.java
View File

@@ -3,13 +3,12 @@ package ninja.javafx.smartcsv.validation;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration; import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
import org.junit.Before; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.Test; import org.junit.jupiter.params.provider.Arguments;
import org.junit.runner.RunWith; import org.junit.jupiter.params.provider.MethodSource;
import org.junit.runners.Parameterized;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.joining;
@@ -20,59 +19,21 @@ import static org.junit.Assert.assertThat;
/** /**
* unit test for validator * unit test for validator
*/ */
@RunWith(Parameterized.class)
public class ValidatorTest { public class ValidatorTest {
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// parameters
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
private String config;
private String value;
private Boolean expectedResult;
private ValidationMessage expectedError;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// subject under test
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
private Validator sut;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// parameterized constructor
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
public ValidatorTest(String config,
String value,
Boolean expectedResult,
ValidationMessage expectedError) {
this.config = config;
this.value = value;
this.expectedResult = expectedResult;
this.expectedError = expectedError;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// init
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@Before
public void initialize() {
Gson gson = new GsonBuilder().create();
ValidationConfiguration validationConfiguration = gson.fromJson(config, ValidationConfiguration.class);
sut = new Validator(validationConfiguration, new TestColumnValueProvider());
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// tests // tests
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@Test @ParameterizedTest
public void validation() { @MethodSource("validationConfigurations")
System.out.println("==================================================="); public void validation(String config,
System.out.println(config); String value,
System.out.println(value + " " + expectedResult + " " + expectedError); Boolean expectedResult,
System.out.println("===================================================\n"); ValidationMessage expectedError) {
// setup
Gson gson = new GsonBuilder().create();
ValidationConfiguration validationConfiguration = gson.fromJson(config, ValidationConfiguration.class);
Validator sut = new Validator(validationConfiguration, new TestColumnValueProvider());
// execution // execution
ValidationError result = sut.isValid(0, "column", value); ValidationError result = sut.isValid(0, "column", value);
@@ -87,45 +48,42 @@ public class ValidatorTest {
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// parameters for tests // parameters for tests
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@Parameterized.Parameters public static Stream<Arguments> validationConfigurations() {
public static Collection validationConfigurations() { return Stream.of(
return asList(new Object[][] { Arguments.of( constraintsJSON("string", "required", true), "value", true, null ),
{ constraintsJSON("string", "required", true), "value", true, null }, Arguments.of( constraintsJSON("string", "required", true), "", false, new ValidationMessage("validation.message.not.empty") ),
{ constraintsJSON("string", "required", true), "", false, new ValidationMessage("validation.message.not.empty") }, Arguments.of( constraintsJSON("string", "required", true), null, false, new ValidationMessage("validation.message.not.empty") ),
{ constraintsJSON("string", "required", true), null, false, new ValidationMessage("validation.message.not.empty") }, Arguments.of( constraintsJSON("integer", null, true), "999", true, null ),
{ constraintsJSON("integer", null, true), "999", true, null }, Arguments.of( constraintsJSON("integer", null, true), "a", false, new ValidationMessage("validation.message.integer") ),
{ constraintsJSON("integer", null, true), "a", false, new ValidationMessage("validation.message.integer") }, Arguments.of( constraintsJSON("number", null, true), "999", true, null ),
{ constraintsJSON("number", null, true), "999", true, null }, Arguments.of( constraintsJSON("number", null, true), "999.000", true, null ),
{ constraintsJSON("number", null, true), "999.000", true, null }, Arguments.of( constraintsJSON("number", null, true), "a", false, new ValidationMessage("validation.message.double") ),
{ constraintsJSON("number", null, true), "a", false, new ValidationMessage("validation.message.double") }, Arguments.of( constraintsJSON("string", "minLength", 2), "12", true, null ),
{ constraintsJSON("string", "minLength", 2), "12", true, null }, Arguments.of( constraintsJSON("string", "minLength", 2), "1", false, new ValidationMessage("validation.message.min.length", "2") ),
{ constraintsJSON("string", "minLength", 2), "1", false, new ValidationMessage("validation.message.min.length", "2") }, Arguments.of( constraintsJSON("string", "maxLength", 2), "12", true, null ),
{ constraintsJSON("string", "maxLength", 2), "12", true, null }, Arguments.of( constraintsJSON("string", "maxLength", 2), "123", false, new ValidationMessage("validation.message.max.length", "2") ),
{ constraintsJSON("string", "maxLength", 2), "123", false, new ValidationMessage("validation.message.max.length", "2") }, Arguments.of( constraintsJSON("string", "pattern", "[a-z]*"), "abc", true, null ),
{ constraintsJSON("string", "pattern", "[a-z]*"), "abc", true, null }, Arguments.of( constraintsJSON("string", "pattern", "[a-z]*"), "abcA", false, new ValidationMessage("validation.message.regexp", "[a-z]*") ),
{ constraintsJSON("string", "pattern", "[a-z]*"), "abcA", false, new ValidationMessage("validation.message.regexp", "[a-z]*") }, Arguments.of( constraintsJSON("string", "enum", asList("a","b","c","d","e")), "c", true, null ),
{ constraintsJSON("string", "enum", asList("a","b","c","d","e")), "c", true, null }, Arguments.of( constraintsJSON("string", "enum", asList("a","b","c","d","e")), "f", false, new ValidationMessage("validation.message.value.of", "f", "a, b, c, d, e") ),
{ constraintsJSON("string", "enum", asList("a","b","c","d","e")), "f", false, new ValidationMessage("validation.message.value.of", "f", "a, b, c, d, e") },
{ formatJSON("string", null), "some string", true, null }, Arguments.of( formatJSON("string", null), "some string", true, null ),
{ formatJSON("string", "email"), "test@javafx.ninja", true, null }, Arguments.of( formatJSON("string", "email"), "test@javafx.ninja", true, null ),
{ formatJSON("string", "email"), "wrong email", false, new ValidationMessage("validation.message.email") }, Arguments.of( formatJSON("string", "email"), "wrong email", false, new ValidationMessage("validation.message.email") ),
{ formatJSON("string", "uri"), "http://www.javafx.ninja", true, null }, Arguments.of( formatJSON("string", "uri"), "http://www.javafx.ninja", true, null ),
{ formatJSON("string", "uri"), "!$%&/()", false, new ValidationMessage("validation.message.uri") }, Arguments.of( formatJSON("string", "uri"), "!$%&/()", false, new ValidationMessage("validation.message.uri") ),
{ formatJSON("string", "binary"), "dGVzdA==", true, null }, Arguments.of( formatJSON("string", "binary"), "dGVzdA==", true, null ),
{ formatJSON("string", "binary"), "no binary", false, new ValidationMessage("validation.message.binary") }, Arguments.of( formatJSON("string", "binary"), "no binary", false, new ValidationMessage("validation.message.binary") ),
{ formatJSON("string", "uuid"), "6ba7b810-9dad-11d1-80b4-00c04fd430c8", true, null }, Arguments.of( formatJSON("string", "uuid"), "6ba7b810-9dad-11d1-80b4-00c04fd430c8", true, null ),
{ formatJSON("string", "uuid"), "no uuid", false, new ValidationMessage("validation.message.uuid") }, Arguments.of( formatJSON("string", "uuid"), "no uuid", false, new ValidationMessage("validation.message.uuid") ),
{ formatJSON("date", null), "2015-11-27", true, null }, Arguments.of( formatJSON("date", null), "2015-11-27", true, null ),
{ formatJSON("date", null), "27.11.2015", false, new ValidationMessage("validation.message.date.format", "yyyy-MM-dd") }, Arguments.of( formatJSON("date", null), "27.11.2015", false, new ValidationMessage("validation.message.date.format", "yyyy-MM-dd") ),
{ formatJSON("date", "yyyyMMdd"), "20151127", true, null }, Arguments.of( formatJSON("date", "yyyyMMdd"), "20151127", true, null ),
{ formatJSON("date", "yyyyMMdd"), "27.11.2015", false, new ValidationMessage("validation.message.date.format", "yyyyMMdd") }, Arguments.of( formatJSON("date", "yyyyMMdd"), "27.11.2015", false, new ValidationMessage("validation.message.date.format", "yyyyMMdd") ),
Arguments.of( customAttributeJSON( "groovy", "value.contains('a')? 'true' : 'no a inside'"), "abcdef", true, null ),
{ customAttributeJSON( "groovy", "value.contains('a')? 'true' : 'no a inside'"), "abcdef", true, null }, Arguments.of( customAttributeJSON( "groovy", "value.contains('a')? 'true' : 'no a inside'"), "bcdefg", false, new ValidationMessage("no a inside") )
{ customAttributeJSON( "groovy", "value.contains('a')? 'true' : 'no a inside'"), "bcdefg", false, new ValidationMessage("no a inside") }, );
});
} }
public static String constraintsJSON(String type, String constraint, Object value) { public static String constraintsJSON(String type, String constraint, Object value) {