Merge remote-tracking branch 'origin/master'
This commit is contained in:
@ -38,8 +38,6 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testImplementation 'junit:junit:4.13.1'
|
|
||||||
|
|
||||||
provided 'javax.servlet:javax.servlet-api:3.1.0'
|
provided 'javax.servlet:javax.servlet-api:3.1.0'
|
||||||
|
|
||||||
testCompile 'org.junit.jupiter:junit-jupiter:5.8.2'
|
testCompile 'org.junit.jupiter:junit-jupiter:5.8.2'
|
||||||
|
@ -6,8 +6,8 @@ import java.io.IOException;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
import org.junit.Assert;
|
import org.junit.jupiter.api.Assertions;
|
||||||
import org.junit.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Victor Bellavin
|
* @author Victor Bellavin
|
||||||
@ -17,6 +17,6 @@ public class SampleTests {
|
|||||||
public void testProductName() throws IOException {
|
public void testProductName() throws IOException {
|
||||||
final Properties props = new Properties(System.getProperties());
|
final Properties props = new Properties(System.getProperties());
|
||||||
Misc.loadProperties(props, Arrays.asList("ncore-properties.xml", "ncore-properties-local.xml"));
|
Misc.loadProperties(props, Arrays.asList("ncore-properties.xml", "ncore-properties-local.xml"));
|
||||||
Assert.assertEquals(props.getProperty("product.name"), "sample");
|
Assertions.assertEquals(props.getProperty("product.name"), "sample");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
0
updates/.gitkeep
Normal file
0
updates/.gitkeep
Normal file
Reference in New Issue
Block a user