Rearrange unit and integration tests

valfirst · Feb 20, 2019 · f8d201c · f8d201c
1 parent 69879eb
commit f8d201c
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 28 deletions.
diff --git a/.../JUnitReportingRunnerIntegrationTest.java → .../JUnitReportingRunnerIntegrationTest.java b/.../JUnitReportingRunnerIntegrationTest.java → .../JUnitReportingRunnerIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.github.valfirst.jbehave.junit.monitoring.suite;
+package com.github.valfirst.jbehave.junit.monitoring;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
@@ -18,9 +18,9 @@
 import org.junit.runners.Parameterized.Parameters;
 import org.mockito.Mock;
 
-import com.github.valfirst.jbehave.junit.monitoring.ExampleScenarioJUnitStories;
-import com.github.valfirst.jbehave.junit.monitoring.ExampleScenarioJUnitStoriesLocalized;
-import com.github.valfirst.jbehave.junit.monitoring.ExampleScenarioJUnitStory;
+import com.github.valfirst.jbehave.junit.monitoring.story.ExampleScenarioJUnitStories;
+import com.github.valfirst.jbehave.junit.monitoring.story.ExampleScenarioJUnitStoriesLocalized;
+import com.github.valfirst.jbehave.junit.monitoring.story.ExampleScenarioJUnitStory;
 import com.github.valfirst.jbehave.junit.monitoring.JUnitReportingRunner;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;

diff --git a/...nitoring/ExampleScenarioJUnitStories.java → ...ng/story/ExampleScenarioJUnitStories.java b/...nitoring/ExampleScenarioJUnitStories.java → ...ng/story/ExampleScenarioJUnitStories.java
@@ -1,4 +1,4 @@
-package com.github.valfirst.jbehave.junit.monitoring;
+package com.github.valfirst.jbehave.junit.monitoring.story;
 
 import java.util.Arrays;
 import java.util.List;
@@ -10,6 +10,7 @@
 import org.jbehave.core.steps.InstanceStepsFactory;
 import org.junit.runner.RunWith;
 
+import com.github.valfirst.jbehave.junit.monitoring.JUnitReportingRunner;
 import com.github.valfirst.jbehave.junit.monitoring.step.ExampleSteps;
 
 @RunWith(JUnitReportingRunner.class)
@@ -31,8 +32,8 @@ public Configuration configuration() {
 
 	@Override
 	protected List<String> storyPaths() {
-		return Arrays.asList("com/github/valfirst/jbehave/junit/monitoring/Multiplication.story",
-				"com/github/valfirst/jbehave/junit/monitoring/Empty.story");
+		return Arrays.asList("com/github/valfirst/jbehave/junit/monitoring/story/Multiplication.story",
+				"com/github/valfirst/jbehave/junit/monitoring/story/Empty.story");
 	}
 
 }
diff --git a/...ExampleScenarioJUnitStoriesLocalized.java → ...ExampleScenarioJUnitStoriesLocalized.java b/...ExampleScenarioJUnitStoriesLocalized.java → ...ExampleScenarioJUnitStoriesLocalized.java
@@ -1,16 +1,19 @@
-package com.github.valfirst.jbehave.junit.monitoring;
+package com.github.valfirst.jbehave.junit.monitoring.story;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
+import com.github.valfirst.jbehave.junit.monitoring.JUnitReportingRunner;
+
 import org.jbehave.core.configuration.Configuration;
 import org.jbehave.core.i18n.LocalizedKeywords;
 import org.jbehave.core.parsers.RegexStoryParser;
 import org.junit.runner.RunWith;
 
 @RunWith(JUnitReportingRunner.class)
