Accepting request 522261 from Java:packages

Fix build with java 9

OBS-URL: https://build.opensuse.org/request/show/522261
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/junitperf?expand=0&rev=15

junitperf-1.9.1-javadoc.patch

@@ -0,0 +1,127 @@
+--- junitperf-1.9.1/src/com/clarkware/junitperf/LoadTest.java	2004-12-30 09:05:00.000000000 +0100
++++ junitperf-1.9.1/src/com/clarkware/junitperf/LoadTest.java	2017-09-08 10:52:12.526400232 +0200
+@@ -16,18 +16,20 @@
+  * For example, to create a load test of 10 concurrent users
+  * with each user running <code>ExampleTest</code> once and 
+  * all users started simultaneously, use:
++ * </p>
+  * <blockquote>
+  * <pre>
+  * Test loadTest = new LoadTest(new TestSuite(ExampleTest.class), 10);
+  * </pre>
+  * </blockquote>
++ * <p>
+  * or, to load test a single test method, use: 
++ * </p>
+  * <blockquote>
+  * <pre>
+  * Test loadTest = new LoadTest(new ExampleTest("testSomething"), 10);
+  * </pre>
+  * </blockquote>
+- * </p>
+  * <p>
+  * The load can be ramped by specifying a pluggable 
+  * <code>Timer</code> instance which prescribes the delay
+@@ -41,13 +43,13 @@
+  * For example, to create a load test of 10 concurrent users
+  * with each user running <code>ExampleTest.testSomething()</code> once and 
+  * with a one second delay between the addition of users, use:
++ * </p>
+  * <blockquote>
+  * <pre>
+  * Timer timer = new ConstantTimer(1000);
+  * Test loadTest = new LoadTest(new ExampleTest("testSomething"), 10, timer);
+  * </pre>
+  * </blockquote>
+- * </p>
+  * <p>
+  * In order to simulate each concurrent user running a test for a 
+  * specified number of iterations, a <code>LoadTest</code> can be 
+@@ -60,6 +62,7 @@
+  * For example, to create a load test of 10 concurrent users
+  * with each user running <code>ExampleTest.testSomething()</code> for 20 iterations, 
+  * and with a one second delay between the addition of users, use:
++ * </p>
+  * <blockquote>
+  * <pre>
+  * Timer timer = new ConstantTimer(1000);
+@@ -67,23 +70,26 @@
+  * Test loadTest = new LoadTest(repeatedTest, 10, timer);
+  * </pre>
+  * </blockquote>
++ * <p>
+  * or, alternatively, use: 
++ * </p>
+  * <blockquote>
+  * <pre>
+  * Timer timer = new ConstantTimer(1000);
+  * Test loadTest = new LoadTest(new ExampleTest("testSomething"), 10, 20, timer);
+  * </pre>
+  * </blockquote> 
++ * <p>
+  * A <code>LoadTest</code> can be decorated as a <code>TimedTest</code>
+  * to test the elapsed time of the load test.  For example, to decorate 
+  * the load test constructed above as a timed test with a maximum elapsed 
+  * time of 2 seconds, use:
++ * </p>
+  * <blockquote>
+  * <pre>
+  * Test timedTest = new TimedTest(loadTest, 2000);
+  * </pre>
+  * </blockquote>
+- * </p>
+  * <p>
+  * By default, a <code>LoadTest</code> does not enforce test 
+  * atomicity (as defined in transaction processing) if its decorated 
+--- junitperf-1.9.1/src/com/clarkware/junitperf/TestFactory.java	2004-12-30 09:05:00.000000000 +0100
++++ junitperf-1.9.1/src/com/clarkware/junitperf/TestFactory.java	2017-09-08 10:49:39.705002745 +0200
+@@ -22,6 +22,7 @@
+  * </p>
+  * <p>
+  * A typical usage scenario is as follows:
++ * </p>
+  * <blockquote>
+  * <pre>
+  * Test factory = new TestFactory(YourTestCase.class);
+@@ -29,7 +30,6 @@
+  * ...
+  * </pre>
+  * </blockquote>
+- * </p>
+  * <p>
+  * Of course, static variables cannot be protected externally, so tests
+  * intended to be run in a multi-threaded environment should ensure
+--- junitperf-1.9.1/src/com/clarkware/junitperf/TestMethodFactory.java	2004-12-30 09:05:00.000000000 +0100
++++ junitperf-1.9.1/src/com/clarkware/junitperf/TestMethodFactory.java	2017-09-08 10:55:05.061911055 +0200
+@@ -13,6 +13,7 @@
+  * a specific test method of a <code>TestCase</code>.
+  * <p>
+  * A typical usage scenario is as follows:
++ * </p>
+  * <blockquote>
+  * <pre>
+  * Test factory = new TestMethodFactory(YourTestCase.class, "testSomething");
+@@ -20,7 +21,6 @@
+  * ...
+  * </pre>
+  * </blockquote>
+- * </p>
+  * 
+  * @author <b>Mike Clark</b>
+  * @author Clarkware Consulting, Inc.
+--- junitperf-1.9.1/src/com/clarkware/junitperf/TimedTest.java	2004-12-30 09:05:00.000000000 +0100
++++ junitperf-1.9.1/src/com/clarkware/junitperf/TimedTest.java	2017-09-08 10:54:30.458402586 +0200
+@@ -41,12 +41,12 @@
+  * Alternatively, to decorate the <code>ExampleTest.testSomething()</code>
+  * test as a <code>TimedTest</code> that fails immediately when
+  * the maximum elapsed time of 2 seconds is exceeded, use:
++ * </p>
+  * <blockquote>
+  * <pre>
+  * Test timedTest = new TimedTest(new ExampleTest("testSomething"), 2000, false);
+  * </pre>
+  * </blockquote>
+- * </p>
+  * 
+  * @author <b>Mike Clark</b>
+  * @author Clarkware Consulting, Inc.

junitperf.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Sep  8 08:56:04 UTC 2017 - fstrba@suse.com
+
+- Specify java source and target levels 1.6 in order to allow build
+  with jdk9
+- Added patch:
+  * junitperf-1.9.1-javadoc.patch
+    + Fix javadoc errors which are fatal with jdk9
+
 -------------------------------------------------------------------
 Mon Sep  9 11:06:07 UTC 2013 - tchvatal@suse.com
 

junitperf.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package junitperf
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@ License:        BSD-3-Clause
 Group:          Development/Libraries/Java
 Url:            http://www.clarkware.com/software/JUnitPerf.html
 Source0:        http://www.clarkware.com/software/junitperf-1.9.1.zip
+Patch0:         junitperf-1.9.1-javadoc.patch
 Requires:       junit >= 3.2
 BuildRequires:  ant
 BuildRequires:  ant-junit
@@ -68,6 +69,7 @@ JUnit tests.
 
 %prep
 %setup -q
+%patch0 -p1
 # remove all binary libs
 find . -name "*.jar" | xargs -t rm
 
@@ -75,8 +77,8 @@ find . -name "*.jar" | xargs -t rm
 export CLASSPATH=
 export OPT_JAR_LIST="junit ant/ant-junit"
 # performance tests sometimes failed on build farm, so lets disable them to avoid unpredictable build fails
-#ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dbuild.sysclasspath=first jar test javadoc
+#ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -Dbuild.sysclasspath=first jar test javadoc
-ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dbuild.sysclasspath=first jar javadoc
+ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -Dbuild.sysclasspath=first jar javadoc
 
 %install
 # jars