diff options
| -rw-r--r-- | base/test/src/com/netscape/test/TestRunner.java | 3 | ||||
| -rwxr-xr-x | base/util/src/netscape/security/x509/X509CRLImpl.java | 3 | ||||
| -rwxr-xr-x | base/util/src/netscape/security/x509/X509CertImpl.java | 4 | ||||
| -rw-r--r-- | cmake/Modules/JUnit.cmake | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/base/test/src/com/netscape/test/TestRunner.java b/base/test/src/com/netscape/test/TestRunner.java index 746b376f8..50f70d5c4 100644 --- a/base/test/src/com/netscape/test/TestRunner.java +++ b/base/test/src/com/netscape/test/TestRunner.java @@ -3,7 +3,6 @@ package com.netscape.test; import java.util.ArrayList; import java.util.List; -import org.junit.internal.RealSystem; import org.junit.runner.Description; import org.junit.runner.JUnitCore; import org.junit.runner.Result; @@ -15,7 +14,6 @@ public class TestRunner { JUnitCore core = new JUnitCore(); core.addListener(new TestListener()); - RealSystem system = new RealSystem(); List<Class<?>> classes= new ArrayList<Class<?>>(); List<Failure> missingClasses= new ArrayList<Failure>(); @@ -23,7 +21,6 @@ public class TestRunner { try { classes.add(Class.forName(each)); } catch (ClassNotFoundException e) { - system.out().println("Could not find class: " + each); Description description= Description.createSuiteDescription(each); Failure failure= new Failure(description, e); missingClasses.add(failure); diff --git a/base/util/src/netscape/security/x509/X509CRLImpl.java b/base/util/src/netscape/security/x509/X509CRLImpl.java index dfc1017bc..c48f39050 100755 --- a/base/util/src/netscape/security/x509/X509CRLImpl.java +++ b/base/util/src/netscape/security/x509/X509CRLImpl.java @@ -375,7 +375,8 @@ public class X509CRLImpl extends X509CRL { public void verify(PublicKey key) throws CRLException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException { - verify(key, null); + String sigProvider = null; + verify(key, sigProvider); } /** diff --git a/base/util/src/netscape/security/x509/X509CertImpl.java b/base/util/src/netscape/security/x509/X509CertImpl.java index 111cd3b6d..657e4d224 100755 --- a/base/util/src/netscape/security/x509/X509CertImpl.java +++ b/base/util/src/netscape/security/x509/X509CertImpl.java @@ -323,8 +323,8 @@ public class X509CertImpl extends X509Certificate public void verify(PublicKey key) throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException { - - verify(key, null); + String sigProvider = null; + verify(key, sigProvider); } /** diff --git a/cmake/Modules/JUnit.cmake b/cmake/Modules/JUnit.cmake index feab6d3ef..110d33d89 100644 --- a/cmake/Modules/JUnit.cmake +++ b/cmake/Modules/JUnit.cmake @@ -14,7 +14,7 @@ find_file(JUNIT_JAR NAMES - junit4.jar + junit.jar PATHS ${JAVA_LIB_INSTALL_DIR} /usr/share/java |