[Cucumber for Java] rename TestEvent-interfaces, make them public
authorAndrey Vokin <andrey.vokin@jetbrains.com>
Mon, 11 Nov 2019 13:09:04 +0000 (14:09 +0100)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Mon, 11 Nov 2019 17:12:03 +0000 (17:12 +0000)
GitOrigin-RevId: 935354c419823a6bc3ed714e217c139bfa82cd91

12 files changed:
plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvm2Adapter.java
plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvm2SMFormatter.java
plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvmSMConverter.java
plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvmTestCase.java [moved from plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/IdeaTestCase.java with 89% similarity]
plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvmTestSourceReadEvent.java [moved from plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/IdeaTestSourceReadEvent.java with 78% similarity]
plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvmTestStep.java [moved from plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/IdeaTestStep.java with 86% similarity]
plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvmTestStepFinishedEvent.java [moved from plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/IdeaTestStepFinishedEvent.java with 78% similarity]
plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvmWriteEvent.java [moved from plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/IdeaWriteEvent.java with 78% similarity]
plugins/cucumber-jvm-formatter3/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvm3Adapter.java
plugins/cucumber-jvm-formatter3/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvm3SMFormatter.java
plugins/cucumber-jvm-formatter5/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvm5Adapter.java
plugins/cucumber-jvm-formatter5/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvm5SMFormatter.java

