Skip to content

Commit 92d2d19

Browse files
dghgitdghgit
committed
fixed some tests to still work on Java 5.
added service clause. moved version to gradle.properties
1 parent 54cac17 commit 92d2d19

8 files changed

Lines changed: 110 additions & 21 deletions

File tree

‎ant/bc+-build.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@
995995
<formatter type="xml" />
996996
<batchtest todir="${artifacts.reports.xml.dir}" unless="testcase">
997997
<fileset dir="${test.target.src.dir}">
998-
<include name="**/AllTests.java" />
998+
<include name="**AllTests.java" />
999999
<exclude name="${env.JUNIT_EXCLUDE_TESTS}" if="env.JUNIT_EXCLUDE_TESTS" />
10001000
</fileset>
10011001
</batchtest>
@@ -1007,6 +1007,8 @@
10071007
</fileset>
10081008
<report format="frames" todir="${artifacts.reports.html.dir}" />
10091009
</junitreport>
1010+
1011+
<fail if="test.failed"/>
10101012
</target>
10111013

10121014
<target name="test-lw">

‎ant/jdk15+.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<fileset dir="tls/src/main/jdk1.5" includes="**/*.java" />
4343
<fileset dir="tls/src/main/javadoc" includes="**/*.html" />
4444
<fileset dir="tls/src/test/java" includes="**/*.java" />
45+
<fileset dir="tls/src/test/jdk1.5" includes="**/*.java" />
4546
<fileset dir="tls/src/test/resources" includes="**/*.*" />
4647

4748
<fileset dir="pkix/src/main/java" includes="**/*.java" />

‎build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ subprojects {
164164
targetCompatibility = 1.8
165165
}
166166

167-
version = '1.74'
168-
169167
task testFull(type:Test) {
170168
systemProperties = [
171169
'bc.test.data.home': bcTestDataHome,

‎build1-5to1-8‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ if [ "${JDKPATH}" = "" ]
1010
then
1111
JDKPATH=/usr/lib/jvm/java-8-openjdk-amd64
1212
fi
13+
if [ "${JDK5PATH}" = "" ]
14+
then
15+
JDK5PATH=/usr/lib/jvm/java-1.5.0-oracle-i586/
16+
fi
1317

1418
JAVA_HOME=$JDKPATH
1519
export JAVA_HOME
@@ -19,6 +23,15 @@ export PATH
1923

2024
if [ "$1" = "test" ]
2125
then
26+
#
27+
# Note: always do a full build before running test
28+
#
29+
JAVA_HOME=$JDK5PATH
30+
export JAVA_HOME
31+
32+
PATH=$JDK5PATH/bin:$PATH
33+
export PATH
34+
2235
ant -f ant/jdk15+.xml test
2336
elif [ "$1" = "clean" ]
2437
then
@@ -29,14 +42,14 @@ else
2942
ant -f ant/jdk15+.xml build
3043
ant -f ant/jdk15+.xml zip-src
3144
fi
32-
fi
33-
34-
if [ -f build/artifacts/jdk1.5/jars/bcprov-jdk15on*.jar ]
35-
then
36-
tar cf - prov/src/main/resources/META-INF | (cd build/artifacts/jdk1.5/jars/; tar xf -)
45+
if [ -f build/artifacts/jdk1.5/jars/bcprov-jdk15to18*.jar ]
46+
then
47+
tar cf - prov/src/main/resources/META-INF | (cd build/artifacts/jdk1.5/jars/; tar xf -)
3748
cd build/artifacts/jdk1.5/jars/
3849
mv prov/src/main/resources/META-INF .
39-
jar uf bcprov-jdk15on*.jar META-INF
40-
jar uf bcprov-ext-jdk15on*.jar META-INF
50+
jar uf bcprov-jdk15to18*.jar META-INF
51+
jar uf bcprov-ext-jdk15to18*.jar META-INF
4152
rm -r prov META-INF
53+
fi
4254
fi
55+

‎build1-8+‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ else
2929
ant -f ant/jdk18+.xml build
3030
ant -f ant/jdk18+.xml zip-src
3131
fi
32-
fi
33-
34-
if [ -f build/artifacts/jdk1.8/jars/bcprov-jdk15on*.jar ]
35-
then
32+
if [ -f build/artifacts/jdk1.8/jars/bcprov-jdk18on*.jar ]
33+
then
3634
tar cf - prov/src/main/resources/META-INF | (cd build/artifacts/jdk1.8/jars/; tar xf -)
3735
cd build/artifacts/jdk1.8/jars/
3836
mv prov/src/main/resources/META-INF .
3937
jar uf bcprov-jdk18on*.jar META-INF
4038
jar uf bcprov-ext-jdk18on*.jar META-INF
4139
rm -r prov META-INF
40+
fi
4241
fi
42+

‎gradle.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
org.gradle.jvmargs=-Xmx2g
1+
org.gradle.jvmargs=-Xmx2g
2+
version=1.75

‎tls/src/test/java/org/bouncycastle/jsse/provider/test/SSLUtils.java‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,23 @@ public void run()
5959
{
6060
try
6161
{
62-
KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance("PKIX");
62+
boolean isJdk15 = System.getProperty("java.version").indexOf("1.5.") == 0;
63+
64+
KeyManagerFactory keyManagerFactory = isJdk15 ?
65+
KeyManagerFactory.getInstance("PKIX", ProviderUtils.PROVIDER_NAME_BCJSSE) :
66+
KeyManagerFactory.getInstance("PKIX");
6367

6468
keyManagerFactory.init(keyStore, password);
6569

66-
TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance("PKIX");
70+
TrustManagerFactory trustManagerFactory = isJdk15 ?
71+
TrustManagerFactory.getInstance("PKIX", ProviderUtils.PROVIDER_NAME_BCJSSE) :
72+
TrustManagerFactory.getInstance("PKIX");
6773

6874
trustManagerFactory.init(serverStore);
6975

70-
SSLContext context = SSLContext.getInstance("TLS");
76+
SSLContext context = isJdk15 ?
77+
SSLContext.getInstance("TLS", ProviderUtils.PROVIDER_NAME_BCJSSE) :
78+
SSLContext.getInstance("TLS");
7179

7280
context.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null);
7381

@@ -92,9 +100,10 @@ public void run()
92100

93101
ss.close();
94102
}
95-
catch (Exception e)
103+
catch (Throwable e)
96104
{
97-
e.printStackTrace();
105+
Thread.currentThread().interrupt();
106+
latch.countDown();
98107
}
99108
}
100109
};
@@ -109,7 +118,7 @@ public void run()
109118
}
110119
catch (InterruptedException e)
111120
{
112-
121+
e.printStackTrace();
113122
}
114123
}
115124
}

