OpenJDK / jdk8u / jdk8u-dev / jdk
changeset 11468:2e0399f66ddc
8151352: jdk/test/sample fails with "effective library path is outside the test suite"
Reviewed-by: darcy
Contributed-by: Felix Yang <felix.yang@oracle.com>
| author | coffeys |
|---|---|
| date | Wed, 16 Mar 2016 09:22:57 +0000 |
| parents | d6e8e11bec16 |
| children | 8ed982481938 |
| files | test/sample/TEST.properties test/sample/chatserver/ChatTest.java test/sample/mergesort/MergeSortTest.java |
| diffstat | 3 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/sample/TEST.properties Wed Mar 16 09:22:57 2016 +0000 @@ -0,0 +1,1 @@ +external.lib.roots = ../../
--- a/test/sample/chatserver/ChatTest.java Tue Feb 18 11:23:00 2014 +0100 +++ b/test/sample/chatserver/ChatTest.java Wed Mar 16 09:22:57 2016 +0000 @@ -25,9 +25,9 @@ /* @test * @summary Test chat server chatserver test * - * @library ../../../src/share/sample/nio/chatserver + * @library /src/share/sample/nio/chatserver * @build ChatTest ChatServer Client ClientReader DataReader MessageReader NameReader - * @run main ChatTest + * @run testng ChatTest */ import java.io.*; @@ -38,10 +38,13 @@ import java.util.List; import java.util.concurrent.CyclicBarrier; +import org.testng.annotations.Test; + public class ChatTest { public static int listeningPort = 0; - public static void main(String[] args) throws Throwable { + @Test + public static void doTest() throws Throwable { testStartStop(); testPortOpen(); testAsksForName();
--- a/test/sample/mergesort/MergeSortTest.java Tue Feb 18 11:23:00 2014 +0100 +++ b/test/sample/mergesort/MergeSortTest.java Wed Mar 16 09:22:57 2016 +0000 @@ -25,14 +25,16 @@ /* @test * @summary Test MergeSort * - * @library ../../../src/share/sample/forkjoin/mergesort + * @library /src/share/sample/forkjoin/mergesort * @build MergeSortTest MergeDemo MergeSort - * @run main MergeSortTest + * @run testng MergeSortTest */ import java.util.Arrays; import java.util.Random; +import org.testng.annotations.Test; + public class MergeSortTest { private Random random; private MergeSort target; @@ -42,7 +44,8 @@ this.target = target; } - public static void main(String[] args) { + @Test + public static void doTest() { MergeSortTest test = new MergeSortTest(new Random(), new MergeSort(Runtime.getRuntime().availableProcessors() * 4)); test.run(); }