Organize imports and other minor cleanups.

dschneller · May 10, 2012 · da8eca0 · da8eca0
1 parent 719fb8d
commit da8eca0
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 26 deletions.
diff --git a/...ain/java/org/jbehave/scenario/finegrained/junit/monitoring/JUnitDescriptionGenerator.java b/...ain/java/org/jbehave/scenario/finegrained/junit/monitoring/JUnitDescriptionGenerator.java
@@ -1,17 +1,10 @@
 package org.jbehave.scenario.finegrained.junit.monitoring;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
-import java.util.Map.Entry;
 
 import org.jbehave.core.model.ExamplesTable;
-import org.jbehave.core.model.GivenStories;
-import org.jbehave.core.model.GivenStory;
 import org.jbehave.core.model.Scenario;
 import org.jbehave.core.model.Story;
 import org.jbehave.core.steps.CandidateSteps;
@@ -24,12 +17,9 @@ public class JUnitDescriptionGenerator {
 
     private int testCases;
 
-	private final List<CandidateSteps> candidateSteps;
-
 	private List<StepCandidate> allCandidates = new ArrayList<StepCandidate>();
 
     public JUnitDescriptionGenerator(List<CandidateSteps> candidateSteps) {
-		this.candidateSteps = candidateSteps;
 		for (CandidateSteps candidateStep : candidateSteps) {
 			allCandidates.addAll(candidateStep.listCandidates());
 		}

diff --git a/...java/org/jbehave/scenario/finegrained/junit/monitoring/JUnitDescriptionGeneratorTest.java b/...java/org/jbehave/scenario/finegrained/junit/monitoring/JUnitDescriptionGeneratorTest.java
@@ -13,7 +13,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;

diff --git a/...test/java/org/jbehave/scenario/finegrained/junit/monitoring/JUnitReportingRunnerTest.java b/...test/java/org/jbehave/scenario/finegrained/junit/monitoring/JUnitReportingRunnerTest.java
@@ -4,13 +4,9 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.verify;
 
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.matchers.JUnitMatchers;
 import org.junit.runner.Description;
 import org.junit.runner.notification.RunNotifier;
 import org.mockito.Mock;

diff --git a/src/test/java/org/jbehave/scenario/finegrained/junit/monitoring/step/ExampleSteps.java b/src/test/java/org/jbehave/scenario/finegrained/junit/monitoring/step/ExampleSteps.java
@@ -1,10 +1,11 @@
 package org.jbehave.scenario.finegrained.junit.monitoring.step;
 
-import org.jbehave.core.annotations.Alias;
 import org.jbehave.core.annotations.Given;
 import org.jbehave.core.annotations.Named;
 import org.jbehave.core.annotations.Then;
 import org.jbehave.core.annotations.When;
+import org.jbehave.core.model.ExamplesTable;
+import org.jbehave.core.steps.Parameters;
 import org.junit.Assert;
 
 public class ExampleSteps {

diff --git a/src/test/java/org/jbehave/scenario/finegrained/junit/monitoring/step/InitSteps.java b/src/test/java/org/jbehave/scenario/finegrained/junit/monitoring/step/InitSteps.java
@@ -7,12 +7,7 @@
 import org.jbehave.core.annotations.BeforeScenario;
 import org.jbehave.core.annotations.BeforeStories;
 import org.jbehave.core.annotations.BeforeStory;
-import org.jbehave.core.annotations.Given;
-import org.jbehave.core.annotations.Named;
 import org.jbehave.core.annotations.ScenarioType;
-import org.jbehave.core.annotations.Then;
-import org.jbehave.core.annotations.When;
-import org.junit.Assert;
 
 public class InitSteps {
 	@BeforeStories

diff --git a/src/test/java/org/jbehave/scenario/finegrained/junit/monitoring/suite/MathStories.java b/src/test/java/org/jbehave/scenario/finegrained/junit/monitoring/suite/MathStories.java
@@ -10,15 +10,10 @@
 import org.jbehave.core.junit.JUnitStories;
 import org.jbehave.core.steps.InjectableStepsFactory;
 import org.jbehave.core.steps.InstanceStepsFactory;
-import org.jbehave.core.steps.guice.GuiceStepsFactory;
 import org.jbehave.scenario.finegrained.junit.monitoring.JUnitReportingRunner;
 import org.jbehave.scenario.finegrained.junit.monitoring.step.ExampleSteps;
 import org.junit.runner.RunWith;
 
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Scopes;
-
 /**
  * <p>
  * {@link Embeddable} class to run multiple textual stories via JUnit.