Migrate from easymock to mockito Change-Id: I67cf4717479e560467432829968148bfb1045202
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacadeTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacadeTest.java index 5ebfa10..d448204 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacadeTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacadeTest.java
@@ -13,7 +13,8 @@ // limitations under the License. package com.googlesource.gerrit.plugins.its.storyboard; -import static org.easymock.EasyMock.expect; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import com.google.gerrit.extensions.annotations.PluginName; import com.google.gerrit.extensions.config.FactoryModule; @@ -30,8 +31,6 @@ public void testCreateLinkForWebUiDifferentUrlAndText() { mockUnconnectableStoryboard(); - replayMocks(); - StoryboardItsFacade itsFacade = createStoryboardItsFacade(); String actual = itsFacade.createLinkForWebui("Test-Url", "Test-Text"); @@ -41,8 +40,6 @@ public void testCreateLinkForWebUiSameUrlAndText() { mockUnconnectableStoryboard(); - replayMocks(); - StoryboardItsFacade itsFacade = createStoryboardItsFacade(); String actual = itsFacade.createLinkForWebui("Test-Url", "Test-Url"); @@ -52,8 +49,6 @@ public void testCreateLinkForWebUiNullText() { mockUnconnectableStoryboard(); - replayMocks(); - StoryboardItsFacade itsFacade = createStoryboardItsFacade(); String actual = itsFacade.createLinkForWebui("Test-Url", null); @@ -63,8 +58,6 @@ public void testCreateLinkForWebUiEmptyText() { mockUnconnectableStoryboard(); - replayMocks(); - StoryboardItsFacade itsFacade = createStoryboardItsFacade(); String actual = itsFacade.createLinkForWebui("Test-Url", ""); @@ -76,8 +69,8 @@ } private void mockUnconnectableStoryboard() { - expect(serverConfig.getString("its-storyboard", null, "url")).andReturn("<no-url>").anyTimes(); - expect(serverConfig.getString("its-storyboard", null, "password")).andReturn("none").anyTimes(); + when(serverConfig.getString("its-storyboard", null, "url")).thenReturn("<no-url>"); + when(serverConfig.getString("its-storyboard", null, "password")).thenReturn("none"); } @Override @@ -90,7 +83,7 @@ private class TestModule extends FactoryModule { @Override protected void configure() { - serverConfig = createMock(Config.class); + serverConfig = mock(Config.class); bind(Config.class).annotatedWith(GerritServerConfig.class).toInstance(serverConfig); bind(String.class).annotatedWith(PluginName.class).toInstance("its-storyboard"); }