-public class ExampleScenarioJUnitStoriesLocalized extends ExampleScenarioJUnitStories {
+public class ExampleScenarioJUnitStoriesLocalized extends ExampleScenarioJUnitStories
+{
 
 	@Override
 	public Configuration configuration() {
@@ -25,6 +28,6 @@ public Configuration configuration() {
 
 	@Override
 	protected List<String> storyPaths() {
-		return Collections.singletonList("com/github/valfirst/jbehave/junit/monitoring/Multiplication_de.story");
+		return Collections.singletonList("com/github/valfirst/jbehave/junit/monitoring/story/Multiplication_de.story");
 	}
 }
diff --git a/...monitoring/ExampleScenarioJUnitStory.java → ...ring/story/ExampleScenarioJUnitStory.java b/...monitoring/ExampleScenarioJUnitStory.java → ...ring/story/ExampleScenarioJUnitStory.java
@@ -1,5 +1,6 @@
-package com.github.valfirst.jbehave.junit.monitoring;
+package com.github.valfirst.jbehave.junit.monitoring.story;
 
+import com.github.valfirst.jbehave.junit.monitoring.JUnitReportingRunner;
 import com.github.valfirst.jbehave.junit.monitoring.step.ExampleSteps;
 import org.jbehave.core.configuration.Configuration;
 import org.jbehave.core.configuration.MostUsefulConfiguration;

diff --git a/...rioAndSecondScenarioPassesJUnitStory.java → ...rioAndSecondScenarioPassesJUnitStory.java b/...rioAndSecondScenarioPassesJUnitStory.java → ...rioAndSecondScenarioPassesJUnitStory.java
@@ -1,5 +1,6 @@
-package com.github.valfirst.jbehave.junit.monitoring;
+package com.github.valfirst.jbehave.junit.monitoring.story;
 
+import com.github.valfirst.jbehave.junit.monitoring.JUnitReportingRunner;
 import com.github.valfirst.jbehave.junit.monitoring.step.ExampleSteps;
 import org.jbehave.core.configuration.Configuration;
 import org.jbehave.core.configuration.MostUsefulConfiguration;

diff --git a/...oring/FailedStepInScenarioJUnitStory.java → ...story/FailedStepInScenarioJUnitStory.java b/...oring/FailedStepInScenarioJUnitStory.java → ...story/FailedStepInScenarioJUnitStory.java
@@ -1,5 +1,6 @@
-package com.github.valfirst.jbehave.junit.monitoring;
+package com.github.valfirst.jbehave.junit.monitoring.story;
 
+import com.github.valfirst.jbehave.junit.monitoring.JUnitReportingRunner;
 import com.github.valfirst.jbehave.junit.monitoring.step.ExampleSteps;
 import org.jbehave.core.configuration.Configuration;
 import org.jbehave.core.configuration.MostUsefulConfiguration;

diff --git a/...itoring/FilteredOutScenariosNotStory.java → ...g/story/FilteredOutScenariosNotStory.java b/...itoring/FilteredOutScenariosNotStory.java → ...g/story/FilteredOutScenariosNotStory.java
@@ -1,7 +1,8 @@
-package com.github.valfirst.jbehave.junit.monitoring;
+package com.github.valfirst.jbehave.junit.monitoring.story;
 
 import java.util.Arrays;
 
+import com.github.valfirst.jbehave.junit.monitoring.JUnitReportingRunner;
 import com.github.valfirst.jbehave.junit.monitoring.step.ExampleSteps;
 
 import org.jbehave.core.configuration.Configuration;

diff --git a/...e/junit/monitoring/suite/MathStories.java → ...e/junit/monitoring/story/MathStories.java b/...e/junit/monitoring/suite/MathStories.java → ...e/junit/monitoring/story/MathStories.java
@@ -1,4 +1,4 @@
-package com.github.valfirst.jbehave.junit.monitoring.suite;
+package com.github.valfirst.jbehave.junit.monitoring.story;
 
 import java.util.Collections;
 import java.util.List;
@@ -46,7 +46,7 @@ public InjectableStepsFactory stepsFactory() {
 
 	@Override
 	protected List<String> storyPaths() {
-		return Collections.singletonList("com/github/valfirst/jbehave/junit/monitoring/Multiplication.story");
+		return Collections.singletonList("com/github/valfirst/jbehave/junit/monitoring/story/Multiplication.story");
 	}
 
 }
diff --git a/...dScenariosAsIgnoredAndNotPassedStory.java → ...dScenariosAsIgnoredAndNotPassedStory.java b/...dScenariosAsIgnoredAndNotPassedStory.java → ...dScenariosAsIgnoredAndNotPassedStory.java
@@ -1,5 +1,6 @@
-package com.github.valfirst.jbehave.junit.monitoring;
+package com.github.valfirst.jbehave.junit.monitoring.story;
 
+import com.github.valfirst.jbehave.junit.monitoring.JUnitReportingRunner;
 import com.github.valfirst.jbehave.junit.monitoring.step.ExampleSteps;
 import org.jbehave.core.configuration.Configuration;
 import org.jbehave.core.configuration.MostUsefulConfiguration;

diff --git a/.../StoriesWithAllSortsOfBeforeAndAfter.java → .../StoriesWithAllSortsOfBeforeAndAfter.java b/.../StoriesWithAllSortsOfBeforeAndAfter.java → .../StoriesWithAllSortsOfBeforeAndAfter.java
@@ -1,4 +1,4 @@
-package com.github.valfirst.jbehave.junit.monitoring.suite;
+package com.github.valfirst.jbehave.junit.monitoring.story;
 
 import java.util.Collections;
 import java.util.List;
@@ -72,6 +72,6 @@ public InjectableStepsFactory stepsFactory() {
 	@Override
 	protected List<String> storyPaths() {
 		return Collections.singletonList(
-				"com/github/valfirst/jbehave/junit/monitoring/MultiplicationWithExamplesAndGiven.story");
+				"com/github/valfirst/jbehave/junit/monitoring/story/MultiplicationWithExamplesAndGiven.story");
 	}
 }
diff --git a/...irst/jbehave/junit/monitoring/Empty.story → ...behave/junit/monitoring/story/Empty.story b/...irst/jbehave/junit/monitoring/Empty.story → ...behave/junit/monitoring/story/Empty.story
diff --git a/.../jbehave/junit/monitoring/Greetings.story → ...ve/junit/monitoring/story/Greetings.story b/.../jbehave/junit/monitoring/Greetings.story → ...ve/junit/monitoring/story/Greetings.story
diff --git a/...ring/GreetingsFromExtraterrestrials.story → ...tory/GreetingsFromExtraterrestrials.story b/...ring/GreetingsFromExtraterrestrials.story → ...tory/GreetingsFromExtraterrestrials.story
@@ -1,4 +1,4 @@
-GivenStories: com/github/valfirst/jbehave/junit/monitoring/Greetings.story
+GivenStories: com/github/valfirst/jbehave/junit/monitoring/story/Greetings.story
 
 Scenario: Greetings from Extraterrestrials to Earthlings
 

diff --git a/...first/jbehave/junit/monitoring/Init.story → ...jbehave/junit/monitoring/story/Init.story b/...first/jbehave/junit/monitoring/Init.story → ...jbehave/junit/monitoring/story/Init.story
diff --git a/...ave/junit/monitoring/Multiplication.story → ...nit/monitoring/story/Multiplication.story b/...ave/junit/monitoring/Multiplication.story → ...nit/monitoring/story/Multiplication.story
diff --git a/.../MultiplicationWithExamplesAndGiven.story → .../MultiplicationWithExamplesAndGiven.story b/.../MultiplicationWithExamplesAndGiven.story → .../MultiplicationWithExamplesAndGiven.story
@@ -28,27 +28,27 @@ Examples:
 
 Scenario: 2 x 3 success with given stories
 
-GivenStories: 	com/github/valfirst/jbehave/junit/monitoring/Init.story,
-				com/github/valfirst/jbehave/junit/monitoring/Greetings.story,
-				com/github/valfirst/jbehave/junit/monitoring/GreetingsFromExtraterrestrials.story
+GivenStories: 	com/github/valfirst/jbehave/junit/monitoring/story/Init.story,
+				com/github/valfirst/jbehave/junit/monitoring/story/Greetings.story,
+				com/github/valfirst/jbehave/junit/monitoring/story/GreetingsFromExtraterrestrials.story
 
 Given a variable x with value 3
 When I multiply x by 2
 Then x should equal 6
 
 Scenario: 2 x 3 fail with given stories
 
-GivenStories: 	com/github/valfirst/jbehave/junit/monitoring/Init.story,
-				com/github/valfirst/jbehave/junit/monitoring/Greetings.story
+GivenStories: 	com/github/valfirst/jbehave/junit/monitoring/story/Init.story,
+				com/github/valfirst/jbehave/junit/monitoring/story/Greetings.story
 
 Given a variable x with value 3
 When I multiply x by 2
 Then x should equal 7
 
 Scenario: parameterized given stories
 
-GivenStories: 	com/github/valfirst/jbehave/junit/monitoring/ParameterizedGreetings.story#{0},
-				com/github/valfirst/jbehave/junit/monitoring/ParameterizedGreetings.story#{1}
+GivenStories: 	com/github/valfirst/jbehave/junit/monitoring/story/ParameterizedGreetings.story#{0},
+				com/github/valfirst/jbehave/junit/monitoring/story/ParameterizedGreetings.story#{1}
 
 Given a Greeting to Parameterized Stories
 And a Greeting to <name>
@@ -64,7 +64,7 @@ Examples:
 
 Scenario: non-parameterized given stories with example tables
 
-GivenStories: 	com/github/valfirst/jbehave/junit/monitoring/Greetings.story
+GivenStories: 	com/github/valfirst/jbehave/junit/monitoring/story/Greetings.story
 
 Given a Greeting to Parameterized Stories
 And a Greeting to <name>

diff --git a/.../junit/monitoring/Multiplication_de.story → .../monitoring/story/Multiplication_de.story b/.../junit/monitoring/Multiplication_de.story → .../monitoring/story/Multiplication_de.story
diff --git a/...t/monitoring/ParameterizedGreetings.story → ...toring/story/ParameterizedGreetings.story b/...t/monitoring/ParameterizedGreetings.story → ...toring/story/ParameterizedGreetings.story
diff --git a/...oring/example_scenario_j_unit_story.story → ...story/example_scenario_j_unit_story.story b/...oring/example_scenario_j_unit_story.story → ...story/example_scenario_j_unit_story.story
diff --git a/...second_scenario_passes_j_unit_story.story → ...second_scenario_passes_j_unit_story.story b/...second_scenario_passes_j_unit_story.story → ...second_scenario_passes_j_unit_story.story
diff --git a/...ailed_step_in_scenario_j_unit_story.story → ...ailed_step_in_scenario_j_unit_story.story b/...ailed_step_in_scenario_j_unit_story.story → ...ailed_step_in_scenario_j_unit_story.story
diff --git a/...ng/filtered_out_scenarios_not_story.story → ...ry/filtered_out_scenarios_not_story.story b/...ng/filtered_out_scenarios_not_story.story → ...ry/filtered_out_scenarios_not_story.story
diff --git a/...ios_as_ignored_and_not_passed_story.story → ...ios_as_ignored_and_not_passed_story.story b/...ios_as_ignored_and_not_passed_story.story → ...ios_as_ignored_and_not_passed_story.story