ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-18 02:39:51 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2970 Revert usage of Gradle JUnit 5 Platform Runner (#5173)

Browse Source 
* Revert usage of Gradle 5 useJUnitPlatform() which causes significant test execution performance degradation.

* Remove completely top-level Java CordaCaplet unit tests causing consistent TC failure on Azure VMs:

 java.security.NoSuchAlgorithmException: no such algorithm: NONEwithEdDSA for provider BC
This commit is contained in:
josecoll 2019-06-05 10:17:02 +01:00 committed by GitHub
parent 24c8a5a2dd
commit 8678bad88d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 0 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -229,8 +229,6 @@ allprojects {
}
tasks.withType(Test) {
useJUnitPlatform()
failFast = project.hasProperty('tests.failFast') ? project.property('tests.failFast').toBoolean() : false
// Prevent the project from creating temporary files outside of the build directory.

39
node/src/test/java/CordaCapletBaseDirectoryParsingFailureTest.java
View File

@ -1,39 +0,0 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collection;
import static org.junit.Assert.assertEquals;
@RunWith(Parameterized.class)
public class CordaCapletBaseDirectoryParsingFailureTest {
@Parameterized.Parameters
public static Collection<Object[]> CombinationsToTest() {
return Arrays.asList(
new Object[][]{
{new String[]{"--base-directory", "--another-option"}},
{new String[]{"--base-directory=", "-a"}},
{new String[]{"-b", "--another-option"}},
{new String[]{"-b=", "-a"}}
}
);
}
private String[] cmdLineArguments;
public CordaCapletBaseDirectoryParsingFailureTest(String[] baseOption) {
this.cmdLineArguments = baseOption;
}
@Test
public void testThatBaseDirectoryFallsBackToCurrentWhenBaseDirectoryIsNotSupplied() {
final CordaCaplet caplet = CordaCapletTestUtils.getCaplet();
final String returnPath = caplet.getBaseDirectory(Arrays.asList(cmdLineArguments));
final String expected = Paths.get(".").toAbsolutePath().normalize().toString();
assertEquals(expected, returnPath);
}
}

39
node/src/test/java/CordaCapletBaseDirectoryParsingTest.java
View File

@ -1,39 +0,0 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collection;
import static org.junit.Assert.assertEquals;
@RunWith(Parameterized.class)
public class CordaCapletBaseDirectoryParsingTest {
@Parameterized.Parameters
public static Collection<Object[]> CombinationsToTest() {
return Arrays.asList(
new Object[][]{
{new String[]{"--base-directory", "blah"}},
{new String[]{"--base-directory=blah"}},
{new String[]{"-b", "blah"}},
{new String[]{"-b=blah"}}
});
}
private String[] cmdLineArguments;
public CordaCapletBaseDirectoryParsingTest(String[] arr) {
this.cmdLineArguments = arr;
}
@Test
public void testThatBaseDirectoryParameterIsRecognised() {
final CordaCaplet caplet = CordaCapletTestUtils.getCaplet();
final String returnPath = caplet.getBaseDirectory(Arrays.asList(cmdLineArguments));
final String expected = Paths.get(".").resolve("blah").toAbsolutePath().normalize().toString();
assertEquals(expected, returnPath);
}
}

40
node/src/test/java/CordaCapletConfigFileParsingFailureTest.java
View File

@ -1,40 +0,0 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.io.File;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collection;
import static org.junit.Assert.assertEquals;
@RunWith(Parameterized.class)
public class CordaCapletConfigFileParsingFailureTest {
@Parameterized.Parameters
public static Collection<Object[]> CombinationsToTest() {
return Arrays.asList(
new Object[][]{
{new String[]{"--config-file", "--another-option"}},
{new String[]{"--config-file=", "-a"}},
{new String[]{"-f", "--another-option"}},
{new String[]{"-f=", "-a"}}
}
);
}
private String[] cmdLineArguments;
public CordaCapletConfigFileParsingFailureTest(String[] baseOption) {
this.cmdLineArguments = baseOption;
}
@Test
public void testThatBaseDirectoryFallsBackToDefaultWhenConfigFileIsNotSupplied() {
final CordaCaplet caplet = CordaCapletTestUtils.getCaplet();
final File returnPath = caplet.getConfigFile(Arrays.asList(cmdLineArguments), CordaCapletTestUtils.getBaseDir());
final File expected = Paths.get(".").resolve("node.conf").toAbsolutePath().normalize().toFile();
assertEquals(expected, returnPath);
}
}

40
node/src/test/java/CordaCapletConfigFileParsingTest.java
View File

@ -1,40 +0,0 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.io.File;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collection;
import static org.junit.Assert.assertEquals;
@RunWith(Parameterized.class)
public class CordaCapletConfigFileParsingTest {
@Parameterized.Parameters
public static Collection<Object[]> CombinationsToTest() {
return Arrays.asList(
new Object[][]{
{new String[]{"--config-file", "blah.conf"}},
{new String[]{"--config-file=blah.conf"}},
{new String[]{"-f", "blah.conf"}},
{new String[]{"-f=blah.conf"}}
});
}
private String[] cmdLineArguments;
public CordaCapletConfigFileParsingTest(String[] arr) {
this.cmdLineArguments = arr;
}
@Test
public void testThatConfigFileParameterIsRecognised() {
final CordaCaplet caplet = CordaCapletTestUtils.getCaplet();
final File returnPath = caplet.getConfigFile(Arrays.asList(cmdLineArguments), CordaCapletTestUtils.getBaseDir());
final File expected = Paths.get(".").resolve("blah.conf").toAbsolutePath().normalize().toFile();
assertEquals(expected, returnPath.getAbsoluteFile());
}
}

16
node/src/test/java/CordaCapletTestUtils.java
View File

@ -1,16 +0,0 @@
import java.io.File;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Objects;
class CordaCapletTestUtils {
static CordaCaplet getCaplet() {
final String path = System.getProperty("user.dir") + File.separator + "build" + File.separator + "libs" + File.separator;
final File jar = Arrays.stream(Objects.requireNonNull(new File(path).listFiles())).filter(x -> x.getName().startsWith("corda-node") && x.getName().endsWith(".jar")).findFirst().get();
return new CordaCaplet(new Capsule(jar.toPath()));
}
static String getBaseDir() {
return Paths.get(".").toAbsolutePath().normalize().toString();
}
}