WIP

Author: mpkorstanje

core/src/main/java/io/cucumber/core/plugin/TeamCityPlugin.java

@@ -224,7 +224,7 @@ private String extractSourceLocation(TestStep testStep) {
         if (java8Matcher.matches()) {
             String declaringClassName = java8Matcher.group(1);
             String line = java8Matcher.group(2);
-            // TODO: Doesn't work with IDEA
+            // TODO: Doesn't work with IDEA. What does?
             return String.format("java:test://%s:%s", declaringClassName, line);
         }
 
@@ -240,18 +240,18 @@ private void printTestStepFinished(TestStepFinished event) {
         Status status = event.getResult().getStatus();
         switch (status) {
             case SKIPPED:
-                print(TEMPLATE_TEST_IGNORED, timeStamp, duration, error == null ? "Skipped step" : error.getMessage(), name);
+                print(TEMPLATE_TEST_IGNORED, timeStamp, duration, error == null ? "Step skipped" : error.getMessage(), name);
                 break;
             case PENDING:
-                print(TEMPLATE_TEST_IGNORED, timeStamp, duration, error == null ? "Pending step" : error.getMessage(), name);
+                print(TEMPLATE_TEST_IGNORED, timeStamp, duration, error == null ? "Step pending" : error.getMessage(), name);
                 break;
             case UNDEFINED:
                 PickleStepTestStep testStep = (PickleStepTestStep) event.getTestStep();
                 print(TEMPLATE_TEST_FAILED, timeStamp, duration, getSnippet(testStep), name);
                 break;
             case AMBIGUOUS:
             case FAILED:
-                String message = error.getMessage();
+                String message = "Step failed";
                 String details = extractStackTrace(error);
                 print(TEMPLATE_TEST_FAILED, timeStamp, duration, message, details, name);
                 break;
@@ -368,10 +368,10 @@ private String escape(String source) {
             return "";
         }
         return source
+            .replace("|", "||")
             .replace("'", "|'")
             .replace("\n", "|n")
             .replace("\r", "|r")
-            .replace("|", "||")
             .replace("[", "|[")
             .replace("]", "|]");
     }