1.1 --- a/testng/nbproject/project.xml Thu Dec 22 01:37:54 2011 +0100
1.2 +++ b/testng/nbproject/project.xml Thu Dec 22 02:04:53 2011 +0100
1.3 @@ -241,10 +241,48 @@
1.4 <compile-dependency/>
1.5 </test-dependency>
1.6 <test-dependency>
1.7 + <code-name-base>org.netbeans.core.startup</code-name-base>
1.8 + </test-dependency>
1.9 + <test-dependency>
1.10 + <code-name-base>org.netbeans.insane</code-name-base>
1.11 + <compile-dependency/>
1.12 + </test-dependency>
1.13 + <test-dependency>
1.14 + <code-name-base>org.netbeans.libs.freemarker</code-name-base>
1.15 + <compile-dependency/>
1.16 + </test-dependency>
1.17 + <test-dependency>
1.18 <code-name-base>org.netbeans.libs.junit4</code-name-base>
1.19 <compile-dependency/>
1.20 </test-dependency>
1.21 <test-dependency>
1.22 + <code-name-base>org.netbeans.modules.editor</code-name-base>
1.23 + <compile-dependency/>
1.24 + </test-dependency>
1.25 + <test-dependency>
1.26 + <code-name-base>org.netbeans.modules.editor.guards</code-name-base>
1.27 + <compile-dependency/>
1.28 + </test-dependency>
1.29 + <test-dependency>
1.30 + <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
1.31 + <compile-dependency/>
1.32 + <test/>
1.33 + </test-dependency>
1.34 + <test-dependency>
1.35 + <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
1.36 + </test-dependency>
1.37 + <test-dependency>
1.38 + <code-name-base>org.netbeans.modules.editor.util</code-name-base>
1.39 + </test-dependency>
1.40 + <test-dependency>
1.41 + <code-name-base>org.netbeans.modules.java.guards</code-name-base>
1.42 + <compile-dependency/>
1.43 + </test-dependency>
1.44 + <test-dependency>
1.45 + <code-name-base>org.netbeans.modules.java.lexer</code-name-base>
1.46 + <compile-dependency/>
1.47 + </test-dependency>
1.48 + <test-dependency>
1.49 <code-name-base>org.netbeans.modules.java.project</code-name-base>
1.50 <compile-dependency/>
1.51 </test-dependency>
1.52 @@ -255,20 +293,64 @@
1.53 <test/>
1.54 </test-dependency>
1.55 <test-dependency>
1.56 + <code-name-base>org.netbeans.modules.lexer</code-name-base>
1.57 + <compile-dependency/>
1.58 + </test-dependency>
1.59 + <test-dependency>
1.60 + <code-name-base>org.netbeans.modules.masterfs</code-name-base>
1.61 + </test-dependency>
1.62 + <test-dependency>
1.63 <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
1.64 <recursive/>
1.65 <compile-dependency/>
1.66 </test-dependency>
1.67 <test-dependency>
1.68 + <code-name-base>org.netbeans.modules.parsing.api</code-name-base>
1.69 + <compile-dependency/>
1.70 + <test/>
1.71 + </test-dependency>
1.72 + <test-dependency>
1.73 + <code-name-base>org.netbeans.modules.parsing.lucene</code-name-base>
1.74 + <compile-dependency/>
1.75 + <test/>
1.76 + </test-dependency>
1.77 + <test-dependency>
1.78 + <code-name-base>org.netbeans.modules.progress.ui</code-name-base>
1.79 + </test-dependency>
1.80 + <test-dependency>
1.81 <code-name-base>org.netbeans.modules.projectui</code-name-base>
1.82 <compile-dependency/>
1.83 </test-dependency>
1.84 <test-dependency>
1.85 + <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
1.86 + <compile-dependency/>
1.87 + </test-dependency>
1.88 + <test-dependency>
1.89 + <code-name-base>org.netbeans.modules.tasklist.ui</code-name-base>
1.90 + <compile-dependency/>
1.91 + </test-dependency>
1.92 + <test-dependency>
1.93 + <code-name-base>org.netbeans.spi.editor.hints</code-name-base>
1.94 + <compile-dependency/>
1.95 + </test-dependency>
1.96 + <test-dependency>
1.97 + <code-name-base>org.openide.dialogs</code-name-base>
1.98 + </test-dependency>
1.99 + <test-dependency>
1.100 + <code-name-base>org.openide.filesystems</code-name-base>
1.101 + </test-dependency>
1.102 + <test-dependency>
1.103 <code-name-base>org.openide.nodes</code-name-base>
1.104 <compile-dependency/>
1.105 <test/>
1.106 </test-dependency>
1.107 <test-dependency>
1.108 + <code-name-base>org.openide.options</code-name-base>
1.109 + </test-dependency>
1.110 + <test-dependency>
1.111 + <code-name-base>org.openide.text</code-name-base>
1.112 + </test-dependency>
1.113 + <test-dependency>
1.114 <code-name-base>org.openide.util</code-name-base>
1.115 <compile-dependency/>
1.116 <test/>
2.1 --- a/testng/src/org/netbeans/modules/contrib/testng/output/XmlOutputParser.java Thu Dec 22 01:37:54 2011 +0100
2.2 +++ b/testng/src/org/netbeans/modules/contrib/testng/output/XmlOutputParser.java Thu Dec 22 02:04:53 2011 +0100
2.3 @@ -334,7 +334,7 @@
2.4
2.5 private TestNGTestcase createTestcaseReport(String className, String name, int time) {
2.6 // TestNGTestcase tc = new TestNGTestcase(name, "TestNG Test", testSession);
2.7 - TestNGTestcase tc = new TestNGTestcase(name, "params", "values", testSession);
2.8 + TestNGTestcase tc = new TestNGTestcase(name, "params", null, testSession);
2.9 tc.setTimeMillis(time);
2.10 tc.setClassName(className);
2.11 return tc;
3.1 --- a/testng/test/unit/src/org/netbeans/modules/contrib/testng/output/RegexpUtilsTest.java Thu Dec 22 01:37:54 2011 +0100
3.2 +++ b/testng/test/unit/src/org/netbeans/modules/contrib/testng/output/RegexpUtilsTest.java Thu Dec 22 02:04:53 2011 +0100
3.3 @@ -534,35 +534,47 @@
3.4 "[NBTestListener] PASSED: \"Regression1\" - test.parameters.ParameterSample.testSingleString() finished in 4 ms";
3.5 Matcher m = pattern.matcher(matchingString);
3.6 assertTrue(m.matches());
3.7 - assertEquals(7, m.groupCount());
3.8 + assertEquals(8, m.groupCount());
3.9 assertEquals("Regression1", m.group(1));
3.10 assertEquals("test.parameters.ParameterSample.testSingleString", m.group(2));
3.11 - assertEquals("", m.group(3));
3.12 - assertNull(m.group(4));
3.13 + assertEquals("", m.group(4));
3.14 assertNull(m.group(5));
3.15 - assertEquals("4", m.group(7));
3.16 + assertNull(m.group(6));
3.17 + assertEquals("4", m.group(8));
3.18 final String matchingString2 =
3.19 "[NBTestListener] PASSED: \"Regression1\" - test.parameters.ParameterSample.testSingleString(java.lang.String)(value(s): \"Cedric\") finished in 2 ms";
3.20 m = pattern.matcher(matchingString2);
3.21 assertTrue(m.matches());
3.22 - assertEquals(7, m.groupCount());
3.23 + assertEquals(8, m.groupCount());
3.24 assertEquals("Regression1", m.group(1));
3.25 assertEquals("test.parameters.ParameterSample.testSingleString", m.group(2));
3.26 - assertEquals("java.lang.String", m.group(3));
3.27 - assertEquals("(value(s): \"Cedric\")", m.group(4));
3.28 - assertEquals("\"Cedric\"", m.group(5));
3.29 - assertEquals("2", m.group(7));
3.30 + assertEquals("java.lang.String", m.group(4));
3.31 + assertEquals("(value(s): \"Cedric\")", m.group(5));
3.32 + assertEquals("\"Cedric\"", m.group(6));
3.33 + assertEquals("2", m.group(8));
3.34 final String matchingString3 =
3.35 "[NBTestListener] PASSED: \"Injection\" - test.inject.NoInjectionTest.withInjection(java.lang.reflect.Method)(value(s): public void test.inject.NoInjectionTest.withInjection(java.lang.reflect.Method)) finished in 15 ms";
3.36 m = pattern.matcher(matchingString3);
3.37 assertTrue(m.matches());
3.38 - assertEquals(7, m.groupCount());
3.39 + assertEquals(8, m.groupCount());
3.40 assertEquals("Injection", m.group(1));
3.41 assertEquals("test.inject.NoInjectionTest.withInjection", m.group(2));
3.42 - assertEquals("java.lang.reflect.Method", m.group(3));
3.43 - assertEquals("(value(s): public void test.inject.NoInjectionTest.withInjection(java.lang.reflect.Method))", m.group(4));
3.44 - assertEquals("public void test.inject.NoInjectionTest.withInjection(java.lang.reflect.Method)", m.group(5));
3.45 - assertEquals("15", m.group(7));
3.46 + assertEquals("java.lang.reflect.Method", m.group(4));
3.47 + assertEquals("(value(s): public void test.inject.NoInjectionTest.withInjection(java.lang.reflect.Method))", m.group(5));
3.48 + assertEquals("public void test.inject.NoInjectionTest.withInjection(java.lang.reflect.Method)", m.group(6));
3.49 + assertEquals("15", m.group(8));
3.50 +
3.51 + final String matchingString4 =
3.52 + "[VerboseTestNG] INVOKING: \"Ant test\" - test.MyTest";
3.53 + m = pattern.matcher(matchingString4);
3.54 + assertTrue(m.matches());
3.55 + assertEquals(8, m.groupCount());
3.56 + assertEquals("Ant test", m.group(1));
3.57 + assertEquals("test.MyTest", m.group(2));
3.58 + assertNull(m.group(3));
3.59 + assertNull(m.group(4));
3.60 + assertNull(m.group(5));
3.61 + assertNull(m.group(7));
3.62 }
3.63
3.64 public void testStatsRegexp() throws Exception {
4.1 --- a/testng/test/unit/src/org/netbeans/modules/contrib/testng/output/TestNGOutputReaderTest.java Thu Dec 22 01:37:54 2011 +0100
4.2 +++ b/testng/test/unit/src/org/netbeans/modules/contrib/testng/output/TestNGOutputReaderTest.java Thu Dec 22 02:04:53 2011 +0100
4.3 @@ -53,7 +53,7 @@
4.4 import org.openide.filesystems.FileObject;
4.5 import org.openide.filesystems.FileUtil;
4.6 import org.openide.util.lookup.Lookups;
4.7 -
4.8 +//14226
4.9 /**
4.10 *
4.11 * @author lukas
4.12 @@ -76,18 +76,17 @@
4.13 TestNGOutputReader r = new TestNGOutputReader(ts);
4.14
4.15 BufferedReader br = new BufferedReader(
4.16 - new FileReader(new File(getDataDir(), "antOut/log3.txt")));
4.17 + new FileReader(new File(getDataDir(), "antOut/log.txt")));
4.18 String line;
4.19 while ((line = br.readLine()) != null) {
4.20 if (line.startsWith(RegexpUtils.TEST_LISTENER_PREFIX)) {
4.21 -// System.out.println(line);
4.22 r.verboseMessageLogged(line);
4.23 }
4.24 }
4.25 -// System.out.println(ts.getSessionResult().getElapsedTime());
4.26 -// System.out.println(ts.getSessionResult().getErrors());
4.27 -// System.out.println(ts.getSessionResult().getFailed());
4.28 -// System.out.println(ts.getSessionResult().getPassed());
4.29 -// System.out.println(ts.getSessionResult().getTotal());
4.30 + assertEquals(23116, ts.getSessionResult().getElapsedTime());
4.31 + assertEquals(0, ts.getSessionResult().getErrors());
4.32 + assertEquals(0, ts.getSessionResult().getFailed());
4.33 + System.out.println(ts.getSessionResult().getPassed());
4.34 + System.out.println(ts.getSessionResult().getTotal());
4.35 }
4.36 }