From ea2e29ff4124608afc189ee16f9913a368557b44 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 6 May 2015 21:05:14 +0200 Subject: [PATCH] java sm runner: normalize line breaks --- .../JUnitTreeByDescriptionHierarchyTest.java | 29 ++++--------------- .../src/com/intellij/junit4/SMTestSender.java | 10 +++---- .../TestNGTreeHierarchyTest.java | 13 +++++++-- .../org/testng/IDEATestNGRemoteListener.java | 4 +-- 4 files changed, 23 insertions(+), 33 deletions(-) diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java index a71e2cfcf17c..85d9482e0fb1 100644 --- a/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java +++ b/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java @@ -64,9 +64,7 @@ public class JUnitTreeByDescriptionHierarchyTest { "##teamcity[enteredTheMatrix]\n" + - "\n" + "##teamcity[rootName name = 'root']\n" + - "\n" + "##teamcity[testSuiteFinished name='root']\n" + "##teamcity[testSuiteStarted name ='TestA']\n" + "##teamcity[testSuiteStarted name ='|[0|]']\n" + @@ -91,9 +89,7 @@ public class JUnitTreeByDescriptionHierarchyTest { "\n" + "##teamcity[testFinished name='testName|[1|]']\n" + "##teamcity[testSuiteFinished name='|[1|]']\n" + - "\n" + - "##teamcity[testSuiteFinished name='TestB']\n" + - "\n"); + "##teamcity[testSuiteFinished name='TestB']\n"); } @Test @@ -112,9 +108,7 @@ public class JUnitTreeByDescriptionHierarchyTest { "##teamcity[suiteTreeEnded name='|[1|]']\n", //start "##teamcity[enteredTheMatrix]\n" + - "\n" + "##teamcity[rootName name = 'TestA' comment = 'a']\n" + - "\n" + "##teamcity[testSuiteStarted name ='|[0|]']\n" + "##teamcity[testStarted name='testName|[0|]' locationHint='java:test://a.TestA.testName|[0|]']\n" + "\n" + @@ -125,9 +119,7 @@ public class JUnitTreeByDescriptionHierarchyTest { "\n" + "##teamcity[testFinished name='testName|[1|]']\n" + "##teamcity[testSuiteFinished name='|[1|]']\n" + - "\n" + - "##teamcity[testSuiteFinished name='TestA']\n" + - "\n"); + "##teamcity[testSuiteFinished name='TestA']\n"); } @Test @@ -161,9 +153,7 @@ public class JUnitTreeByDescriptionHierarchyTest { //started "##teamcity[enteredTheMatrix]\n" + - "\n" + "##teamcity[rootName name = 'root']\n" + - "\n" + "##teamcity[testSuiteFinished name='root']\n" + "##teamcity[testSuiteStarted name ='ASuite1']\n" + "##teamcity[testSuiteStarted name ='ATest']\n" + @@ -178,9 +168,7 @@ public class JUnitTreeByDescriptionHierarchyTest { "\n" + "##teamcity[testFinished name='test1']\n" + "##teamcity[testSuiteFinished name='ATest']\n" + - "\n" + - "##teamcity[testSuiteFinished name='ASuite2']\n" + - "\n"); + "##teamcity[testSuiteFinished name='ASuite2']\n"); } private static void doTest(Description root, List tests, String expectedTree, String expectedStart) throws Exception { @@ -244,9 +232,7 @@ public class JUnitTreeByDescriptionHierarchyTest { //start "##teamcity[enteredTheMatrix]\n" + - "\n" + "##teamcity[rootName name = 'root']\n" + - "\n" + "##teamcity[testSuiteFinished name='root']\n" + "##teamcity[testSuiteStarted name ='ATest']\n" + "##teamcity[testSuiteStarted name ='|[0|]']\n" + @@ -266,9 +252,7 @@ public class JUnitTreeByDescriptionHierarchyTest { "\n" + "##teamcity[testFinished name='test']\n" + "##teamcity[testSuiteFinished name='ATest']\n" + - "\n" + - "##teamcity[testSuiteFinished name='suite']\n" + - "\n"); + "##teamcity[testSuiteFinished name='suite']\n"); } @@ -304,13 +288,10 @@ public class JUnitTreeByDescriptionHierarchyTest { "##teamcity[enteredTheMatrix]\n" + - "\n" + "##teamcity[rootName name = 'TestA']\n" + - "\n" + "##teamcity[testStarted name='warning' locationHint='java:test://junit.framework.TestSuite$1.warning']\n" + "\n" + "##teamcity[testFinished name='warning']\n" + - "##teamcity[testSuiteFinished name='TestA']\n" + - "\n"); + "##teamcity[testSuiteFinished name='TestA']\n"); } } diff --git a/plugins/junit_rt/src/com/intellij/junit4/SMTestSender.java b/plugins/junit_rt/src/com/intellij/junit4/SMTestSender.java index e5b831eaa3fd..0544f92d00e6 100644 --- a/plugins/junit_rt/src/com/intellij/junit4/SMTestSender.java +++ b/plugins/junit_rt/src/com/intellij/junit4/SMTestSender.java @@ -61,7 +61,7 @@ public class SMTestSender extends RunListener { } public void testRunStarted(Description description) throws Exception { - myPrintStream.println("##teamcity[enteredTheMatrix]\n"); + myPrintStream.println("##teamcity[enteredTheMatrix]"); if (myCurrentClassName != null && !myCurrentClassName.startsWith("[")) { int lastPointIdx = myCurrentClassName.lastIndexOf('.'); String name = myCurrentClassName; @@ -73,20 +73,20 @@ public class SMTestSender extends RunListener { myPrintStream.println("##teamcity[rootName name = \'" + escapeName(name) + (comment != null ? ("\' comment = \'" + escapeName(comment)) : "") + - "\']\n"); + "\']"); myCurrentClassName = getShortName(myCurrentClassName); } } public void testRunFinished(Result result) throws Exception { if (myParamName != null) { - myPrintStream.println("##teamcity[testSuiteFinished name=\'" + escapeName(myParamName) + "\']\n"); + myPrintStream.println("##teamcity[testSuiteFinished name=\'" + escapeName(myParamName) + "\']"); } if (myCurrentClassName != null) { - myPrintStream.println("##teamcity[testSuiteFinished name=\'" + escapeName(myCurrentClassName) + "\']\n"); + myPrintStream.println("##teamcity[testSuiteFinished name=\'" + escapeName(myCurrentClassName) + "\']"); } if (myCurrentSuiteName != null) { - myPrintStream.println("##teamcity[testSuiteFinished name=\'" + escapeName(getShortName(myCurrentSuiteName)) + "\']\n"); + myPrintStream.println("##teamcity[testSuiteFinished name=\'" + escapeName(getShortName(myCurrentSuiteName)) + "\']"); } } diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/TestNGTreeHierarchyTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/TestNGTreeHierarchyTest.java index aaf0f40ad596..51a1f4339ab2 100644 --- a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/TestNGTreeHierarchyTest.java +++ b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/TestNGTreeHierarchyTest.java @@ -40,7 +40,9 @@ public class TestNGTreeHierarchyTest { test.getClasses().add(xmlClass); suite.getTests().add(test); - doTest(suite, "##teamcity[testSuiteStarted name ='ATest' locationHint = 'java:suite://a.ATest']\n" + + doTest(suite, "\n" + + "##teamcity[testSuiteStarted name ='ATest' locationHint = 'java:suite://a.ATest']\n" + + "\n" + "##teamcity[testStarted name='test1' locationHint='java:test://a.ATest.test1']\n" + "\n" + "##teamcity[testFinished name='test1']\n"); @@ -60,22 +62,29 @@ public class TestNGTreeHierarchyTest { } listener.onSuiteFinish(className); - Assert.assertEquals("output: " + buf, "##teamcity[testSuiteStarted name ='ATest' locationHint = 'java:suite://a.ATest']\n" + + Assert.assertEquals("output: " + buf, "\n" + + "##teamcity[testSuiteStarted name ='ATest' locationHint = 'java:suite://a.ATest']\n" + + "\n" + "##teamcity[testStarted name='setUp' locationHint='java:test://a.ATest.setUp']\n" + "\n" + "##teamcity[testFinished name='setUp']\n" + + "\n" + "##teamcity[testStarted name='test1' locationHint='java:test://a.ATest.test1']\n" + "\n" + "##teamcity[testFinished name='test1']\n" + + "\n" + "##teamcity[testStarted name='tearDown' locationHint='java:test://a.ATest.tearDown']\n" + "\n" + "##teamcity[testFinished name='tearDown']\n" + + "\n" + "##teamcity[testStarted name='setUp' locationHint='java:test://a.ATest.setUp']\n" + "\n" + "##teamcity[testFinished name='setUp']\n" + + "\n" + "##teamcity[testStarted name='test2' locationHint='java:test://a.ATest.test2']\n" + "\n" + "##teamcity[testFinished name='test2']\n" + + "\n" + "##teamcity[testStarted name='tearDown' locationHint='java:test://a.ATest.tearDown']\n" + "\n" + "##teamcity[testFinished name='tearDown']\n" + diff --git a/plugins/testng_rt/src/org/testng/IDEATestNGRemoteListener.java b/plugins/testng_rt/src/org/testng/IDEATestNGRemoteListener.java index 6bb4ae2bda89..06cc4fa45d5c 100644 --- a/plugins/testng_rt/src/org/testng/IDEATestNGRemoteListener.java +++ b/plugins/testng_rt/src/org/testng/IDEATestNGRemoteListener.java @@ -106,7 +106,7 @@ public class IDEATestNGRemoteListener implements ISuiteListener, IResultListener if (myCurrentClassName != null) { onSuiteFinish(myCurrentClassName); } - myPrintStream.print("##teamcity[testSuiteStarted name =\'" + escapeName(provideLocation ? getShortName(suiteName) : suiteName)); + myPrintStream.print("\n##teamcity[testSuiteStarted name =\'" + escapeName(provideLocation ? getShortName(suiteName) : suiteName)); if (provideLocation) { myPrintStream.print("\' locationHint = \'java:suite://" + suiteName); } @@ -157,7 +157,7 @@ public class IDEATestNGRemoteListener implements ISuiteListener, IResultListener } private void fireTestStarted(String methodName, String className) { - myPrintStream.println("##teamcity[testStarted name=\'" + escapeName(methodName) + + myPrintStream.println("\n##teamcity[testStarted name=\'" + escapeName(methodName) + "\' locationHint=\'java:test://" + escapeName(className + "." + methodName) + "\']"); }