index 2bfc30e36a8e60ffd25082087ebd22acda8ba4d8..e3389a4db4875174c3c1f3cd94043251f4028ecc 100644 (file)
@@ -12,17 +12,17 @@ import java.lang.reflect.Method;
 import static org.jetbrains.plugins.cucumber.java.run.CucumberJvmSMFormatterUtil.FILE_RESOURCE_PREFIX;
 
 public class CucumberJvm2Adapter {
-  public static class IdeaTestStepFinishedEvent implements org.jetbrains.plugins.cucumber.java.run.IdeaTestStepFinishedEvent {
-    private final IdeaTestStep myTestStep;
+  public static class CucumberJvmTestStepFinishedEvent implements org.jetbrains.plugins.cucumber.java.run.CucumberJvmTestStepFinishedEvent {
+    private final CucumberJvmTestStep myTestStep;
     private final TestStepFinished myRealEvent;
 
-    public IdeaTestStepFinishedEvent(TestStepFinished testStepFinished) {
-      myTestStep = new IdeaTestStep(testStepFinished.testStep);
+    public CucumberJvmTestStepFinishedEvent(TestStepFinished testStepFinished) {
+      myTestStep = new CucumberJvmTestStep(testStepFinished.testStep);
       myRealEvent = testStepFinished;
     }
 
     @Override
-    public org.jetbrains.plugins.cucumber.java.run.IdeaTestStep getTestStep() {
+    public org.jetbrains.plugins.cucumber.java.run.CucumberJvmTestStep getTestStep() {
       return myTestStep;
     }
 
@@ -47,10 +47,10 @@ public class CucumberJvm2Adapter {
     }
   }
 
-  public static class IdeaTestCase implements org.jetbrains.plugins.cucumber.java.run.IdeaTestCase {
+  public static class CucumberJvmTestCase implements org.jetbrains.plugins.cucumber.java.run.CucumberJvmTestCase {
     private final TestCase myRealTestCase;
 
-    IdeaTestCase(TestCase realTestCase) {
+    CucumberJvmTestCase(TestCase realTestCase) {
       myRealTestCase = realTestCase;
     }
 
@@ -85,10 +85,10 @@ public class CucumberJvm2Adapter {
     }
   }
 
-  public static class IdeaTestStep implements org.jetbrains.plugins.cucumber.java.run.IdeaTestStep {
+  public static class CucumberJvmTestStep implements org.jetbrains.plugins.cucumber.java.run.CucumberJvmTestStep {
     private final TestStep myRealStep;
 
-    public IdeaTestStep(TestStep realStep) {
+    public CucumberJvmTestStep(TestStep realStep) {
       myRealStep = realStep;
     }
 
index cdde0b112136524812cb2b957b74507259facf55..06e44f067c09433a3e92042c467e47987ae505d3 100644 (file)
@@ -19,14 +19,14 @@ public class CucumberJvm2SMFormatter extends CucumberJvmSMConverter implements F
   private final EventHandler<TestCaseStarted> testCaseStartedHandler = new EventHandler<TestCaseStarted>() {
     @Override
     public void receive(TestCaseStarted event) {
-      CucumberJvm2SMFormatter.this.handleTestCaseStarted(new CucumberJvm2Adapter.IdeaTestCase(event.testCase));
+      CucumberJvm2SMFormatter.this.handleTestCaseStarted(new CucumberJvm2Adapter.CucumberJvmTestCase(event.testCase));
     }
   };
 
   private final EventHandler<TestCaseFinished> testCaseFinishedHandler = new EventHandler<TestCaseFinished>() {
     @Override
     public void receive(TestCaseFinished event) {
-      handleTestCaseFinished(new CucumberJvm2Adapter.IdeaTestCase(event.testCase));
+      handleTestCaseFinished(new CucumberJvm2Adapter.CucumberJvmTestCase(event.testCase));
     }
   };
 
@@ -40,28 +40,28 @@ public class CucumberJvm2SMFormatter extends CucumberJvmSMConverter implements F
   private final EventHandler<WriteEvent> writeEventHandler = new EventHandler<WriteEvent>() {
     @Override
     public void receive(WriteEvent event) {
-      CucumberJvm2SMFormatter.this.handleWriteEvent(new IdeaWriteEvent(event.text));
+      CucumberJvm2SMFormatter.this.handleWriteEvent(new CucumberJvmWriteEvent(event.text));
     }
   };
 
   private final EventHandler<TestStepStarted> testStepStartedHandler = new EventHandler<TestStepStarted>() {
     @Override
     public void receive(TestStepStarted event) {
-      handleTestStepStarted(new CucumberJvm2Adapter.IdeaTestStep(event.testStep));
+      handleTestStepStarted(new CucumberJvm2Adapter.CucumberJvmTestStep(event.testStep));
     }
   };
 
   private final EventHandler<TestStepFinished> testStepFinishedHandler = new EventHandler<TestStepFinished>() {
     @Override
     public void receive(TestStepFinished event) {
-      handleTestStepFinished(new CucumberJvm2Adapter.IdeaTestStepFinishedEvent(event));
+      handleTestStepFinished(new CucumberJvm2Adapter.CucumberJvmTestStepFinishedEvent(event));
     }
   };
 
   private final EventHandler<TestSourceRead> testSourceReadHandler = new EventHandler<TestSourceRead>() {
     @Override
     public void receive(TestSourceRead event) {
-      CucumberJvm2SMFormatter.this.handleTestSourceRead(new IdeaTestSourceReadEvent(event.uri, event.source));
+      CucumberJvm2SMFormatter.this.handleTestSourceRead(new CucumberJvmTestSourceReadEvent(event.uri, event.source));
     }
   };
 
index 1b416333767100d90e24b1ba4c6418a4593a772d..20e3971cf09a4915d0bcfacbc9ffae0c4bcb2e8c 100644 (file)
@@ -32,7 +32,7 @@ public class CucumberJvmSMConverter {
     outCommand(TEMPLATE_SCENARIO_COUNTING_STARTED, "0", getCurrentTime());
   }
 
-  protected void handleTestCaseStarted(IdeaTestCase testCase) {
+  protected void handleTestCaseStarted(CucumberJvmTestCase testCase) {
     String uri = testCase.getUri();
     if (currentFilePath == null) {
       outCommand(TEMPLATE_TEST_SUITE_STARTED, getCurrentTime(), uri, getFeatureFileDescription(uri));
@@ -65,7 +65,7 @@ public class CucumberJvmSMConverter {
                getScenarioName(testCase));
   }
 
-  protected void handleTestCaseFinished(IdeaTestCase testCase) {
+  protected void handleTestCaseFinished(CucumberJvmTestCase testCase) {
     outCommand(TEMPLATE_TEST_SUITE_FINISHED, getCurrentTime(), getScenarioName(testCase));
     outCommand(TEMPLATE_SCENARIO_FINISHED, getCurrentTime());
   }
@@ -75,20 +75,20 @@ public class CucumberJvmSMConverter {
     outCommand(TEMPLATE_TEST_SUITE_FINISHED, getCurrentTime(), getFeatureFileDescription(currentFilePath));
   }
 
-  protected void handleWriteEvent(IdeaWriteEvent event) {
+  protected void handleWriteEvent(CucumberJvmWriteEvent event) {
     myOut.println(event.getText());
   }
 
-  protected void handleTestStepStarted(IdeaTestStep testStep) {
+  protected void handleTestStepStarted(CucumberJvmTestStep testStep) {
     outCommand(TEMPLATE_TEST_STARTED, getCurrentTime(), testStep.getLocation(), testStep.getStepName());
   }
 
-  protected void handleTestStepFinished(IdeaTestStepFinishedEvent event) {
-    if (event.getResult() == IdeaTestStepFinishedEvent.Status.PASSED) {
+  protected void handleTestStepFinished(CucumberJvmTestStepFinishedEvent event) {
+    if (event.getResult() == CucumberJvmTestStepFinishedEvent.Status.PASSED) {
       // write nothing
     }
-    else if (event.getResult() == IdeaTestStepFinishedEvent.Status.SKIPPED ||
-             event.getResult() == IdeaTestStepFinishedEvent.Status.PENDING) {
+    else if (event.getResult() == CucumberJvmTestStepFinishedEvent.Status.SKIPPED ||
+             event.getResult() == CucumberJvmTestStepFinishedEvent.Status.PENDING) {
       outCommand(TEMPLATE_TEST_PENDING, event.getTestStep().getStepName(), getCurrentTime());
     }
     else {
@@ -106,7 +106,7 @@ public class CucumberJvmSMConverter {
     outCommand(TEMPLATE_TEST_FINISHED, getCurrentTime(), String.valueOf(event.getDuration()), event.getTestStep().getStepName());
   }
 
-  protected void handleTestSourceRead(IdeaTestSourceReadEvent event) {
+  protected void handleTestSourceRead(CucumberJvmTestSourceReadEvent event) {
     closeCurrentScenarioOutline();
     pathToDescription.put(event.getUri(), getFeatureName(event.getSource()));
   }
@@ -156,7 +156,7 @@ public class CucumberJvmSMConverter {
     myOut.println(escapeCommand(command, parameters));
   }
 
-  private static String getScenarioName(IdeaTestCase testCase) {
+  private static String getScenarioName(CucumberJvmTestCase testCase) {
     if (testCase.isScenarioOutline()) {
       return SCENARIO_OUTLINE_CAPTION + testCase.getLine();
     }
similarity index 89%
rename from plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/IdeaTestCase.java
rename to plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvmTestCase.java
index a107475cdf0310b637435c18541afc4d94c27e6d..265be764ca80bfa2c289d661838f6ed024ce95a8 100644 (file)
@@ -1,7 +1,7 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.cucumber.java.run;
 
-interface IdeaTestCase {
+public interface CucumberJvmTestCase {
   boolean isScenarioOutline();
   String getUri();
   int getScenarioOutlineLine();
similarity index 78%
rename from plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/IdeaTestSourceReadEvent.java
rename to plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvmTestSourceReadEvent.java
index c323269c856fa764d26a6d55acdc4ee9d093e6e3..0a2bb27df3131377b0294340a866efe8152b86f4 100644 (file)
@@ -1,12 +1,12 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.cucumber.java.run;
 
-public class IdeaTestSourceReadEvent {
+public class CucumberJvmTestSourceReadEvent {
   private final String myUri;
 
   private final String mySource;
 
-  public IdeaTestSourceReadEvent(String uri, String source) {
+  public CucumberJvmTestSourceReadEvent(String uri, String source) {
     myUri = uri;
     mySource = source;
   }
similarity index 86%
rename from plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/IdeaTestStep.java
rename to plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvmTestStep.java
index b6f5ad132f25da02d7b9c148cb915b2e701e1dc4..0dd23b67c0eb72cbf926d3d9e06ee2da605bce9e 100644 (file)
@@ -1,7 +1,7 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.cucumber.java.run;
 
-interface IdeaTestStep {
+public interface CucumberJvmTestStep {
   String getLocation();
   String getStepName();
 }
similarity index 78%
rename from plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/IdeaTestStepFinishedEvent.java
rename to plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvmTestStepFinishedEvent.java
index 5bd4b6c348bfd843c1ec38f4260546f6e4c7e8a3..efd5a609022cd591cae75140da89bede2ceedb2b 100644 (file)
@@ -1,9 +1,9 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.cucumber.java.run;
 
-interface IdeaTestStepFinishedEvent {
+public interface CucumberJvmTestStepFinishedEvent {
   enum Status {PASSED, PENDING, SKIPPED, FAILED, }
-  IdeaTestStep getTestStep();
+  CucumberJvmTestStep getTestStep();
   Status getResult();
   Long getDuration();
   String getErrorMessage();
similarity index 78%
rename from plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/IdeaWriteEvent.java
rename to plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvmWriteEvent.java
index 5f61ed2f1a85ecb72dc66b56b9277f6129297206..05ef73691d7ca01baa8bc8895e746150c03e862a 100644 (file)
@@ -1,10 +1,10 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.cucumber.java.run;
 
-public class IdeaWriteEvent {
+public class CucumberJvmWriteEvent {
   private final String myText;
 
-  public IdeaWriteEvent(String text) {
+  public CucumberJvmWriteEvent(String text) {
     myText = text;
   }
 
index 4e257f3ee42ef34561db6e43d01472550e120d85..6c8e56cacfd0bb7712d862c81ab476f32a8ce903 100644 (file)
@@ -14,17 +14,17 @@ import java.lang.reflect.Method;
 import static org.jetbrains.plugins.cucumber.java.run.CucumberJvmSMFormatterUtil.FILE_RESOURCE_PREFIX;
 
 public class CucumberJvm3Adapter {
-  public static class IdeaTestStepFinishedEvent implements org.jetbrains.plugins.cucumber.java.run.IdeaTestStepFinishedEvent {
-    private final IdeaTestStep myTestStep;
+  public static class CucumberJvmTestStepFinishedEvent implements org.jetbrains.plugins.cucumber.java.run.CucumberJvmTestStepFinishedEvent {
+    private final CucumberJvmTestStep myTestStep;
     private final TestStepFinished myRealEvent;
 
-    public IdeaTestStepFinishedEvent(TestStepFinished testStepFinished) {
-      myTestStep = new IdeaTestStep(testStepFinished.testStep);
+    public CucumberJvmTestStepFinishedEvent(TestStepFinished testStepFinished) {
+      myTestStep = new CucumberJvmTestStep(testStepFinished.testStep);
       myRealEvent = testStepFinished;
     }
 
     @Override
-    public org.jetbrains.plugins.cucumber.java.run.IdeaTestStep getTestStep() {
+    public org.jetbrains.plugins.cucumber.java.run.CucumberJvmTestStep getTestStep() {
       return myTestStep;
     }
 
@@ -49,10 +49,10 @@ public class CucumberJvm3Adapter {
     }
   }
 
-  public static class IdeaTestCase implements org.jetbrains.plugins.cucumber.java.run.IdeaTestCase {
+  public static class CucumberJvmTestCase implements org.jetbrains.plugins.cucumber.java.run.CucumberJvmTestCase {
     private final TestCase myRealTestCase;
 
-    IdeaTestCase(TestCase realTestCase) {
+    CucumberJvmTestCase(TestCase realTestCase) {
       myRealTestCase = realTestCase;
     }
 
@@ -87,10 +87,10 @@ public class CucumberJvm3Adapter {
     }
   }
 
-  public static class IdeaTestStep implements org.jetbrains.plugins.cucumber.java.run.IdeaTestStep {
+  public static class CucumberJvmTestStep implements org.jetbrains.plugins.cucumber.java.run.CucumberJvmTestStep {
     private final TestStep myRealStep;
 
-    public IdeaTestStep(TestStep realStep) {
+    public CucumberJvmTestStep(TestStep realStep) {
       myRealStep = realStep;
     }
 
index ebbf6543a32a6bb4b613615ccc52ca951fe7cf27..31c9dbe9659efd868fe3f2531a8f3dfeff8dc245 100644 (file)
@@ -12,14 +12,14 @@ public class CucumberJvm3SMFormatter extends CucumberJvmSMConverter implements F
   private final EventHandler<TestCaseStarted> testCaseStartedHandler = new EventHandler<TestCaseStarted>() {
     @Override
     public void receive(TestCaseStarted event) {
-      CucumberJvm3SMFormatter.this.handleTestCaseStarted(new CucumberJvm3Adapter.IdeaTestCase(event.testCase));
+      CucumberJvm3SMFormatter.this.handleTestCaseStarted(new CucumberJvm3Adapter.CucumberJvmTestCase(event.testCase));
     }
   };
 
   private final EventHandler<TestCaseFinished> testCaseFinishedHandler = new EventHandler<TestCaseFinished>() {
     @Override
     public void receive(TestCaseFinished event) {
-      handleTestCaseFinished(new CucumberJvm3Adapter.IdeaTestCase(event.testCase));
+      handleTestCaseFinished(new CucumberJvm3Adapter.CucumberJvmTestCase(event.testCase));
     }
   };
 
@@ -33,28 +33,28 @@ public class CucumberJvm3SMFormatter extends CucumberJvmSMConverter implements F
   private final EventHandler<WriteEvent> writeEventHandler = new EventHandler<WriteEvent>() {
     @Override
     public void receive(WriteEvent event) {
-      CucumberJvm3SMFormatter.this.handleWriteEvent(new IdeaWriteEvent(event.text));
+      CucumberJvm3SMFormatter.this.handleWriteEvent(new CucumberJvmWriteEvent(event.text));
     }
   };
 
   private final EventHandler<TestStepStarted> testStepStartedHandler = new EventHandler<TestStepStarted>() {
     @Override
     public void receive(TestStepStarted event) {
-      handleTestStepStarted(new CucumberJvm3Adapter.IdeaTestStep(event.testStep));
+      handleTestStepStarted(new CucumberJvm3Adapter.CucumberJvmTestStep(event.testStep));
     }
   };
 
   private final EventHandler<TestStepFinished> testStepFinishedHandler = new EventHandler<TestStepFinished>() {
     @Override
     public void receive(TestStepFinished event) {
-      handleTestStepFinished(new CucumberJvm3Adapter.IdeaTestStepFinishedEvent(event));
+      handleTestStepFinished(new CucumberJvm3Adapter.CucumberJvmTestStepFinishedEvent(event));
     }
   };
 
   private final EventHandler<TestSourceRead> testSourceReadHandler = new EventHandler<TestSourceRead>() {
     @Override
     public void receive(TestSourceRead event) {
-      CucumberJvm3SMFormatter.this.handleTestSourceRead(new IdeaTestSourceReadEvent(event.uri, event.source));
+      CucumberJvm3SMFormatter.this.handleTestSourceRead(new CucumberJvmTestSourceReadEvent(event.uri, event.source));
     }
   };
 
index f047f9b2b7288aaf226a3a9d5b9065b861b6e7a2..b760f7d004ff60ce091d361e9d85777899280844 100644 (file)
@@ -10,17 +10,17 @@ import java.lang.reflect.Method;
 import static org.jetbrains.plugins.cucumber.java.run.CucumberJvmSMFormatterUtil.FILE_RESOURCE_PREFIX;
 
 public class CucumberJvm5Adapter {
-  public static class IdeaTestStepFinishedEvent implements org.jetbrains.plugins.cucumber.java.run.IdeaTestStepFinishedEvent {
-    private final IdeaTestStep myTestStep;
+  public static class CucumberJvmTestStepFinishedEvent implements org.jetbrains.plugins.cucumber.java.run.CucumberJvmTestStepFinishedEvent {
+    private final CucumberJvmTestStep myTestStep;
     private final TestStepFinished myRealEvent;
 
-    public IdeaTestStepFinishedEvent(TestStepFinished testStepFinished) {
-      myTestStep = new IdeaTestStep(testStepFinished.getTestStep());
+    public CucumberJvmTestStepFinishedEvent(TestStepFinished testStepFinished) {
+      myTestStep = new CucumberJvmTestStep(testStepFinished.getTestStep());
       myRealEvent = testStepFinished;
     }
 
     @Override
-    public org.jetbrains.plugins.cucumber.java.run.IdeaTestStep getTestStep() {
+    public org.jetbrains.plugins.cucumber.java.run.CucumberJvmTestStep getTestStep() {
       return myTestStep;
     }
 
@@ -47,10 +47,10 @@ public class CucumberJvm5Adapter {
     }
   }
 
-  public static class IdeaTestCase implements org.jetbrains.plugins.cucumber.java.run.IdeaTestCase {
+  public static class CucumberJvmTestCase implements org.jetbrains.plugins.cucumber.java.run.CucumberJvmTestCase {
     private final TestCase myRealTestCase;
 
-    IdeaTestCase(TestCase realTestCase) {
+    CucumberJvmTestCase(TestCase realTestCase) {
       myRealTestCase = realTestCase;
     }
 
@@ -85,10 +85,10 @@ public class CucumberJvm5Adapter {
     }
   }
 
-  public static class IdeaTestStep implements org.jetbrains.plugins.cucumber.java.run.IdeaTestStep {
+  public static class CucumberJvmTestStep implements org.jetbrains.plugins.cucumber.java.run.CucumberJvmTestStep {
     private final TestStep myRealStep;
 
-    public IdeaTestStep(TestStep realStep) {
+    public CucumberJvmTestStep(TestStep realStep) {
       myRealStep = realStep;
     }
 
index 6c9a0eaf721e92dc71223bfbd191130733659ae3..13cb8d4f4b6fd020aee2b7e40ac47f97ecf9e829 100644 (file)
@@ -20,14 +20,14 @@ public class CucumberJvm5SMFormatter extends CucumberJvmSMConverter implements C
   private final EventHandler<TestCaseStarted> testCaseStartedHandler = new EventHandler<TestCaseStarted>() {
     @Override
     public void receive(TestCaseStarted event) {
-      CucumberJvm5SMFormatter.this.handleTestCaseStarted(new CucumberJvm5Adapter.IdeaTestCase(event.getTestCase()));
+      CucumberJvm5SMFormatter.this.handleTestCaseStarted(new CucumberJvm5Adapter.CucumberJvmTestCase(event.getTestCase()));
     }
   };
 
   private final EventHandler<TestCaseFinished> testCaseFinishedHandler = new EventHandler<TestCaseFinished>() {
     @Override
     public void receive(TestCaseFinished event) {
-      handleTestCaseFinished(new CucumberJvm5Adapter.IdeaTestCase(event.getTestCase()));
+      handleTestCaseFinished(new CucumberJvm5Adapter.CucumberJvmTestCase(event.getTestCase()));
     }
   };
 
@@ -41,21 +41,21 @@ public class CucumberJvm5SMFormatter extends CucumberJvmSMConverter implements C
   private final EventHandler<WriteEvent> writeEventHandler = new EventHandler<WriteEvent>() {
     @Override
     public void receive(WriteEvent event) {
-      CucumberJvm5SMFormatter.this.handleWriteEvent(new IdeaWriteEvent(event.getText()));
+      CucumberJvm5SMFormatter.this.handleWriteEvent(new CucumberJvmWriteEvent(event.getText()));
     }
   };
 
   private final EventHandler<TestStepStarted> testStepStartedHandler = new EventHandler<TestStepStarted>() {
     @Override
     public void receive(TestStepStarted event) {
-      handleTestStepStarted(new CucumberJvm5Adapter.IdeaTestStep(event.getTestStep()));
+      handleTestStepStarted(new CucumberJvm5Adapter.CucumberJvmTestStep(event.getTestStep()));
     }
   };
 
   private final EventHandler<TestStepFinished> testStepFinishedHandler = new EventHandler<TestStepFinished>() {
     @Override
     public void receive(TestStepFinished event) {
-      handleTestStepFinished(new CucumberJvm5Adapter.IdeaTestStepFinishedEvent(event));
+      handleTestStepFinished(new CucumberJvm5Adapter.CucumberJvmTestStepFinishedEvent(event));
     }
   };
 
@@ -63,7 +63,7 @@ public class CucumberJvm5SMFormatter extends CucumberJvmSMConverter implements C
     @Override
     public void receive(TestSourceRead event) {
       CucumberJvm5SMFormatter.this
-        .handleTestSourceRead(new IdeaTestSourceReadEvent(event.getUri().getPath(), event.getSource()));
+        .handleTestSourceRead(new CucumberJvmTestSourceReadEvent(event.getUri().getPath(), event.getSource()));
     }
   };