‎tls/src/test/jdk1.5/org/bouncycastle/jsse/provider/test/AllTests.java‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
package org.bouncycastle.jsse.provider.test;
2+
3+
import junit.extensions.TestSetup;
4+
import junit.framework.Test;
5+
import junit.framework.TestCase;
6+
import junit.framework.TestSuite;
7+
import org.bouncycastle.test.PrintTestResult;
8+
9+
public class AllTests
10+
extends TestCase
11+
{
12+
public static void main(String[] args)
13+
throws Exception
14+
{
15+
PrintTestResult.printResult( junit.textui.TestRunner.run(suite()));
16+
}
17+
18+
public static Test suite()
19+
throws Exception
20+
{
21+
TestSuite suite = new TestSuite("JSSE tests");
22+
//
23+
// suite.addTestSuite(BasicClientAuthTlsTest.class);
24+
// suite.addTestSuite(BasicTlsTest.class);
25+
suite.addTestSuite(ConfigTest.class);
26+
// suite.addTestSuite(ECDSACredentialsTest.class);
27+
// suite.addTestSuite(EdDSACredentialsTest.class);
28+
suite.addTestSuite(InstanceTest.class);
29+
suite.addTestSuite(KeyManagerFactoryTest.class);
30+
31+
return new BCTestSetup(suite);
32+
}
33+
34+
static class BCTestSetup
35+
extends TestSetup
36+
{
37+
public BCTestSetup(Test test)
38+
{
39+
super(test);
40+
}
41+
42+
protected void setUp()
43+
{
44+
45+
}
46+
47+
protected void tearDown()
48+
{
49+
50+
}
51+
}
52+
53+
private static boolean hasClass(String name)
54+
{
55+
try
56+
{
57+
AllTests.class.getClassLoader().loadClass(name);
58+
return true;
59+
}
60+
catch (Exception e)
61+
{
62+
return false;
63+
}
64+
}
65+
}

0 commit comments

Comments
 (0)