author | jjg |
Thu, 03 Nov 2016 13:59:15 -0700 | |
changeset 41938 | 8e66bf10fcec |
parent 40308 | 274367a99f98 |
child 44692 | 7f959abfee57 |
permissions | -rw-r--r-- |
36526 | 1 |
/* |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
2 |
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. |
36526 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
22 |
*/ |
|
23 |
||
24 |
import java.io.IOException; |
|
25 |
import java.nio.file.Path; |
|
26 |
import java.nio.file.Paths; |
|
27 |
||
37758 | 28 |
import toolbox.TestRunner; |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
29 |
import toolbox.ToolBox; |
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
30 |
|
36526 | 31 |
/** |
32 |
* Base class for module tests. |
|
33 |
*/ |
|
37758 | 34 |
public class ModuleTestBase extends TestRunner { |
36526 | 35 |
protected ToolBox tb; |
36 |
private int errors; |
|
37 |
||
37758 | 38 |
ModuleTestBase() { |
39 |
super(System.err); |
|
40 |
tb = new ToolBox(); |
|
41 |
} |
|
36526 | 42 |
|
43 |
/** |
|
44 |
* Run all methods annotated with @Test, and throw an exception if any |
|
45 |
* errors are reported.. |
|
46 |
* |
|
47 |
* @throws Exception if any errors occurred |
|
48 |
*/ |
|
37758 | 49 |
protected void runTests() throws Exception { |
50 |
runTests(m -> new Object[] { Paths.get(m.getName()) }); |
|
36526 | 51 |
} |
52 |
||
53 |
Path[] findJavaFiles(Path... paths) throws IOException { |
|
37758 | 54 |
return tb.findJavaFiles(paths); |
36526 | 55 |
} |
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
40308
diff
changeset
|
56 |
|
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
40308
diff
changeset
|
57 |
void checkOutputContains(String log, String... expect) throws Exception { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
40308
diff
changeset
|
58 |
for (String e : expect) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
40308
diff
changeset
|
59 |
if (!log.contains(e)) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
40308
diff
changeset
|
60 |
throw new Exception("expected output not found: " + e); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
40308
diff
changeset
|
61 |
} |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
40308
diff
changeset
|
62 |
} |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
40308
diff
changeset
|
63 |
} |
36526 | 64 |
} |