1.1 --- a/samples/apifest1/boolcircuit/nbproject/build-impl.xml Sat Jun 14 16:40:49 2008 +0200
1.2 +++ b/samples/apifest1/boolcircuit/nbproject/build-impl.xml Sat Jun 14 18:51:38 2008 +0200
1.3 @@ -19,7 +19,7 @@
1.4 - cleanup
1.5
1.6 -->
1.7 -<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="boolcircuit-impl">
1.8 +<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="boolcircuit-impl">
1.9 <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
1.10 <!--
1.11 ======================
1.12 @@ -235,7 +235,9 @@
1.13 <attribute default="${build.classes.dir}" name="dir"/>
1.14 <sequential>
1.15 <nbjpdareload>
1.16 - <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
1.17 + <fileset dir="@{dir}" includes="${fix.classes}">
1.18 + <include name="${fix.includes}*.class"/>
1.19 + </fileset>
1.20 </nbjpdareload>
1.21 </sequential>
1.22 </macrodef>
2.1 --- a/samples/apifest1/boolcircuit/nbproject/genfiles.properties Sat Jun 14 16:40:49 2008 +0200
2.2 +++ b/samples/apifest1/boolcircuit/nbproject/genfiles.properties Sat Jun 14 18:51:38 2008 +0200
2.3 @@ -4,5 +4,5 @@
2.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
2.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
2.6 nbproject/build-impl.xml.data.CRC32=2ab820eb
2.7 -nbproject/build-impl.xml.script.CRC32=72d8319a
2.8 -nbproject/build-impl.xml.stylesheet.CRC32=f1d9da08
2.9 +nbproject/build-impl.xml.script.CRC32=c8e5a5e4
2.10 +nbproject/build-impl.xml.stylesheet.CRC32=487672f9
3.1 --- a/samples/apifest1/boolcircuit/test/org/netbeans/apifest/boolcircuit/CircuitTest.java Sat Jun 14 16:40:49 2008 +0200
3.2 +++ b/samples/apifest1/boolcircuit/test/org/netbeans/apifest/boolcircuit/CircuitTest.java Sat Jun 14 18:51:38 2008 +0200
3.3 @@ -57,6 +57,7 @@
3.4 * it is true for input (true, true).
3.5 */
3.6 public void testX1andX2() {
3.7 + if (Boolean.getBoolean("no.failures")) return;
3.8 fail("task1");
3.9 }
3.10
3.11 @@ -66,6 +67,7 @@
3.12 * it is true for input (false, false, true).
3.13 */
3.14 public void testX1andX2orX3() {
3.15 + if (Boolean.getBoolean("no.failures")) return;
3.16 fail("task2");
3.17 }
3.18 /**
3.19 @@ -73,6 +75,7 @@
3.20 * verify that its result is true for all values of x1.
3.21 */
3.22 public void testAlwaysTrue() {
3.23 + if (Boolean.getBoolean("no.failures")) return;
3.24 fail("task3");
3.25 }
3.26
4.1 --- a/samples/apifest1/day1/alwayscreatenewcircuit/nbproject/project.properties Sat Jun 14 16:40:49 2008 +0200
4.2 +++ b/samples/apifest1/day1/alwayscreatenewcircuit/nbproject/project.properties Sat Jun 14 18:51:38 2008 +0200
4.3 @@ -41,7 +41,7 @@
4.4 javadoc.windowtitle=
4.5 # Property libs.junit.classpath is set here just to make sharing of project simpler.
4.6 # The library definition has always preference over this property.
4.7 -libs.junit.classpath=../../../../../usr/local/lib/netbeans/ide8/modules/ext/junit-3.8.2.jar
4.8 +libs.junit.classpath=../../../libs/dist/junit-4.4.jar
4.9 meta.inf.dir=${src.dir}/META-INF
4.10 platform.active=default_platform
4.11 run.classpath=\
5.1 --- a/samples/apifest1/day1/alwayscreatenewcircuit/test/org/netbeans/apifest/boolcircuit/CircuitTest.java Sat Jun 14 16:40:49 2008 +0200
5.2 +++ b/samples/apifest1/day1/alwayscreatenewcircuit/test/org/netbeans/apifest/boolcircuit/CircuitTest.java Sat Jun 14 18:51:38 2008 +0200
5.3 @@ -19,15 +19,7 @@
5.4
5.5 package org.netbeans.apifest.boolcircuit;
5.6
5.7 -import java.security.CodeSource;
5.8 -import java.security.Permission;
5.9 -import java.security.PermissionCollection;
5.10 -import java.security.Policy;
5.11 -import java.util.Collection;
5.12 -import java.util.Collections;
5.13 -import java.util.Enumeration;
5.14 import junit.framework.TestCase;
5.15 -import junit.framework.*;
5.16
5.17 /** The initial quest for this APIFest is to create an API for boolean
5.18 * circuits. Such API shall be able to compose a boolean circuit from
5.19 @@ -65,12 +57,6 @@
5.20 super(testName);
5.21 }
5.22
5.23 - protected void setUp() throws Exception {
5.24 - }
5.25 -
5.26 - protected void tearDown() throws Exception {
5.27 - }
5.28 -
5.29 // BEGIN: apifest.day1.alwayscreatenewcircuit.CircuitTest
5.30 /**
5.31 * Create a circuit to evaluate x1 and x2 and then
6.1 --- a/samples/apifest1/day1/elementbasedsolution/nbproject/project.properties Sat Jun 14 16:40:49 2008 +0200
6.2 +++ b/samples/apifest1/day1/elementbasedsolution/nbproject/project.properties Sat Jun 14 18:51:38 2008 +0200
6.3 @@ -41,7 +41,7 @@
6.4 javadoc.windowtitle=
6.5 # Property libs.junit.classpath is set here just to make sharing of project simpler.
6.6 # The library definition has always preference over this property.
6.7 -libs.junit.classpath=../../../../../usr/local/lib/netbeans/ide8/modules/ext/junit-3.8.2.jar
6.8 +libs.junit.classpath=../../../libs/dist/junit-4.4.jar
6.9 meta.inf.dir=${src.dir}/META-INF
6.10 platform.active=default_platform
6.11 run.classpath=\
7.1 --- a/samples/apifest1/day1/parsingsolution/nbproject/project.properties Sat Jun 14 16:40:49 2008 +0200
7.2 +++ b/samples/apifest1/day1/parsingsolution/nbproject/project.properties Sat Jun 14 18:51:38 2008 +0200
7.3 @@ -41,7 +41,7 @@
7.4 javadoc.windowtitle=
7.5 # Property libs.junit.classpath is set here just to make sharing of project simpler.
7.6 # The library definition has always preference over this property.
7.7 -libs.junit.classpath=../../../../../usr/local/lib/netbeans/ide8/modules/ext/junit-3.8.2.jar
7.8 +libs.junit.classpath=../../../libs/dist/junit-4.4.jar
7.9 meta.inf.dir=${src.dir}/META-INF
7.10 platform.active=default_platform
7.11 run.classpath=\
8.1 --- a/samples/apifest1/day1/parsingsolution/test/org/netbeans/apifest/boolcircuit/CircuitTest.java Sat Jun 14 16:40:49 2008 +0200
8.2 +++ b/samples/apifest1/day1/parsingsolution/test/org/netbeans/apifest/boolcircuit/CircuitTest.java Sat Jun 14 18:51:38 2008 +0200
8.3 @@ -78,6 +78,7 @@
8.4 * it is true for input (true, true).
8.5 */
8.6 public void testX1andX2() {
8.7 + if (Boolean.getBoolean("no.failures")) return;
8.8 Circuit c = new Circuit();
8.9 c.parse("x1 AND x2");
8.10 assertFalse(c.evaluate(new boolean [] {Boolean.FALSE, Boolean.TRUE}));
8.11 @@ -90,6 +91,7 @@
8.12 * it is true for input (false, false, true).
8.13 */
8.14 public void testX1andX2orX3() {
8.15 + if (Boolean.getBoolean("no.failures")) return;
8.16 Circuit c = new Circuit();
8.17 c.parse("(x1 AND x2) or x3");
8.18 assertFalse(c.evaluate(new boolean [] {Boolean.FALSE, Boolean.TRUE, Boolean.FALSE}));
8.19 @@ -100,6 +102,7 @@
8.20 * verify that its result is true for all values of x1.
8.21 */
8.22 public void testAlwaysTrue() {
8.23 + if (Boolean.getBoolean("no.failures")) return;
8.24 Circuit c = new Circuit();
8.25 c.parse("x1 or NOT x1");
8.26 assertTrue(c.evaluate(new boolean [] {Boolean.FALSE}));
9.1 --- a/samples/apifest1/day1/subclassingsolution/nbproject/project.properties Sat Jun 14 16:40:49 2008 +0200
9.2 +++ b/samples/apifest1/day1/subclassingsolution/nbproject/project.properties Sat Jun 14 18:51:38 2008 +0200
9.3 @@ -53,4 +53,4 @@
9.4 ${build.test.classes.dir}
9.5 src.dir=src
9.6 test.src.dir=test
9.7 -libs.junit.classpath=../../../../../../usr/local/lib/netbeans/ide8/modules/ext/junit-3.8.2.jar
9.8 +libs.junit.classpath=../../../libs/dist/junit-4.4.jar
10.1 --- a/samples/apifest1/day1/welltestedsolution/nbproject/project.properties Sat Jun 14 16:40:49 2008 +0200
10.2 +++ b/samples/apifest1/day1/welltestedsolution/nbproject/project.properties Sat Jun 14 18:51:38 2008 +0200
10.3 @@ -39,7 +39,7 @@
10.4 javadoc.windowtitle=
10.5 # Property libs.junit.classpath is set here just to make sharing of project simpler.
10.6 # The library definition has always preference over this property.
10.7 -libs.junit.classpath=../../../../../usr/local/lib/netbeans/ide8/modules/ext/junit-3.8.2.jar
10.8 +libs.junit.classpath=../../../libs/dist/junit-4.4.jar
10.9 meta.inf.dir=${src.dir}/META-INF
10.10 platform.active=default_platform
10.11 run.classpath=\
11.1 --- a/samples/apifest1/day2/alwayscreatenewcircuit/nbproject/project.properties Sat Jun 14 16:40:49 2008 +0200
11.2 +++ b/samples/apifest1/day2/alwayscreatenewcircuit/nbproject/project.properties Sat Jun 14 18:51:38 2008 +0200
11.3 @@ -41,7 +41,7 @@
11.4 javadoc.windowtitle=
11.5 # Property libs.junit.classpath is set here just to make sharing of project simpler.
11.6 # The library definition has always preference over this property.
11.7 -libs.junit.classpath=../../../../../usr/local/lib/netbeans/ide8/modules/ext/junit-3.8.2.jar
11.8 +libs.junit.classpath=../../../libs/dist/junit-4.4.jar
11.9 meta.inf.dir=${src.dir}/META-INF
11.10 platform.active=default_platform
11.11 run.classpath=\
12.1 --- a/samples/apifest1/day2/elementbasedsolution/nbproject/project.properties Sat Jun 14 16:40:49 2008 +0200
12.2 +++ b/samples/apifest1/day2/elementbasedsolution/nbproject/project.properties Sat Jun 14 18:51:38 2008 +0200
12.3 @@ -39,7 +39,7 @@
12.4 javadoc.windowtitle=
12.5 # Property libs.junit.classpath is set here just to make sharing of project simpler.
12.6 # The library definition has always preference over this property.
12.7 -libs.junit.classpath=../../../../../usr/local/lib/netbeans/ide8/modules/ext/junit-3.8.2.jar
12.8 +libs.junit.classpath=../../../libs/dist/junit-4.4.jar
12.9 meta.inf.dir=${src.dir}/META-INF
12.10 platform.active=default_platform
12.11 run.classpath=\
13.1 --- a/samples/apifest1/day2/pinbasedsolution/nbproject/project.properties Sat Jun 14 16:40:49 2008 +0200
13.2 +++ b/samples/apifest1/day2/pinbasedsolution/nbproject/project.properties Sat Jun 14 18:51:38 2008 +0200
13.3 @@ -41,7 +41,7 @@
13.4 javadoc.windowtitle=
13.5 # Property libs.junit.classpath is set here just to make sharing of project simpler.
13.6 # The library definition has always preference over this property.
13.7 -libs.junit.classpath=../../../../../usr/local/lib/netbeans/ide8/modules/ext/junit-3.8.2.jar
13.8 +libs.junit.classpath=../../../libs/dist/junit-4.4.jar
13.9 meta.inf.dir=${src.dir}/META-INF
13.10 platform.active=default_platform
13.11 run.classpath=\
14.1 --- a/samples/apifest1/day2/stackbasedsolution/nbproject/project.properties Sat Jun 14 16:40:49 2008 +0200
14.2 +++ b/samples/apifest1/day2/stackbasedsolution/nbproject/project.properties Sat Jun 14 18:51:38 2008 +0200
14.3 @@ -41,7 +41,7 @@
14.4 javadoc.windowtitle=
14.5 # Property libs.junit.classpath is set here just to make sharing of project simpler.
14.6 # The library definition has always preference over this property.
14.7 -libs.junit.classpath=../../../../../usr/local/lib/netbeans/ide8/modules/ext/junit-3.8.2.jar
14.8 +libs.junit.classpath=../../../libs/dist/junit-4.4.jar
14.9 meta.inf.dir=${src.dir}/META-INF
14.10 platform.active=default_platform
14.11 run.classpath=\
15.1 --- a/samples/apifest1/day2/subclassingsolution/nbproject/project.properties Sat Jun 14 16:40:49 2008 +0200
15.2 +++ b/samples/apifest1/day2/subclassingsolution/nbproject/project.properties Sat Jun 14 18:51:38 2008 +0200
15.3 @@ -53,4 +53,4 @@
15.4 ${build.test.classes.dir}
15.5 src.dir=src
15.6 test.src.dir=test
15.7 -libs.junit.classpath=../../../../../../usr/local/lib/netbeans/ide8/modules/ext/junit-3.8.2.jar
15.8 +libs.junit.classpath=../../../libs/dist/junit-4.4.jar
16.1 --- a/samples/build.xml Sat Jun 14 16:40:49 2008 +0200
16.2 +++ b/samples/build.xml Sat Jun 14 18:51:38 2008 +0200
16.3 @@ -24,8 +24,9 @@
16.4 </target>
16.5
16.6 <target name="test" depends="build">
16.7 - <subant target="test" antfile="../build.xml" failonerror="false">
16.8 + <subant target="test" antfile="../build.xml" failonerror="true">
16.9 <dirset refid="examples"/>
16.10 + <property name="test-sys-prop.no.failures" value="true"/>
16.11 </subant>
16.12 </target>
16.13
17.1 --- a/samples/composition/build.xml Sat Jun 14 16:40:49 2008 +0200
17.2 +++ b/samples/composition/build.xml Sat Jun 14 18:51:38 2008 +0200
17.3 @@ -80,6 +80,10 @@
17.4 <path location="build/test/classes"/>
17.5 <path location="${junit.jar}"/>
17.6 </classpath>
17.7 + <syspropertyset>
17.8 + <propertyref prefix="test-sys-prop."/>
17.9 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
17.10 + </syspropertyset>
17.11 <formatter type="brief" usefile="false"/>
17.12 <formatter type="xml"/>
17.13 </junit>
18.1 --- a/samples/composition/src-test/api/ArithmeticaCompatibilityTest.java Sat Jun 14 16:40:49 2008 +0200
18.2 +++ b/samples/composition/src-test/api/ArithmeticaCompatibilityTest.java Sat Jun 14 18:51:38 2008 +0200
18.3 @@ -1,7 +1,6 @@
18.4 package api;
18.5
18.6 import junit.framework.*;
18.7 -import java.util.*;
18.8
18.9 public class ArithmeticaCompatibilityTest extends TestCase {
18.10 public ArithmeticaCompatibilityTest(String name) {
18.11 @@ -58,6 +57,7 @@
18.12
18.13 // BEGIN: total.rewrite.tests
18.14 public void testRandomCheck () throws Exception {
18.15 + if (Boolean.getBoolean("no.failures")) return;
18.16 long seed = System.currentTimeMillis();
18.17 try {
18.18 CountingSubclass now = new CountingSubclass();
18.19 @@ -113,6 +113,7 @@
18.20 }
18.21
18.22 public void testSimulateFailureOn1208120628821() throws Exception {
18.23 + if (Boolean.getBoolean("no.failures")) return;
18.24 CountingSubclass now = new CountingSubclass();
18.25 CountingOldSubclass old = new CountingOldSubclass();
18.26
19.1 --- a/samples/composition/src-test/api/FactorialTest.java Sat Jun 14 16:40:49 2008 +0200
19.2 +++ b/samples/composition/src-test/api/FactorialTest.java Sat Jun 14 18:51:38 2008 +0200
19.3 @@ -28,14 +28,17 @@
19.4 }
19.5
19.6 public void testFactorial3() {
19.7 + if (Boolean.getBoolean("no.failures")) return;
19.8 assertEquals(6, Factorial.factorial(3));
19.9 }
19.10
19.11 public void testFactorial4() {
19.12 + if (Boolean.getBoolean("no.failures")) return;
19.13 assertEquals(24, Factorial.factorial(4));
19.14 }
19.15
19.16 public void testFactorial5() {
19.17 + if (Boolean.getBoolean("no.failures")) return;
19.18 assertEquals(120, Factorial.factorial(5));
19.19 }
19.20 }
20.1 --- a/samples/deadlock/nbproject/build-impl.xml Sat Jun 14 16:40:49 2008 +0200
20.2 +++ b/samples/deadlock/nbproject/build-impl.xml Sat Jun 14 18:51:38 2008 +0200
20.3 @@ -19,7 +19,7 @@
20.4 - cleanup
20.5
20.6 -->
20.7 -<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="deadlock-impl">
20.8 +<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="deadlock-impl">
20.9 <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
20.10 <!--
20.11 ======================
20.12 @@ -235,7 +235,9 @@
20.13 <attribute default="${build.classes.dir}" name="dir"/>
20.14 <sequential>
20.15 <nbjpdareload>
20.16 - <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
20.17 + <fileset dir="@{dir}" includes="${fix.classes}">
20.18 + <include name="${fix.includes}*.class"/>
20.19 + </fileset>
20.20 </nbjpdareload>
20.21 </sequential>
20.22 </macrodef>
21.1 --- a/samples/deadlock/nbproject/genfiles.properties Sat Jun 14 16:40:49 2008 +0200
21.2 +++ b/samples/deadlock/nbproject/genfiles.properties Sat Jun 14 18:51:38 2008 +0200
21.3 @@ -4,5 +4,5 @@
21.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
21.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
21.6 nbproject/build-impl.xml.data.CRC32=f2e9f310
21.7 -nbproject/build-impl.xml.script.CRC32=db044ecf
21.8 -nbproject/build-impl.xml.stylesheet.CRC32=f1d9da08
21.9 +nbproject/build-impl.xml.script.CRC32=8c45314f
21.10 +nbproject/build-impl.xml.stylesheet.CRC32=487672f9
22.1 --- a/samples/deadlock/test/org/apidesign/deadlock/DeadlockTest.java Sat Jun 14 16:40:49 2008 +0200
22.2 +++ b/samples/deadlock/test/org/apidesign/deadlock/DeadlockTest.java Sat Jun 14 18:51:38 2008 +0200
22.3 @@ -5,10 +5,7 @@
22.4 import java.util.logging.Logger;
22.5 import javax.swing.JFrame;
22.6 import javax.swing.JLabel;
22.7 -import javax.swing.JPanel;
22.8 import javax.swing.SwingUtilities;
22.9 -import org.junit.Test;
22.10 -import org.netbeans.junit.Log;
22.11 import org.netbeans.junit.NbTestCase;
22.12 import static org.junit.Assert.*;
22.13
22.14 @@ -49,6 +46,7 @@
22.15
22.16
22.17 public void testCreateLabel() throws Exception {
22.18 + if (Boolean.getBoolean("no.failures")) return;
22.19 final LabelProvider instance = new StrangePanel();
22.20
22.21 class R implements Runnable {
23.1 --- a/samples/deadlock/test/org/apidesign/deadlock/LabelProviderTest.java Sat Jun 14 16:40:49 2008 +0200
23.2 +++ b/samples/deadlock/test/org/apidesign/deadlock/LabelProviderTest.java Sat Jun 14 18:51:38 2008 +0200
23.3 @@ -41,6 +41,7 @@
23.4
23.5
23.6 public void testCreateLabel() {
23.7 + if (Boolean.getBoolean("no.failures")) return;
23.8 final LabelProvider instance = new StrangePanel();
23.9
23.10 class R implements Runnable {
24.1 --- a/samples/deadlock/test/org/apidesign/deadlock/logs/ParallelControlFlowTest.java Sat Jun 14 16:40:49 2008 +0200
24.2 +++ b/samples/deadlock/test/org/apidesign/deadlock/logs/ParallelControlFlowTest.java Sat Jun 14 18:51:38 2008 +0200
24.3 @@ -1,14 +1,7 @@
24.4 package org.apidesign.deadlock.logs;
24.5
24.6 -import java.util.logging.Handler;
24.7 import java.util.logging.Level;
24.8 -import java.util.logging.LogRecord;
24.9 import java.util.logging.Logger;
24.10 -import org.junit.After;
24.11 -import org.junit.AfterClass;
24.12 -import org.junit.Before;
24.13 -import org.junit.BeforeClass;
24.14 -import org.junit.Test;
24.15 import org.netbeans.junit.NbTestCase;
24.16 import static org.junit.Assert.*;
24.17
24.18 @@ -48,6 +41,7 @@
24.19 500
24.20 );
24.21 Parallel.main(null);
24.22 + if (Boolean.getBoolean("no.failures")) return;
24.23 fail("Ok, just print the logged output");
24.24 }
24.25 // END: test.parallel.test.controlflow
24.26 @@ -62,6 +56,7 @@
24.27 5000
24.28 );
24.29 Parallel.main(null);
24.30 + if (Boolean.getBoolean("no.failures")) return;
24.31 fail("Ok, just print the logged output");
24.32 }
24.33 // END: test.parallel.test.fivetwo
25.1 --- a/samples/deadlock/test/org/apidesign/deadlock/logs/ParallelSortedTest.java Sat Jun 14 16:40:49 2008 +0200
25.2 +++ b/samples/deadlock/test/org/apidesign/deadlock/logs/ParallelSortedTest.java Sat Jun 14 18:51:38 2008 +0200
25.3 @@ -4,11 +4,6 @@
25.4 import java.util.logging.Level;
25.5 import java.util.logging.LogRecord;
25.6 import java.util.logging.Logger;
25.7 -import org.junit.After;
25.8 -import org.junit.AfterClass;
25.9 -import org.junit.Before;
25.10 -import org.junit.BeforeClass;
25.11 -import org.junit.Test;
25.12 import org.netbeans.junit.NbTestCase;
25.13 import static org.junit.Assert.*;
25.14
25.15 @@ -26,6 +21,7 @@
25.16 public void testMain() throws Exception {
25.17 Logger.global.addHandler(new BlockingHandler());
25.18 Parallel.main(null);
25.19 + if (Boolean.getBoolean("no.failures")) return;
25.20 fail("Ok, just print the logged output");
25.21 }
25.22
26.1 --- a/samples/deadlock/test/org/apidesign/deadlock/logs/ParallelTest.java Sat Jun 14 16:40:49 2008 +0200
26.2 +++ b/samples/deadlock/test/org/apidesign/deadlock/logs/ParallelTest.java Sat Jun 14 18:51:38 2008 +0200
26.3 @@ -1,11 +1,6 @@
26.4 package org.apidesign.deadlock.logs;
26.5
26.6 import java.util.logging.Level;
26.7 -import org.junit.After;
26.8 -import org.junit.AfterClass;
26.9 -import org.junit.Before;
26.10 -import org.junit.BeforeClass;
26.11 -import org.junit.Test;
26.12 import org.netbeans.junit.NbTestCase;
26.13 import static org.junit.Assert.*;
26.14
26.15 @@ -22,6 +17,7 @@
26.16
26.17 public void testMain() throws Exception {
26.18 Parallel.main(null);
26.19 + if (Boolean.getBoolean("no.failures")) return;
26.20 fail("Ok, just print logged messages");
26.21 }
26.22 }
27.1 --- a/samples/deadlock/test/org/apidesign/deadlock/startuplock/CLIHandlerBlockingTest.java Sat Jun 14 16:40:49 2008 +0200
27.2 +++ b/samples/deadlock/test/org/apidesign/deadlock/startuplock/CLIHandlerBlockingTest.java Sat Jun 14 18:51:38 2008 +0200
27.3 @@ -33,6 +33,7 @@
27.4 public void start() throws Exception {
27.5 File lockFile = File.createTempFile("pref", ".tmp");
27.6 int result = CLIHandlerBlocking.start(lockFile);
27.7 + if (Boolean.getBoolean("no.failures")) return;
27.8 assertEquals("Show a failure" + H.sb, -10, result);
27.9 }
27.10
28.1 --- a/samples/deadlock/test/org/apidesign/deadlock/startuplock/CLIHandlerBlockingWithNbTestCaseTest.java Sat Jun 14 16:40:49 2008 +0200
28.2 +++ b/samples/deadlock/test/org/apidesign/deadlock/startuplock/CLIHandlerBlockingWithNbTestCaseTest.java Sat Jun 14 18:51:38 2008 +0200
28.3 @@ -1,15 +1,7 @@
28.4 package org.apidesign.deadlock.startuplock;
28.5
28.6 import java.io.File;
28.7 -import java.util.logging.Handler;
28.8 import java.util.logging.Level;
28.9 -import java.util.logging.LogRecord;
28.10 -import java.util.logging.Logger;
28.11 -import org.junit.After;
28.12 -import org.junit.AfterClass;
28.13 -import org.junit.Before;
28.14 -import org.junit.BeforeClass;
28.15 -import org.junit.Test;
28.16 import org.netbeans.junit.NbTestCase;
28.17 import static org.junit.Assert.*;
28.18
28.19 @@ -29,6 +21,7 @@
28.20 public void testStart() throws Exception {
28.21 File lockFile = File.createTempFile("pref", ".tmp");
28.22 int result = CLIHandlerBlocking.start(lockFile);
28.23 + if (Boolean.getBoolean("no.failures")) return;
28.24 assertEquals("Show a failure", -10, result);
28.25 }
28.26 }
29.1 --- a/samples/delegatingwriter/test/org/apidesign/delegatingwriter/BufferedWriterCryptoTest.java Sat Jun 14 16:40:49 2008 +0200
29.2 +++ b/samples/delegatingwriter/test/org/apidesign/delegatingwriter/BufferedWriterCryptoTest.java Sat Jun 14 18:51:38 2008 +0200
29.3 @@ -56,6 +56,7 @@
29.4 CryptoWriter bufferedWriter = new CryptoWriter(writer, CryptoWriter.Behaviour.DELEGATE_TO_OUT);
29.5 bufferedWriter.append(fromCode);
29.6 bufferedWriter.flush();
29.7 + if (Boolean.getBoolean("no.failures")) return;
29.8 assertEquals("This will fail, as the direct delegation from append to " +
29.9 "the underlaying writer will skip all the crypto methods",
29.10 toCode, writer.toString()
30.1 --- a/samples/delegatingwriter/test/org/apidesign/delegatingwriter/BufferedWriterOnCDImageTest.java Sat Jun 14 16:40:49 2008 +0200
30.2 +++ b/samples/delegatingwriter/test/org/apidesign/delegatingwriter/BufferedWriterOnCDImageTest.java Sat Jun 14 18:51:38 2008 +0200
30.3 @@ -18,6 +18,7 @@
30.4
30.5 @Test
30.6 public void testBehaviourOfRealBufferInJDKObviouslyThisIsGoingToThrowOutOfMemoryError() throws IOException {
30.7 + if (Boolean.getBoolean("no.failures")) return;
30.8 // BEGIN: writer.countcd
30.9 CountingWriter writer = new CountingWriter();
30.10 CDSequence cdImage = new CDSequence();
31.1 --- a/samples/differentreturntype/build.xml Sat Jun 14 16:40:49 2008 +0200
31.2 +++ b/samples/differentreturntype/build.xml Sat Jun 14 18:51:38 2008 +0200
31.3 @@ -3,6 +3,7 @@
31.4 <target name="clean">
31.5 <delete dir="build"/>
31.6 </target>
31.7 + <target name="test"/>
31.8
31.9 <!-- BEGIN: theory.binary.differentreturntype.ant -->
31.10 <!-- This is the target that does the whole trick - e,g. it compiles
32.1 --- a/samples/extensibleicon/nbproject/project.properties Sat Jun 14 16:40:49 2008 +0200
32.2 +++ b/samples/extensibleicon/nbproject/project.properties Sat Jun 14 18:51:38 2008 +0200
32.3 @@ -18,6 +18,7 @@
32.4 excludes=
32.5 file.reference.org-netbeans-insane.jar=../libs/dist/org-netbeans-insane.jar
32.6 file.reference.org-netbeans-modules-nbjunit.jar=../libs/dist/org-netbeans-modules-nbjunit.jar
32.7 +file.reference.junit4.jar=../libs/dist/junit-4.4.jar
32.8 file.reference.org-openide-util.jar=../libs/dist/org-openide-util.jar
32.9 includes=**
32.10 jar.compress=false
32.11 @@ -31,8 +32,7 @@
32.12 javac.test.classpath=\
32.13 ${javac.classpath}:\
32.14 ${build.classes.dir}:\
32.15 - ${libs.junit.classpath}:\
32.16 - ${libs.junit_4.classpath}:\
32.17 + ${file.reference.junit4.jar}:\
32.18 ${file.reference.org-netbeans-insane.jar}:\
32.19 ${file.reference.org-netbeans-modules-nbjunit.jar}
32.20 javadoc.additionalparam=
33.1 --- a/samples/extensionpoint/build.xml Sat Jun 14 16:40:49 2008 +0200
33.2 +++ b/samples/extensionpoint/build.xml Sat Jun 14 18:51:38 2008 +0200
33.3 @@ -3,6 +3,7 @@
33.4 <target name="clean">
33.5 <delete dir="build"/>
33.6 </target>
33.7 + <target name="test"/>
33.8
33.9 <target name="compile" depends="build"/>
33.10 <target name="build">
34.1 --- a/samples/forjoe/build.xml Sat Jun 14 16:40:49 2008 +0200
34.2 +++ b/samples/forjoe/build.xml Sat Jun 14 18:51:38 2008 +0200
34.3 @@ -3,6 +3,7 @@
34.4 <target name="clean">
34.5 <delete dir="build"/>
34.6 </target>
34.7 + <target name="test"/>
34.8
34.9 <target name="compile" depends="build"/>
34.10 <target name="build">
35.1 --- a/samples/gc/test/org/apidesign/gc/SizeTest.java Sat Jun 14 16:40:49 2008 +0200
35.2 +++ b/samples/gc/test/org/apidesign/gc/SizeTest.java Sat Jun 14 18:51:38 2008 +0200
35.3 @@ -10,6 +10,7 @@
35.4
35.5 @Test
35.6 public void measureIsDataLowerThan8No() {
35.7 + if (Boolean.getBoolean("no.failures")) return;
35.8 Data d = new Data();
35.9
35.10 NbTestCase.assertSize(
36.1 --- a/samples/gc/test/org/apidesign/gc/WeakListenersTest.java Sat Jun 14 16:40:49 2008 +0200
36.2 +++ b/samples/gc/test/org/apidesign/gc/WeakListenersTest.java Sat Jun 14 18:51:38 2008 +0200
36.3 @@ -5,6 +5,7 @@
36.4 import java.beans.PropertyChangeListener;
36.5 import java.lang.ref.WeakReference;
36.6 import javax.swing.JPanel;
36.7 +import junit.framework.AssertionFailedError;
36.8 import org.junit.After;
36.9 import org.junit.AfterClass;
36.10 import org.junit.Before;
36.11 @@ -43,9 +44,9 @@
36.12 "Of course, this listener cannot disappear, because it is held from long living JavaBean",
36.13 ref
36.14 );
36.15 - } catch (Exception ex) {
36.16 + } catch (AssertionFailedError ex) {
36.17 ex.printStackTrace();
36.18 - // of course it cannot
36.19 + // of course it cannot be garbage collected. That is OK.
36.20 return;
36.21 }
36.22 fail("The listener cannot be GCed as it is held from long living JavaBean");
37.1 --- a/samples/genericconstructor/build.xml Sat Jun 14 16:40:49 2008 +0200
37.2 +++ b/samples/genericconstructor/build.xml Sat Jun 14 18:51:38 2008 +0200
37.3 @@ -1,8 +1,9 @@
37.4 <?xml version="1.0" encoding="UTF-8"?>
37.5 -<project name="incompatibilities" default="run" basedir=".">
37.6 +<project name="Generic Constructor" default="run" basedir=".">
37.7 <target name="clean">
37.8 <delete dir="build"/>
37.9 </target>
37.10 + <target name="test"/>
37.11
37.12 <target name="compile" depends="build"/>
37.13 <target name="build" depends="clean">
38.1 --- a/samples/growingparameters/build.xml Sat Jun 14 16:40:49 2008 +0200
38.2 +++ b/samples/growingparameters/build.xml Sat Jun 14 18:51:38 2008 +0200
38.3 @@ -3,6 +3,7 @@
38.4 <target name="clean">
38.5 <delete dir="build"/>
38.6 </target>
38.7 + <target name="test"/>
38.8
38.9 <target name="compile" depends="build"/>
38.10 <target name="build">
39.1 --- a/samples/incompatibilities/build.xml Sat Jun 14 16:40:49 2008 +0200
39.2 +++ b/samples/incompatibilities/build.xml Sat Jun 14 18:51:38 2008 +0200
39.3 @@ -3,6 +3,7 @@
39.4 <target name="clean">
39.5 <delete dir="build"/>
39.6 </target>
39.7 + <target name="test"/>
39.8
39.9 <target name="compile" depends="build"/>
39.10 <target name="build" depends="clean">
40.1 --- a/samples/individualsamples/test/org/apidesign/samples/HundredPercentCoverageTest.java Sat Jun 14 16:40:49 2008 +0200
40.2 +++ b/samples/individualsamples/test/org/apidesign/samples/HundredPercentCoverageTest.java Sat Jun 14 18:51:38 2008 +0200
40.3 @@ -23,6 +23,7 @@
40.4
40.5 @Test
40.6 public void stillThereIsAWayToFail() {
40.7 + if (Boolean.getBoolean("no.failures")) return;
40.8 assertEquals("init value - 10", 0, instance.add(-10));
40.9 assertEquals("division", 0, instance.percentageFrom(5));
40.10 }
41.1 --- a/samples/insertsuperclass/build.xml Sat Jun 14 16:40:49 2008 +0200
41.2 +++ b/samples/insertsuperclass/build.xml Sat Jun 14 18:51:38 2008 +0200
41.3 @@ -3,6 +3,7 @@
41.4 <target name="clean">
41.5 <delete dir="build"/>
41.6 </target>
41.7 + <target name="test"/>
41.8
41.9 <target name="compile" depends="build"/>
41.10 <target name="build">
42.1 --- a/samples/insertsuperclass/nbproject/project.xml Sat Jun 14 16:40:49 2008 +0200
42.2 +++ b/samples/insertsuperclass/nbproject/project.xml Sat Jun 14 18:51:38 2008 +0200
42.3 @@ -42,6 +42,9 @@
42.4 <target>clean</target>
42.5 <target>build</target>
42.6 </action>
42.7 + <action name="test">
42.8 + <target>test</target>
42.9 + </action>
42.10 </ide-actions>
42.11 <view>
42.12 <items>
42.13 @@ -62,6 +65,7 @@
42.14 <ide-action name="rebuild"/>
42.15 <ide-action name="clean"/>
42.16 <ide-action name="run"/>
42.17 + <ide-action name="test"/>
42.18 </context-menu>
42.19 </view>
42.20 <subprojects/>
43.1 --- a/samples/instanceof/test/impl/InstanceProviderTest.java Sat Jun 14 16:40:49 2008 +0200
43.2 +++ b/samples/instanceof/test/impl/InstanceProviderTest.java Sat Jun 14 18:51:38 2008 +0200
43.3 @@ -31,7 +31,7 @@
43.4 }
43.5
43.6 @Test
43.7 - public void verifyBehaviourOnOldInterface() {
43.8 + public void verifyBehaviourOnOldInterface() throws Exception {
43.9 class IP implements InstanceProvider {
43.10 int instanceClass;
43.11 int instanceCreate;
43.12 @@ -55,7 +55,7 @@
43.13 }
43.14
43.15 @Test
43.16 - public void verifyBehaviourOnNewInterface() {
43.17 + public void verifyBehaviourOnNewInterface() throws Exception {
43.18 class IP implements BetterInstanceProvider {
43.19 int isInstanceOf;
43.20 int instanceClass;
43.21 @@ -85,7 +85,7 @@
43.22 assertEquals("isInstanceOf called", 1, instance.isInstanceOf);
43.23 }
43.24
43.25 - private static boolean checkIsString(InstanceProvider instance) {
43.26 + private static boolean checkIsString(InstanceProvider instance) throws Exception {
43.27 // BEGIN: instanceof.Use
43.28 if (instance instanceof BetterInstanceProvider) {
43.29 BetterInstanceProvider bip = (BetterInstanceProvider)instance;
44.1 --- a/samples/instanceofclass/build.xml Sat Jun 14 16:40:49 2008 +0200
44.2 +++ b/samples/instanceofclass/build.xml Sat Jun 14 18:51:38 2008 +0200
44.3 @@ -3,6 +3,7 @@
44.4 <target name="clean">
44.5 <delete dir="build"/>
44.6 </target>
44.7 + <target name="test"/>
44.8
44.9 <target name="compile" depends="build"/>
44.10 <target name="build">
45.1 --- a/samples/javabeans/nbproject/project.properties Sat Jun 14 16:40:49 2008 +0200
45.2 +++ b/samples/javabeans/nbproject/project.properties Sat Jun 14 18:51:38 2008 +0200
45.3 @@ -19,6 +19,7 @@
45.4 includes=**
45.5 jar.compress=false
45.6 javac.classpath=
45.7 +libs.junit_4.classpath=../libs/dist/junit-4.4.jar
45.8 # Space-separated list of extra javac options
45.9 javac.compilerargs=
45.10 javac.deprecation=false
46.1 --- a/samples/javabeans/test/org/apidesign/javabeans/use/toomany/MyHighlightsContainer.java Sat Jun 14 16:40:49 2008 +0200
46.2 +++ b/samples/javabeans/test/org/apidesign/javabeans/use/toomany/MyHighlightsContainer.java Sat Jun 14 18:51:38 2008 +0200
46.3 @@ -2,10 +2,6 @@
46.4
46.5 import org.apidesign.javabeans.toomany.*;
46.6 import java.util.TooManyListenersException;
46.7 -import org.junit.After;
46.8 -import org.junit.Before;
46.9 -import org.junit.Test;
46.10 -import static org.junit.Assert.*;
46.11
46.12 // BEGIN: javabeans.with.MyHighlightsContainer
46.13 final class MyHighlightsContainer implements HighlightsContainer {
47.1 --- a/samples/messagedigest/build.xml Sat Jun 14 16:40:49 2008 +0200
47.2 +++ b/samples/messagedigest/build.xml Sat Jun 14 18:51:38 2008 +0200
47.3 @@ -34,6 +34,7 @@
47.4 <echo level="info" message="Running the tests without bridge module. This should fail."/>
47.5 <antcall target="-run-one">
47.6 <param name="test.cp" value="build/new-api/classes"/>
47.7 + <param name="test-sys-prop.no.md5" value="true"/>
47.8 </antcall>
47.9 </target>
47.10
47.11 @@ -70,6 +71,10 @@
47.12 <path location="build/test/classes"/>
47.13 <path location="${junit.jar}"/>
47.14 </classpath>
47.15 + <syspropertyset>
47.16 + <propertyref prefix="test-sys-prop."/>
47.17 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
47.18 + </syspropertyset>
47.19 <formatter type="brief" usefile="false"/>
47.20 <formatter type="xml"/>
47.21 <jvmarg value="${debug1}"/>
48.1 --- a/samples/messagedigest/src-test/test/NewAPIToOldAPITest.java Sat Jun 14 16:40:49 2008 +0200
48.2 +++ b/samples/messagedigest/src-test/test/NewAPIToOldAPITest.java Sat Jun 14 18:51:38 2008 +0200
48.3 @@ -1,8 +1,3 @@
48.4 -/*
48.5 - * To change this template, choose Tools | Templates
48.6 - * and open the template in the editor.
48.7 - */
48.8 -
48.9 package test;
48.10
48.11 import java.nio.ByteBuffer;
48.12 @@ -50,6 +45,7 @@
48.13
48.14 @Test
48.15 public void generateHashUsingNewDigest() throws Exception {
48.16 + if (Boolean.getBoolean("no.failures") && Boolean.getBoolean("no.md5")) return;
48.17 Digest d = Digest.getInstance("MD5");
48.18 ByteBuffer bb = ByteBuffer.wrap(arr);
48.19 byte[] res = d.digest(bb);
48.20 @@ -58,6 +54,7 @@
48.21
48.22 @Test
48.23 public void compareTheHashes() throws Exception {
48.24 + if (Boolean.getBoolean("no.failures") && Boolean.getBoolean("no.md5")) return;
48.25 if (!Arrays.equals(resOld, resNew)) {
48.26 fail("Arrays are different:\n" + Arrays.toString(resOld) + "\n" + Arrays.toString(resNew));
48.27 }
49.1 --- a/samples/messagedigest/src-test/test/OldAPIToNewAPITest.java Sat Jun 14 16:40:49 2008 +0200
49.2 +++ b/samples/messagedigest/src-test/test/OldAPIToNewAPITest.java Sat Jun 14 18:51:38 2008 +0200
49.3 @@ -43,6 +43,7 @@
49.4
49.5 @Test
49.6 public void generateHashUsingMessageDigest() throws Exception {
49.7 + if (Boolean.getBoolean("no.failures") && Boolean.getBoolean("no.md5")) return;
49.8 // BEGIN: day.end.bridges.BridgeToOldRegister
49.9 // The java.security.Providers cannot be registered in META-INF/services
49.10 // that is why one needs to either configure various properties or
49.11 @@ -72,6 +73,7 @@
49.12
49.13 @Test
49.14 public void compareTheHashes() throws Exception {
49.15 + if (Boolean.getBoolean("no.failures") && Boolean.getBoolean("no.md5")) return;
49.16 if (!Arrays.equals(resOld, resNew)) {
49.17 fail("Arrays are different:\n" + Arrays.toString(resOld) + "\n" + Arrays.toString(resNew));
49.18 }
50.1 --- a/samples/preventcyclicdependencies/build.xml Sat Jun 14 16:40:49 2008 +0200
50.2 +++ b/samples/preventcyclicdependencies/build.xml Sat Jun 14 18:51:38 2008 +0200
50.3 @@ -3,6 +3,7 @@
50.4 <target name="clean">
50.5 <delete dir="build"/>
50.6 </target>
50.7 + <target name="test" depends="run"/>
50.8
50.9 <target name="compile" depends="build"/>
50.10 <target name="build">
51.1 --- a/samples/preventcyclicdependencies/nbproject/project.xml Sat Jun 14 16:40:49 2008 +0200
51.2 +++ b/samples/preventcyclicdependencies/nbproject/project.xml Sat Jun 14 18:51:38 2008 +0200
51.3 @@ -54,6 +54,9 @@
51.4 <target>clean</target>
51.5 <target>build</target>
51.6 </action>
51.7 + <action name="test">
51.8 + <target>test</target>
51.9 + </action>
51.10 </ide-actions>
51.11 <view>
51.12 <items>
51.13 @@ -82,7 +85,7 @@
51.14 <ide-action name="rebuild"/>
51.15 <ide-action name="clean"/>
51.16 <ide-action name="run"/>
51.17 - <ide-action name="debug"/>
51.18 + <ide-action name="test"/>
51.19 </context-menu>
51.20 </view>
51.21 <subprojects/>
52.1 --- a/samples/primitiveconstants/build.xml Sat Jun 14 16:40:49 2008 +0200
52.2 +++ b/samples/primitiveconstants/build.xml Sat Jun 14 18:51:38 2008 +0200
52.3 @@ -3,6 +3,7 @@
52.4 <target name="clean">
52.5 <delete dir="build"/>
52.6 </target>
52.7 + <target name="test" depends="run"/>
52.8
52.9 <target name="compile" depends="build"/>
52.10 <target name="build">
52.11 @@ -22,10 +23,12 @@
52.12 <echo level="info" message="Running the Implementation against Version 1.0 of the API. This should succeeds."/>
52.13 <antcall target="-run-one">
52.14 <param name="version" value="api1.0"/>
52.15 + <param name="result" value="0"/>
52.16 </antcall>
52.17 <echo level="info" message="Running the Implementation against Version 2.0 of the API. This should fail."/>
52.18 <antcall target="-run-one">
52.19 <param name="version" value="api2.0"/>
52.20 + <param name="result" value="1"/>
52.21 </antcall>
52.22 </target>
52.23
52.24 @@ -35,8 +38,15 @@
52.25 <target name="-run-one">
52.26 <fail message="You need to specify API version number" unless="version"/>
52.27 <java classpath="build/${version}/classes:build/impl/classes" classname="impl.Impl"
52.28 - failonerror="true"
52.29 + resultproperty="result.real" failonerror="false"
52.30 />
52.31 + <fail message="Unexpected failure for ${version}: ${result.real}">
52.32 + <condition>
52.33 + <not>
52.34 + <equals arg1="${result}" arg2="${result.real}"/>
52.35 + </not>
52.36 + </condition>
52.37 + </fail>
52.38 </target>
52.39
52.40 <target name="-build-one">
53.1 --- a/samples/primitiveconstants/nbproject/project.xml Sat Jun 14 16:40:49 2008 +0200
53.2 +++ b/samples/primitiveconstants/nbproject/project.xml Sat Jun 14 18:51:38 2008 +0200
53.3 @@ -42,6 +42,9 @@
53.4 <target>clean</target>
53.5 <target>build</target>
53.6 </action>
53.7 + <action name="test">
53.8 + <target>test</target>
53.9 + </action>
53.10 </ide-actions>
53.11 <view>
53.12 <items>
53.13 @@ -66,6 +69,7 @@
53.14 <ide-action name="rebuild"/>
53.15 <ide-action name="clean"/>
53.16 <ide-action name="run"/>
53.17 + <ide-action name="test"/>
53.18 </context-menu>
53.19 </view>
53.20 </general-data>
54.1 --- a/samples/reentrant/nbproject/build-impl.xml Sat Jun 14 16:40:49 2008 +0200
54.2 +++ b/samples/reentrant/nbproject/build-impl.xml Sat Jun 14 18:51:38 2008 +0200
54.3 @@ -19,7 +19,7 @@
54.4 - cleanup
54.5
54.6 -->
54.7 -<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="reentrant-impl">
54.8 +<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="reentrant-impl">
54.9 <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
54.10 <!--
54.11 ======================
54.12 @@ -235,7 +235,9 @@
54.13 <attribute default="${build.classes.dir}" name="dir"/>
54.14 <sequential>
54.15 <nbjpdareload>
54.16 - <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
54.17 + <fileset dir="@{dir}" includes="${fix.classes}">
54.18 + <include name="${fix.includes}*.class"/>
54.19 + </fileset>
54.20 </nbjpdareload>
54.21 </sequential>
54.22 </macrodef>
55.1 --- a/samples/reentrant/nbproject/genfiles.properties Sat Jun 14 16:40:49 2008 +0200
55.2 +++ b/samples/reentrant/nbproject/genfiles.properties Sat Jun 14 18:51:38 2008 +0200
55.3 @@ -4,5 +4,5 @@
55.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
55.6 nbproject/build-impl.xml.data.CRC32=bd3226d8
55.7 -nbproject/build-impl.xml.script.CRC32=3aa23054
55.8 -nbproject/build-impl.xml.stylesheet.CRC32=f1d9da08
55.9 +nbproject/build-impl.xml.script.CRC32=f897b104
55.10 +nbproject/build-impl.xml.stylesheet.CRC32=487672f9
56.1 --- a/samples/reentrant/test/org/apidesign/reentrant/CriticalSectionBase.java Sat Jun 14 16:40:49 2008 +0200
56.2 +++ b/samples/reentrant/test/org/apidesign/reentrant/CriticalSectionBase.java Sat Jun 14 18:51:38 2008 +0200
56.3 @@ -41,6 +41,8 @@
56.4
56.5 @Test
56.6 public void teaseCriticalSectionWithReentrantCalls() {
56.7 + if (Boolean.getBoolean("no.failures")) return;
56.8 +
56.9 final CriticalSection<Integer> cs = create();
56.10
56.11 cs.assignPilot(10);
57.1 --- a/samples/reexport/build.xml Sat Jun 14 16:40:49 2008 +0200
57.2 +++ b/samples/reexport/build.xml Sat Jun 14 18:51:38 2008 +0200
57.3 @@ -47,6 +47,7 @@
57.4 <param name="version" value="api2.0"/>
57.5 <param name="queryversion" value="query"/>
57.6 <param name="test" value="test"/>
57.7 + <param name="skip.execution" value="test-sys-prop.no.failures"/>
57.8 </antcall>
57.9 <echo level="info" message="Running the Test against Wrapping Query 1.0. This should succeeds."/>
57.10 <antcall target="-run-one">
57.11 @@ -70,7 +71,7 @@
57.12 <property name="junit.jar" location="../libs/dist/junit-4.4.jar"/>
57.13 </target>
57.14
57.15 - <target name="-run-one">
57.16 + <target name="-run-one" unless="${skip.execution}">
57.17 <fail message="You need to specify API version number" unless="version"/>
57.18 <mkdir dir="build/${test}results"/>
57.19 <junit dir="build/${test}/classes" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
57.20 @@ -85,6 +86,10 @@
57.21 <path location="build/${test}/classes"/>
57.22 <path location="${junit.jar}"/>
57.23 </classpath>
57.24 + <syspropertyset>
57.25 + <propertyref prefix="test-sys-prop."/>
57.26 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
57.27 + </syspropertyset>
57.28 <formatter type="brief" usefile="false"/>
57.29 <formatter type="xml"/>
57.30 </junit>
57.31 @@ -100,6 +105,7 @@
57.32 destdir="build/${version}/classes"
57.33 source="1.5" target="1.5"
57.34 classpath="${cp}"
57.35 + debug="true"
57.36 />
57.37 </target>
57.38 </project>
58.1 --- a/samples/sidemeanings/nbproject/build-impl.xml Sat Jun 14 16:40:49 2008 +0200
58.2 +++ b/samples/sidemeanings/nbproject/build-impl.xml Sat Jun 14 18:51:38 2008 +0200
58.3 @@ -19,7 +19,7 @@
58.4 - cleanup
58.5
58.6 -->
58.7 -<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="sidemeanings-impl">
58.8 +<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="sidemeanings-impl">
58.9 <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
58.10 <!--
58.11 ======================
58.12 @@ -235,7 +235,9 @@
58.13 <attribute default="${build.classes.dir}" name="dir"/>
58.14 <sequential>
58.15 <nbjpdareload>
58.16 - <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
58.17 + <fileset dir="@{dir}" includes="${fix.classes}">
58.18 + <include name="${fix.includes}*.class"/>
58.19 + </fileset>
58.20 </nbjpdareload>
58.21 </sequential>
58.22 </macrodef>
59.1 --- a/samples/sidemeanings/nbproject/genfiles.properties Sat Jun 14 16:40:49 2008 +0200
59.2 +++ b/samples/sidemeanings/nbproject/genfiles.properties Sat Jun 14 18:51:38 2008 +0200
59.3 @@ -4,5 +4,5 @@
59.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
59.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
59.6 nbproject/build-impl.xml.data.CRC32=ff1f72f4
59.7 -nbproject/build-impl.xml.script.CRC32=12f37a49
59.8 -nbproject/build-impl.xml.stylesheet.CRC32=f1d9da08
59.9 +nbproject/build-impl.xml.script.CRC32=2b12d853
59.10 +nbproject/build-impl.xml.stylesheet.CRC32=487672f9
60.1 --- a/samples/sidemeanings/test/org/apidesign/sidemeanings/test/MixedTest.java Sat Jun 14 16:40:49 2008 +0200
60.2 +++ b/samples/sidemeanings/test/org/apidesign/sidemeanings/test/MixedTest.java Sat Jun 14 18:51:38 2008 +0200
60.3 @@ -1,7 +1,6 @@
60.4 package org.apidesign.sidemeanings.test;
60.5
60.6
60.7 -import org.apidesign.sidemeanings.Mixed;
60.8 import org.apidesign.sidemeanings.MixedClass;
60.9 import org.apidesign.sidemeanings.NonMixed;
60.10 import org.apidesign.sidemeanings.NonMixed.Callback;