diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java index 10648aae1a41..91b76b9a7a14 100644 --- a/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java +++ b/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java @@ -70,11 +70,13 @@ public class JUnitTreeByDescriptionHierarchyTest { "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" + "##teamcity[testSuiteStarted name='TestA']\n" + "##teamcity[testSuiteStarted name='|[0|]']\n" + + "\n" + "##teamcity[testStarted name='testName|[0|]' locationHint='java:test://a.TestA.testName|[0|]']\n" + "\n" + "##teamcity[testFinished name='testName|[0|]']\n" + "##teamcity[testSuiteFinished name='|[0|]']\n" + "##teamcity[testSuiteStarted name='|[1|]']\n" + + "\n" + "##teamcity[testStarted name='testName|[1|]' locationHint='java:test://a.TestA.testName|[1|]']\n" + "\n" + "##teamcity[testFinished name='testName|[1|]']\n" + @@ -82,11 +84,13 @@ public class JUnitTreeByDescriptionHierarchyTest { "##teamcity[testSuiteFinished name='TestA']\n" + "##teamcity[testSuiteStarted name='TestB']\n" + "##teamcity[testSuiteStarted name='|[0|]']\n" + + "\n" + "##teamcity[testStarted name='testName|[0|]' locationHint='java:test://a.TestB.testName|[0|]']\n" + "\n" + "##teamcity[testFinished name='testName|[0|]']\n" + "##teamcity[testSuiteFinished name='|[0|]']\n" + "##teamcity[testSuiteStarted name='|[1|]']\n" + + "\n" + "##teamcity[testStarted name='testName|[1|]' locationHint='java:test://a.TestB.testName|[1|]']\n" + "\n" + "##teamcity[testFinished name='testName|[1|]']\n" + @@ -116,9 +120,11 @@ public class JUnitTreeByDescriptionHierarchyTest { sender.testRunFinished(new Result()); Assert.assertEquals("output: " + buf, "##teamcity[enteredTheMatrix]\n" + "##teamcity[testSuiteStarted name='ATest' locationHint='java:suite://ATest']\n" + + "\n" + "##teamcity[testStarted name='ATest.test1' locationHint='java:test://ATest.test1']\n" + "\n" + "##teamcity[testFinished name='ATest.test1']\n" + + "\n" + "##teamcity[testStarted name='ATest.test2' locationHint='java:test://ATest.test2']\n" + "\n" + "##teamcity[testFinished name='ATest.test2']\n" + @@ -146,11 +152,13 @@ public class JUnitTreeByDescriptionHierarchyTest { "##teamcity[treeEnded]\n", "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" + "##teamcity[testSuiteStarted name='MyTest']\n" + + "\n" + "##teamcity[testStarted name='MyTest.testMe' locationHint='java:test://a.MyTest.testMe']\n" + "\n" + "##teamcity[testFinished name='MyTest.testMe']\n" + "##teamcity[testSuiteFinished name='MyTest']\n" + "##teamcity[testSuiteStarted name='MyTest']\n" + + "\n" + "##teamcity[testStarted name='MyTest.testMe' locationHint='java:test://b.MyTest.testMe']\n" + "\n" + "##teamcity[testFinished name='MyTest.testMe']\n" + @@ -177,11 +185,13 @@ public class JUnitTreeByDescriptionHierarchyTest { //start "##teamcity[rootName name = 'TestA' comment = 'a' location = 'java:suite://a.TestA']\n" + "##teamcity[testSuiteStarted name='|[0|]']\n" + + "\n" + "##teamcity[testStarted name='testName|[0|]' locationHint='java:test://a.TestA.testName|[0|]']\n" + "\n" + "##teamcity[testFinished name='testName|[0|]']\n" + "##teamcity[testSuiteFinished name='|[0|]']\n" + "##teamcity[testSuiteStarted name='|[1|]']\n" + + "\n" + "##teamcity[testStarted name='testName|[1|]' locationHint='java:test://a.TestA.testName|[1|]']\n" + "\n" + "##teamcity[testFinished name='testName|[1|]']\n" + @@ -213,11 +223,13 @@ public class JUnitTreeByDescriptionHierarchyTest { //start "##teamcity[rootName name = 'TestA' comment = 'a' location = 'java:suite://a.TestA']\n" + "##teamcity[testSuiteStarted name='|[0|]']\n" + + "\n" + "##teamcity[testStarted name='testName|[0|]' locationHint='java:test://a.TestA.testName|[0|]']\n" + "\n" + "##teamcity[testFinished name='testName|[0|]']\n" + "##teamcity[testSuiteFinished name='|[0|]']\n" + "##teamcity[testSuiteStarted name='|[0|]']\n" + + "\n" + "##teamcity[testStarted name='testName|[0|]' locationHint='java:test://a.TestA.testName|[0|]']\n" + "\n" + "##teamcity[testFinished name='testName|[0|]']\n" + @@ -249,11 +261,13 @@ public class JUnitTreeByDescriptionHierarchyTest { //start "##teamcity[rootName name = 'TestA' comment = 'a' location = 'java:suite://a.TestA']\n" + "##teamcity[testSuiteStarted name='|[0: with - 1.1|]']\n" + + "\n" + "##teamcity[testStarted name='testName|[0: with - 1.1|]' locationHint='java:test://a.TestA.testName|[0: with - 1.1|]']\n" + "\n" + "##teamcity[testFinished name='testName|[0: with - 1.1|]']\n" + "##teamcity[testSuiteFinished name='|[0: with - 1.1|]']\n" + "##teamcity[testSuiteStarted name='|[1: with - 2.1|]']\n" + + "\n" + "##teamcity[testStarted name='testName|[1: with - 2.1|]' locationHint='java:test://a.TestA.testName|[1: with - 2.1|]']\n" + "\n" + "##teamcity[testFinished name='testName|[1: with - 2.1|]']\n" + @@ -295,6 +309,7 @@ public class JUnitTreeByDescriptionHierarchyTest { "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" + "##teamcity[testSuiteStarted name='ASuite1']\n" + "##teamcity[testSuiteStarted name='ATest']\n" + + "\n" + "##teamcity[testStarted name='ATest.test1' locationHint='java:test://ATest.test1']\n" + "\n" + "##teamcity[testFinished name='ATest.test1']\n" + @@ -302,6 +317,7 @@ public class JUnitTreeByDescriptionHierarchyTest { "##teamcity[testSuiteFinished name='ASuite1']\n" + "##teamcity[testSuiteStarted name='ASuite2']\n" + "##teamcity[testSuiteStarted name='ATest']\n" + + "\n" + "##teamcity[testStarted name='ATest.test1' locationHint='java:test://ATest.test1']\n" + "\n" + "##teamcity[testFinished name='ATest.test1']\n" + @@ -356,6 +372,7 @@ public class JUnitTreeByDescriptionHierarchyTest { Assert.assertEquals("output: " + buf, "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" + "##teamcity[testSuiteStarted name='TestA']\n" + + "\n" + "##teamcity[testStarted name='TestA.testName' locationHint='java:test://TestA.testName']\n" + "\n" + "##teamcity[testIgnored name='TestA.testName' details='java.lang.Exception|n' error='true' message='']\n" + @@ -397,6 +414,7 @@ public class JUnitTreeByDescriptionHierarchyTest { "\n" + "##teamcity[testFinished name='Class Configuration']\n" + "##teamcity[testSuiteStarted name='TestA']\n" + + "\n" + "##teamcity[testStarted name='TestA.testName' locationHint='java:test://TestA.testName']\n" + "\n" + "##teamcity[testIgnored name='TestA.testName']\n" + @@ -435,6 +453,7 @@ public class JUnitTreeByDescriptionHierarchyTest { Assert.assertEquals("output: " + buf, "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" + "##teamcity[testSuiteStarted name='TestA']\n" + + "\n" + "##teamcity[testStarted name='TestA.testName' locationHint='java:test://TestA.testName']\n" + "\n" + "##teamcity[testFinished name='TestA.testName']\n" + @@ -479,6 +498,7 @@ public class JUnitTreeByDescriptionHierarchyTest { Assert.assertEquals("output: " + buf, "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" + "##teamcity[testSuiteStarted name='TestA']\n" + "##teamcity[testSuiteStarted name='param']\n" + + "\n" + "##teamcity[testStarted name='TestA.testName' locationHint='java:test://TestA.testName']\n" + "\n" + "##teamcity[testIgnored name='TestA.testName' details='java.lang.Exception|n' error='true' message='']\n" + @@ -506,6 +526,7 @@ public class JUnitTreeByDescriptionHierarchyTest { "##teamcity[enteredTheMatrix]\n" + "##teamcity[treeEnded]\n", "##teamcity[rootName name = 'TestA' location = 'java:suite://TestA']\n" + + "\n" + "##teamcity[testStarted name='TestA.testName' locationHint='java:test://TestA.testName']\n" + "\n" + "##teamcity[testFinished name='TestA.testName']\n"); @@ -535,11 +556,13 @@ public class JUnitTreeByDescriptionHierarchyTest { Assert.assertEquals("output: " + buf, "##teamcity[enteredTheMatrix]\n" + "##teamcity[testSuiteStarted name='TestA' locationHint='java:suite://a.TestA']\n" + + "\n" + "##teamcity[testStarted name='TestA.testName' locationHint='java:test://a.TestA.testName']\n" + "\n" + "##teamcity[testFinished name='TestA.testName']\n" + "##teamcity[testSuiteFinished name='TestA']\n" + "##teamcity[testSuiteStarted name='TestB' locationHint='java:suite://a.TestB']\n" + + "\n" + "##teamcity[testStarted name='TestB.testName' locationHint='java:test://a.TestB.testName']\n" + "\n" + "##teamcity[testFinished name='TestB.testName']\n" + @@ -587,9 +610,11 @@ public class JUnitTreeByDescriptionHierarchyTest { "##teamcity[rootName name = 'ATest' location = 'java:suite://ATest']\n" + "##teamcity[testSuiteStarted name='testName']\n" + + "\n" + "##teamcity[testStarted name='ATest.testName|[0|]' locationHint='java:test://ATest.testName|[0|]']\n" + "\n" + "##teamcity[testFinished name='ATest.testName|[0|]']\n" + + "\n" + "##teamcity[testStarted name='ATest.testName|[1|]' locationHint='java:test://ATest.testName|[1|]']\n" + "\n" + "##teamcity[testFinished name='ATest.testName|[1|]']\n" + @@ -631,11 +656,13 @@ public class JUnitTreeByDescriptionHierarchyTest { "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" + "##teamcity[testSuiteStarted name='ATest']\n" + "##teamcity[testSuiteStarted name='|[0|]']\n" + + "\n" + "##teamcity[testStarted name='testName|[0|]' locationHint='java:test://ATest.testName|[0|]']\n" + "\n" + "##teamcity[testFinished name='testName|[0|]']\n" + "##teamcity[testSuiteFinished name='|[0|]']\n" + "##teamcity[testSuiteStarted name='|[1|]']\n" + + "\n" + "##teamcity[testStarted name='testName|[1|]' locationHint='java:test://ATest.testName|[1|]']\n" + "\n" + "##teamcity[testFinished name='testName|[1|]']\n" + @@ -643,6 +670,7 @@ public class JUnitTreeByDescriptionHierarchyTest { "##teamcity[testSuiteFinished name='ATest']\n" + "##teamcity[testSuiteStarted name='suite']\n" + "##teamcity[testSuiteStarted name='ATest']\n" + + "\n" + "##teamcity[testStarted name='ATest.test' locationHint='java:test://ATest.test']\n" + "\n" + "##teamcity[testFinished name='ATest.test']\n" + @@ -679,6 +707,7 @@ public class JUnitTreeByDescriptionHierarchyTest { "##teamcity[treeEnded]\n", "##teamcity[rootName name = 'TestA' location = 'java:suite://TestA']\n" + + "\n" + "##teamcity[testStarted name='TestSuite$1.warning' locationHint='java:test://junit.framework.TestSuite$1.warning']\n" + "\n" + "##teamcity[testFinished name='TestSuite$1.warning']\n"); diff --git a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestListener.java b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestListener.java index ac1e31f3ba83..bcb71b321c60 100644 --- a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestListener.java +++ b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestListener.java @@ -128,7 +128,7 @@ public class JUnit4TestListener extends RunListener { } } - myPrintStream.println("##teamcity[testStarted name=\'" + escapeName(methodName) + "\' " + + myPrintStream.println("\n##teamcity[testStarted name=\'" + escapeName(methodName) + "\' " + getTestMethodLocation(methodName, classFQN) + "]"); myCurrentTestStart = currentTime(); }