From c0aef6faf860c130d46c6571cc503aafdea68782 Mon Sep 17 00:00:00 2001 From: Valery Yatsynovich Date: Fri, 20 Nov 2020 23:50:35 +0300 Subject: [PATCH] Switch to use non-deprecated API in unit tests --- .../JUnitDescriptionGeneratorTest.java | 2 +- .../JUnitReportingRunnerIntegrationTest.java | 2 +- .../monitoring/JUnitReportingRunnerTest.java | 7 +------ .../monitoring/JUnitScenarioReporterTest.java | 6 +++--- .../monitoring/StoryPathsExtractorTest.java | 17 ++++++----------- 5 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitDescriptionGeneratorTest.java b/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitDescriptionGeneratorTest.java index 4fb96cb2..5c03ca81 100644 --- a/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitDescriptionGeneratorTest.java +++ b/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitDescriptionGeneratorTest.java @@ -2,6 +2,7 @@ import static java.util.Arrays.asList; import static org.hamcrest.CoreMatchers.everyItem; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasProperty; @@ -10,7 +11,6 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; diff --git a/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitReportingRunnerIntegrationTest.java b/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitReportingRunnerIntegrationTest.java index 41c3961a..2cd11ae5 100644 --- a/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitReportingRunnerIntegrationTest.java +++ b/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitReportingRunnerIntegrationTest.java @@ -1,7 +1,7 @@ package com.github.valfirst.jbehave.junit.monitoring; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import java.util.Arrays; diff --git a/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitReportingRunnerTest.java b/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitReportingRunnerTest.java index 1734f75f..2a2d73ce 100644 --- a/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitReportingRunnerTest.java +++ b/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitReportingRunnerTest.java @@ -1,23 +1,18 @@ package com.github.valfirst.jbehave.junit.monitoring; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.jbehave.core.embedder.Embedder; import org.jbehave.core.embedder.EmbedderControls; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.mockito.Mockito; public class JUnitReportingRunnerTest { - @Rule - public final ExpectedException expectedException = ExpectedException.none(); - @Test public void shouldPrepareEmbedder() { EmbedderControls ec = mock(EmbedderControls.class); diff --git a/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitScenarioReporterTest.java b/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitScenarioReporterTest.java index e5966329..c9d812ad 100644 --- a/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitScenarioReporterTest.java +++ b/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitScenarioReporterTest.java @@ -1,10 +1,10 @@ package com.github.valfirst.jbehave.junit.monitoring; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import java.util.Collections; @@ -303,7 +303,7 @@ public void shouldNotNotifySubStepWithoutBeforeAction() { reporter = new JUnitScenarioReporter(notifier, 1, rootDescription, keywords); reportStepSuccess(reporter); - verifyZeroInteractions(notifier); + verifyNoInteractions(notifier); } @Test diff --git a/src/test/java/com/github/valfirst/jbehave/junit/monitoring/StoryPathsExtractorTest.java b/src/test/java/com/github/valfirst/jbehave/junit/monitoring/StoryPathsExtractorTest.java index 8c00e7c9..ccf9ef6a 100644 --- a/src/test/java/com/github/valfirst/jbehave/junit/monitoring/StoryPathsExtractorTest.java +++ b/src/test/java/com/github/valfirst/jbehave/junit/monitoring/StoryPathsExtractorTest.java @@ -1,7 +1,7 @@ package com.github.valfirst.jbehave.junit.monitoring; -import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -16,17 +16,12 @@ import org.jbehave.core.io.StoryPathResolver; import org.jbehave.core.junit.JUnitStories; import org.jbehave.core.junit.JUnitStory; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; public class StoryPathsExtractorTest { private static final List JUNIT_STORIES_PATHS = Arrays.asList("/path/story1.story", "/path/story2.story"); - @Rule - public final ExpectedException expectedException = ExpectedException.none(); - @Test public void shouldExtractStoryPathsFromJUnitStory() throws ReflectiveOperationException { TestJUnitStory testJUnitStory = new TestJUnitStory(); @@ -52,11 +47,11 @@ public void shouldExtractStoryPathsFromJUnitStoriesChild() throws ReflectiveOper } @Test - public void shouldThrowExceptionWhenTypeOfConfigurableEmbedderIsUnknown() throws ReflectiveOperationException { - expectedException.expect(IllegalArgumentException.class); - expectedException.expectMessage( - equalTo("Only ConfigurableEmbedder of types JUnitStory and JUnitStories is supported")); - new StoryPathsExtractor(new TestConfigurableEmbedder()).getStoryPaths(); + public void shouldThrowExceptionWhenTypeOfConfigurableEmbedderIsUnknown() { + IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, + () -> new StoryPathsExtractor(new TestConfigurableEmbedder()).getStoryPaths()); + assertEquals("Only ConfigurableEmbedder of types JUnitStory and JUnitStories is supported", + exception.getMessage()); } public static class TestJUnitStory extends JUnitStory {