Changes according to code review

Author: Dmytro Chyzhykov

pom.xml

@@ -33,6 +33,7 @@
         <rhino.version>1.7R4</rhino.version>
         <ioke.version>P-0.4.0-p11</ioke.version>
         <jsoup.version>1.7.2</jsoup.version>
+        <testng.version>6.8.5</testng.version>
         <junit.version>4.11</junit.version>
         <jython.version>2.5.3</jython.version>
         <mockito.version>1.9.5</mockito.version>
@@ -277,6 +278,11 @@
                 <artifactId>junit</artifactId>
                 <version>${junit.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>${testng.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.python</groupId>
                 <artifactId>jython-standalone</artifactId>
@@ -380,6 +386,7 @@
         <module>openejb</module>
         <module>scala</module>
         <module>scala/scala_previous</module>
+        <module>testng</module>
     </modules>
 
     <profiles>

testng/src/main/java/cucumber/api/testng/AbstractTestNGCucumberTests.java

@@ -1,5 +1,6 @@
 package cucumber.api.testng;
 
+import cucumber.runtime.CucumberException;
 import cucumber.runtime.Runtime;
 import cucumber.runtime.RuntimeOptions;
 import cucumber.runtime.io.MultiLoader;
@@ -11,10 +12,10 @@
 import org.testng.annotations.Test;
 
 public abstract class AbstractTestNGCucumberTests implements IHookable {
-    private TestNgReporter reporter;
-    private Runtime runtime;
-    private ClassLoader classLoader;
-    private ResourceLoader resourceLoader;
+    private final TestNgReporter reporter;
+    private final Runtime runtime;
+    private final ClassLoader classLoader;
+    private final ResourceLoader resourceLoader;
 
     public AbstractTestNGCucumberTests() {
         classLoader = getClass().getClassLoader();
@@ -24,7 +25,7 @@ public AbstractTestNGCucumberTests() {
         RuntimeOptions runtimeOptions = runtimeOptionsFactory.create();
 
         reporter = new TestNgReporter(System.out);
-        runtimeOptions.formatters.add(reporter);
+        runtimeOptions.getFormatters().add(reporter);
         runtime = new Runtime(resourceLoader, classLoader, runtimeOptions);
     }
 
@@ -33,7 +34,7 @@ public void run_cukes() {
         runtime.run();
 
         if (!runtime.getErrors().isEmpty()) {
-            throw new RuntimeException(runtime.getErrors().get(0));
+            throw new CucumberException(runtime.getErrors().get(0));
         }
     }
 

testng/src/main/java/cucumber/api/testng/TestNgReporter.java

@@ -15,33 +15,28 @@
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.testng.Reporter.getCurrentTestResult;
 import static org.testng.Reporter.log;
 
 public class TestNgReporter implements Formatter, Reporter {
-
     private final NiceAppendable out;
-
-    private AtomicInteger failureCount = new AtomicInteger(0);
-    private AtomicInteger skipCount = new AtomicInteger(0);
-    private AtomicInteger passCount = new AtomicInteger(0);
-
-    private LinkedList<Step> steps = new LinkedList<Step>();
+    private final LinkedList<Step> steps = new LinkedList<Step>();
 
     public TestNgReporter(Appendable appendable) {
         out = new NiceAppendable(appendable);
     }
 
     @Override
     public void uri(String uri) {
-        logDiv("Feature File: " + uri, "featureFile");
+        // TODO: find an appropriate keyword
+        String keyword = "Feature File";
+        logDiv(keyword, uri, "featureFile");
     }
 
     @Override
     public void feature(Feature feature) {
-        logDiv("Feature: " + feature.getName(), "feature");
+        logDiv(feature.getKeyword(), feature.getName(), "feature");
     }
 
     @Override
@@ -50,12 +45,12 @@ public void background(Background background) {
 
     @Override
     public void scenario(Scenario scenario) {
-        logDiv("Scenario: " + scenario.getName(), "scenario");
+        logDiv(scenario.getKeyword(), scenario.getName(), "scenario");
     }
 
     @Override
     public void scenarioOutline(ScenarioOutline scenarioOutline) {
-        logDiv("Scenario Outline: " + scenarioOutline.getName(), "scenarioOutline");
+        logDiv(scenarioOutline.getKeyword(), scenarioOutline.getName(), "scenarioOutline");
     }
 
     @Override
@@ -97,19 +92,14 @@ public void result(Result result) {
             ITestResult tr = getCurrentTestResult();
             tr.setThrowable(result.getError());
             tr.setStatus(ITestResult.FAILURE);
-            failureCount.incrementAndGet();
         } else if (Result.SKIPPED.equals(result)) {
             ITestResult tr = getCurrentTestResult();
             tr.setThrowable(result.getError());
             tr.setStatus(ITestResult.SKIP);
-            skipCount.incrementAndGet();
         } else if (Result.UNDEFINED.equals(result)) {
             ITestResult tr = getCurrentTestResult();
             tr.setThrowable(result.getError());
             tr.setStatus(ITestResult.FAILURE);
-            failureCount.incrementAndGet();
-        } else {
-            passCount.incrementAndGet();
         }
     }
 
@@ -165,4 +155,8 @@ private void logDiv(String message, String cssClassName) {
         log(output);
     }
 
+    private void logDiv(String message, String message2, String cssClassName) {
+        logDiv(message + ": " + message2, cssClassName);
+    }
+
 }