diff --git a/ext/easymock/cglib.jar b/ext/easymock/cglib.jar deleted file mode 100644 index e9b17ebf..00000000 Binary files a/ext/easymock/cglib.jar and /dev/null differ diff --git a/ext/easymock/easymock.jar b/ext/easymock/easymock.jar deleted file mode 100755 index 6665bf1f..00000000 Binary files a/ext/easymock/easymock.jar and /dev/null differ diff --git a/ext/easymock/easymockclassextension.jar b/ext/easymock/easymockclassextension.jar deleted file mode 100644 index 6078e763..00000000 Binary files a/ext/easymock/easymockclassextension.jar and /dev/null differ diff --git a/src/net/azib/ipscan/feeders/FeederCreator.java b/src/net/azib/ipscan/feeders/FeederCreator.java index 23d8c01f..f9ae30fa 100644 --- a/src/net/azib/ipscan/feeders/FeederCreator.java +++ b/src/net/azib/ipscan/feeders/FeederCreator.java @@ -36,9 +36,9 @@ public interface FeederCreator { /** * Restores previously serialized settings. - * @param serialized + * @param parts */ - public void unserialize(String[] parts); + public void unserialize(String ... parts); /** * @return labels corresponding to parts during serialization. diff --git a/test/net/azib/ipscan/config/CommandLineProcessorTest.java b/test/net/azib/ipscan/config/CommandLineProcessorTest.java index 62405367..a6ed2d8b 100644 --- a/test/net/azib/ipscan/config/CommandLineProcessorTest.java +++ b/test/net/azib/ipscan/config/CommandLineProcessorTest.java @@ -7,7 +7,7 @@ package net.azib.ipscan.config; import static org.junit.Assert.*; -import static org.easymock.classextension.EasyMock.*; +import static org.mockito.Mockito.*; import java.util.Arrays; import java.util.Collections; @@ -22,7 +22,6 @@ import net.azib.ipscan.feeders.FeederRegistry; import org.junit.Before; import org.junit.Test; - /** * CommandLineProcessorTest * @@ -35,21 +34,20 @@ public class CommandLineProcessorTest { @Before public void prepare() { - feederCreator = createMock(FeederCreator.class); - exporters = createMock(ExporterRegistry.class); + feederCreator = mock(FeederCreator.class); + exporters = mock(ExporterRegistry.class); processor = new CommandLineProcessor(new MockFeederRegistry(feederCreator), exporters); } @Test public void toStringGeneratesUsageHelp() throws Exception { - expect(feederCreator.getFeederId()).andReturn("feeder.range"); - expect(feederCreator.serializePartsLabels()).andReturn(new String[] {"feeder.range.to"}); - Exporter exporter = createMock(Exporter.class); - expect(exporters.iterator()).andReturn(Collections.singleton(exporter).iterator()); - expect(exporter.getFilenameExtension()).andReturn("pdf"); - expect(exporter.getId()).andReturn("exporter.txt"); - replay(feederCreator, exporters, exporter); - + when(feederCreator.getFeederId()).thenReturn("feeder.range"); + when(feederCreator.serializePartsLabels()).thenReturn(new String[] {"feeder.range.to"}); + Exporter exporter = mock(Exporter.class); + when(exporters.iterator()).thenReturn(Collections.singleton(exporter).iterator()); + when(exporter.getFilenameExtension()).thenReturn("pdf"); + when(exporter.getId()).thenReturn("exporter.txt"); + String usage = processor.toString(); assertTrue(usage.contains("-f:range")); assertTrue(usage.contains(Labels.getLabel("feeder.range.to"))); @@ -57,19 +55,15 @@ public class CommandLineProcessorTest { assertTrue(usage.contains("-q")); // assertTrue(usage.contains("-a")); assertTrue(usage.contains("-s")); - - verify(feederCreator, exporters, exporter); } @Test public void minimal() throws Exception { - expect(feederCreator.getFeederId()).andReturn("feeder.feeder"); - expect(feederCreator.serializePartsLabels()).andReturn(new String[] {"1st", "2nd"}); - feederCreator.unserialize(aryEq(new String[] {"arg1", "arg2"})); expectLastCall(); - Exporter txtExporter = createMock(Exporter.class); - expect(exporters.createExporter("file.txt")).andReturn(txtExporter); - replay(feederCreator, exporters); - + when(feederCreator.getFeederId()).thenReturn("feeder.feeder"); + when(feederCreator.serializePartsLabels()).thenReturn(new String[] {"1st", "2nd"}); + Exporter txtExporter = mock(Exporter.class); + when(exporters.createExporter("file.txt")).thenReturn(txtExporter); + processor.parse("-f:feeder", "arg1", "arg2", "-o", "file.txt"); assertEquals(feederCreator, processor.feederCreator); @@ -80,15 +74,13 @@ public class CommandLineProcessorTest { assertFalse(processor.appendToFile); assertTrue("specifying exporter should enable autoStart", processor.autoStart); - verify(feederCreator, exporters); + verify(feederCreator).unserialize(new String[] {"arg1", "arg2"}); } @Test public void options() throws Exception { - expect(feederCreator.getFeederId()).andReturn("feeder.mega"); - expect(feederCreator.serializePartsLabels()).andReturn(new String[0]); - feederCreator.unserialize(aryEq(new String[0])); - replay(feederCreator); + when(feederCreator.getFeederId()).thenReturn("feeder.mega"); + when(feederCreator.serializePartsLabels()).thenReturn(new String[0]); processor.parse("-s", "-f:mega", "-aq"); @@ -97,7 +89,7 @@ public class CommandLineProcessorTest { assertTrue(processor.autoStart); assertTrue(processor.appendToFile); - verify(feederCreator); + verify(feederCreator).unserialize(new String[0]); } @Test(expected=IllegalArgumentException.class) @@ -141,5 +133,4 @@ public class CommandLineProcessorTest { } } - } diff --git a/test/net/azib/ipscan/config/GUIConfigTest.java b/test/net/azib/ipscan/config/GUIConfigTest.java index 9719645c..78901bd2 100755 --- a/test/net/azib/ipscan/config/GUIConfigTest.java +++ b/test/net/azib/ipscan/config/GUIConfigTest.java @@ -3,9 +3,7 @@ */ package net.azib.ipscan.config; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; +import static org.mockito.Mockito.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -67,13 +65,11 @@ public class GUIConfigTest { @Test public void columnWidths() throws Exception { - Fetcher fetcher = createMock(Fetcher.class); - expect(fetcher.getId()).andReturn("fetcher.abc").anyTimes(); - replay(fetcher); - + Fetcher fetcher = mock(Fetcher.class); + when(fetcher.getId()).thenReturn("fetcher.abc"); + config.setColumnWidth(fetcher, 35); assertEquals(35, config.getColumnWidth(fetcher)); assertEquals(35, preferences.getInt("columnWidth." + fetcher.getId(), 0)); } - } diff --git a/test/net/azib/ipscan/core/ScannerDispatcherThreadTest.java b/test/net/azib/ipscan/core/ScannerDispatcherThreadTest.java index 2c13f1dc..72c76916 100644 --- a/test/net/azib/ipscan/core/ScannerDispatcherThreadTest.java +++ b/test/net/azib/ipscan/core/ScannerDispatcherThreadTest.java @@ -5,7 +5,6 @@ */ package net.azib.ipscan.core; -import java.lang.reflect.Method; import java.net.InetAddress; import java.util.Collections; import java.util.concurrent.ThreadPoolExecutor; @@ -17,10 +16,11 @@ import net.azib.ipscan.fetchers.Fetcher; import net.azib.ipscan.fetchers.FetcherRegistry; import net.azib.ipscan.fetchers.IPFetcher; -import static org.easymock.classextension.EasyMock.*; +import static org.mockito.Mockito.*; import static org.junit.Assert.*; import org.junit.Test; +import org.objenesis.ObjenesisHelper; /** * ScannerThreadTest @@ -31,18 +31,17 @@ public class ScannerDispatcherThreadTest { @Test public void testConstruction() throws Exception { - FetcherRegistry registry = createMock(FetcherRegistry.class); - expect(registry.getSelectedFetchers()).andReturn(Collections.singleton(new IPFetcher())).anyTimes(); - Feeder feeder = createMock(Feeder.class); - expect(feeder.getInfo()).andReturn("info"); - expect(feeder.getName()).andReturn("text.ip"); - replay(registry, feeder); - + FetcherRegistry registry = mock(FetcherRegistry.class); + when(registry.getSelectedFetchers()).thenReturn(Collections.singleton(new IPFetcher())); + Feeder feeder = mock(Feeder.class); + when(feeder.getInfo()).thenReturn("info"); + when(feeder.getName()).thenReturn("text.ip"); + ScanningResultList scanningResults = new ScanningResultList(registry); scanningResults.info = new ScanInfo(); // initialize info so we can add a dummy result scanningResults.registerAtIndex(0, scanningResults.createResult(InetAddress.getLocalHost())); - ScannerConfig config = createMock(ScannerConfig.class); + ScannerConfig config = mock(ScannerConfig.class); config.maxThreads = 10; ScannerDispatcherThread thread = new ScannerDispatcherThread(feeder, new Scanner(registry), null, null, scanningResults, config, null); @@ -53,16 +52,14 @@ public class ScannerDispatcherThreadTest { assertEquals(thread.getClass().getSimpleName(), thread.getName()); assertTrue(thread.isDaemon()); assertEquals(config.maxThreads, ((ThreadPoolExecutor)thread.threadPool).getMaximumPoolSize()); - assertEquals(thread, ((ThreadPoolExecutor)thread.threadPool).getThreadFactory()); - - verify(registry, feeder); + assertEquals(thread, ((ThreadPoolExecutor) thread.threadPool).getThreadFactory()); } @Test public void threadFactoryProducesDaemons() throws Exception { - ScannerDispatcherThread thread = createMock(ScannerDispatcherThread.class, (Method)null); + ScannerDispatcherThread thread = (ScannerDispatcherThread) ObjenesisHelper.newInstance(ScannerDispatcherThread.class); thread.threadGroup = new ThreadGroup("foo"); - Thread t = thread.newThread(createMock(Runnable.class)); + Thread t = thread.newThread(mock(Runnable.class)); assertTrue(t.isDaemon()); assertSame(thread.threadGroup, t.getThreadGroup()); } diff --git a/test/net/azib/ipscan/core/ScannerTest.java b/test/net/azib/ipscan/core/ScannerTest.java index 76c6de74..cfeaef2f 100755 --- a/test/net/azib/ipscan/core/ScannerTest.java +++ b/test/net/azib/ipscan/core/ScannerTest.java @@ -3,10 +3,10 @@ */ package net.azib.ipscan.core; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; +import static org.mockito.Mockito.*; +import static org.mockito.Mockito.*; +import static org.mockito.Mockito.*; +import static org.mockito.Mockito.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -42,20 +42,14 @@ public class ScannerTest { @Before public void setUp() throws Exception { - fetcherRegistry = createMock(FetcherRegistry.class); - expect(fetcherRegistry.getSelectedFetchers()).andReturn( + fetcherRegistry = mock(FetcherRegistry.class); + when(fetcherRegistry.getSelectedFetchers()).thenReturn( Arrays.asList(new Fetcher[] {new FakeFetcher(), new AnotherFakeFetcher(), new AddressAbortingFetcher(), new FailingFetcher()}) ); - replay(fetcherRegistry); - + scanner = new Scanner(fetcherRegistry); } - @After - public void tearDown() { - verify(fetcherRegistry); - } - @Test public void testScan() throws Exception { // scan the local host @@ -73,11 +67,10 @@ public class ScannerTest { @Test public void testScanInterrupted() throws Exception { - fetcherRegistry = createMock(FetcherRegistry.class); - expect(fetcherRegistry.getSelectedFetchers()).andReturn( + fetcherRegistry = mock(FetcherRegistry.class); + when(fetcherRegistry.getSelectedFetchers()).thenReturn( Arrays.asList(new Fetcher[] {new PlainValueFetcher(), new InterruptedFetcher(), new PlainValueFetcher()}) ); - replay(fetcherRegistry); scanner = new Scanner(fetcherRegistry); // scan the local host diff --git a/test/net/azib/ipscan/core/ScanningResultListTest.java b/test/net/azib/ipscan/core/ScanningResultListTest.java index 63c131e0..a0ef8fe0 100755 --- a/test/net/azib/ipscan/core/ScanningResultListTest.java +++ b/test/net/azib/ipscan/core/ScanningResultListTest.java @@ -3,10 +3,10 @@ */ package net.azib.ipscan.core; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; +import static org.mockito.Mockito.*; +import static org.mockito.Mockito.*; +import static org.mockito.Mockito.*; +import static org.mockito.Mockito.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -43,32 +43,25 @@ import org.junit.Test; public class ScanningResultListTest { private List fetchers = new ArrayList( - Arrays.asList(createMockFetcher("fetcher.ip"), createMockFetcher("fetcher.ping"), createMockFetcher("fetcher.hostname"), createMockFetcher("fetcher.ping.ttl"))); + Arrays.asList(mockFetcher("fetcher.ip"), mockFetcher("fetcher.ping"), mockFetcher("fetcher.hostname"), mockFetcher("fetcher.ping.ttl"))); private FetcherRegistry fetcherRegistry; private ScanningResultList scanningResults; @Before public void setUp() throws Exception { - fetcherRegistry = createMock(FetcherRegistry.class); - expect(fetcherRegistry.getSelectedFetchers()) - .andReturn(fetchers).anyTimes(); - replay(fetcherRegistry); - + fetcherRegistry = mock(FetcherRegistry.class); + when(fetcherRegistry.getSelectedFetchers()).thenReturn(fetchers); + scanningResults = new ScanningResultList(fetcherRegistry); - scanningResults.initNewScan(createMockFeeder("someFeeder")); - } - - @After - public void tearDown() { - verify(fetcherRegistry); + scanningResults.initNewScan(mockFeeder("someFeeder")); } @Test public void testConstructor() throws Exception { StateMachine stateMachine = new StateMachine(){}; scanningResults = new ScanningResultList(fetcherRegistry, stateMachine); - scanningResults.initNewScan(createMockFeeder("inff")); + scanningResults.initNewScan(mockFeeder("inff")); assertFalse(scanningResults.getScanInfo().isCompletedNormally()); stateMachine.transitionToNext(); stateMachine.startScanning(); @@ -213,14 +206,13 @@ public class ScanningResultListTest { @Test public void testInitNewScan() throws Exception { fetcherRegistry.getSelectedFetchers().clear(); - fetcherRegistry.getSelectedFetchers().add(createMockFetcher("hello")); + fetcherRegistry.getSelectedFetchers().add(mockFetcher("hello")); scanningResults.registerAtIndex(0, scanningResults.createResult(InetAddress.getLocalHost())); - Feeder feeder = createMockFeeder("I am the best Feeder in the World!"); + Feeder feeder = mockFeeder("I am the best Feeder in the World!"); scanningResults.initNewScan(feeder); - verify(feeder); assertTrue("initNewScan() must not clear results - otherwise rescanning will be broken", scanningResults.areResultsAvailable()); assertEquals("Cached Fetchers must be re-initilized", 1, scanningResults.getFetchers().size()); assertEquals("I am the best Feeder in the World!", scanningResults.getFeederInfo()); @@ -234,7 +226,7 @@ public class ScanningResultListTest { @Test public void testCachedFetchers() throws Exception { - scanningResults.initNewScan(createMockFeeder("aaa")); + scanningResults.initNewScan(mockFeeder("aaa")); fetcherRegistry.getSelectedFetchers().clear(); assertEquals("Fetchers should be cached from the last scan", 4, scanningResults.getFetchers().size()); } @@ -290,7 +282,7 @@ public class ScanningResultListTest { @Test public void testGetResultAsString() throws Exception { - scanningResults.initNewScan(createMockFeeder("abc")); + scanningResults.initNewScan(mockFeeder("abc")); List fetchers = scanningResults.getFetchers(); ScanningResult result = scanningResults.createResult(InetAddress.getByName("172.28.43.55")); scanningResults.registerAtIndex(0, result); @@ -347,18 +339,16 @@ public class ScanningResultListTest { assertEquals(scanTime2, scanInfo.getScanTime()); } - private Fetcher createMockFetcher(String name) { - Fetcher fetcher = createMock(Fetcher.class); - expect(fetcher.getName()).andReturn(name).anyTimes(); - replay(fetcher); + private Fetcher mockFetcher(String name) { + Fetcher fetcher = mock(Fetcher.class); + when(fetcher.getName()).thenReturn(name); return fetcher; } - private Feeder createMockFeeder(String feederInfo) { - Feeder feeder = createMock(Feeder.class); - expect(feeder.getInfo()).andReturn(feederInfo); - expect(feeder.getName()).andReturn("feeder.range"); - replay(feeder); + private Feeder mockFeeder(String feederInfo) { + Feeder feeder = mock(Feeder.class); + when(feeder.getInfo()).thenReturn(feederInfo); + when(feeder.getName()).thenReturn("feeder.range"); return feeder; } } diff --git a/test/net/azib/ipscan/core/ScanningSubjectTest.java b/test/net/azib/ipscan/core/ScanningSubjectTest.java index 17dea154..15e76844 100644 --- a/test/net/azib/ipscan/core/ScanningSubjectTest.java +++ b/test/net/azib/ipscan/core/ScanningSubjectTest.java @@ -5,7 +5,7 @@ */ package net.azib.ipscan.core; -import static org.easymock.classextension.EasyMock.*; +import static org.mockito.Mockito.*; import static org.junit.Assert.*; import net.azib.ipscan.config.ScannerConfig; import net.azib.ipscan.core.net.PingResult; @@ -26,7 +26,7 @@ public class ScanningSubjectTest { @Before public void initTest() { - config = createMock(ScannerConfig.class); + config = mock(ScannerConfig.class); subject = new ScanningSubject(null); subject.config = config; config.portTimeout = 1000; diff --git a/test/net/azib/ipscan/exporters/ExportProcessorTest.java b/test/net/azib/ipscan/exporters/ExportProcessorTest.java index a608b7fe..db8f64a3 100755 --- a/test/net/azib/ipscan/exporters/ExportProcessorTest.java +++ b/test/net/azib/ipscan/exporters/ExportProcessorTest.java @@ -3,10 +3,7 @@ */ package net.azib.ipscan.exporters; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; +import static org.mockito.Mockito.*; import static org.junit.Assert.assertTrue; import java.io.BufferedReader; @@ -40,24 +37,18 @@ public class ExportProcessorTest { @Before public void setUp() { - fetcherRegistry = createMock(FetcherRegistry.class); - expect(fetcherRegistry.getSelectedFetchers()) - .andReturn(Collections.singletonList(new IPFetcher())).anyTimes(); - replay(fetcherRegistry); + fetcherRegistry = mock(FetcherRegistry.class); + when(fetcherRegistry.getSelectedFetchers()) + .thenReturn(Collections.singletonList(new IPFetcher())); } - @After - public void tearDown() { - verify(fetcherRegistry); - } - @Test public void testProcess() throws Exception { File file = File.createTempFile("exportTest", "txt"); ExportProcessor exportProcessor = new ExportProcessor(new TXTExporter(), file, false); ScanningResultList scanningResultList = new ScanningResultList(fetcherRegistry); - scanningResultList.initNewScan(createMockFeeder("megaFeeder")); + scanningResultList.initNewScan(mockFeeder("megaFeeder")); scanningResultList.registerAtIndex(0, scanningResultList.createResult(InetAddress.getByName("192.168.0.13"))); exportProcessor.process(scanningResultList, null); @@ -75,7 +66,7 @@ public class ExportProcessorTest { ExportProcessor exportProcessor = new ExportProcessor(new TXTExporter(), file, false); ScanningResultList scanningResultList = new ScanningResultList(fetcherRegistry); - scanningResultList.initNewScan(createMockFeeder("feeder2")); + scanningResultList.initNewScan(mockFeeder("feeder2")); scanningResultList.registerAtIndex(0, scanningResultList.createResult(InetAddress.getByName("192.168.13.66"))); scanningResultList.registerAtIndex(1, scanningResultList.createResult(InetAddress.getByName("192.168.13.67"))); @@ -96,11 +87,10 @@ public class ExportProcessorTest { assertTrue(content.indexOf("192.168.13.76") > 0); } - private Feeder createMockFeeder(String feederInfo) { - Feeder feeder = createMock(Feeder.class); - expect(feeder.getInfo()).andReturn(feederInfo); - expect(feeder.getName()).andReturn("feeder.range"); - replay(feeder); + private Feeder mockFeeder(String feederInfo) { + Feeder feeder = mock(Feeder.class); + when(feeder.getInfo()).thenReturn(feederInfo); + when(feeder.getName()).thenReturn("feeder.range"); return feeder; } diff --git a/test/net/azib/ipscan/feeders/RescanFeederTest.java b/test/net/azib/ipscan/feeders/RescanFeederTest.java index d1d6a31b..9f5085c8 100644 --- a/test/net/azib/ipscan/feeders/RescanFeederTest.java +++ b/test/net/azib/ipscan/feeders/RescanFeederTest.java @@ -7,7 +7,7 @@ package net.azib.ipscan.feeders; import static org.junit.Assert.*; -import static org.easymock.EasyMock.*; +import static org.mockito.Mockito.*; import net.azib.ipscan.config.Labels; @@ -29,7 +29,7 @@ public class RescanFeederTest { @Test public void testDelegatedMethods() { - feeder = new RescanFeeder(createMockFeeder(), "123"); + feeder = new RescanFeeder(mockFeeder(), "123"); assertEquals("SomeInfo", feeder.getInfo()); assertEquals("someLabel", feeder.getId()); assertEquals(Labels.getLabel("feeder.rescan.of") + "someName", feeder.getName()); @@ -37,7 +37,7 @@ public class RescanFeederTest { @Test public void testFunctionality() throws Exception { - feeder = new RescanFeeder(createMockFeeder(), "127.0.0.15", "127.0.1.35", "127.0.2.2"); + feeder = new RescanFeeder(mockFeeder(), "127.0.0.15", "127.0.1.35", "127.0.2.2"); assertTrue(feeder.hasNext()); assertEquals(0, feeder.percentageComplete()); @@ -55,12 +55,11 @@ public class RescanFeederTest { assertEquals(100, feeder.percentageComplete()); } - private Feeder createMockFeeder() { - Feeder feeder = createMock(Feeder.class); - expect(feeder.getInfo()).andReturn("SomeInfo"); - expect(feeder.getId()).andReturn("someLabel"); - expect(feeder.getName()).andReturn("someName"); - replay(feeder); + private Feeder mockFeeder() { + Feeder feeder = mock(Feeder.class); + when(feeder.getInfo()).thenReturn("SomeInfo"); + when(feeder.getId()).thenReturn("someLabel"); + when(feeder.getName()).thenReturn("someName"); return feeder; } diff --git a/test/net/azib/ipscan/fetchers/PortsFetcherTest.java b/test/net/azib/ipscan/fetchers/PortsFetcherTest.java index 59ab7e5c..0558e416 100755 --- a/test/net/azib/ipscan/fetchers/PortsFetcherTest.java +++ b/test/net/azib/ipscan/fetchers/PortsFetcherTest.java @@ -3,7 +3,7 @@ */ package net.azib.ipscan.fetchers; -import static org.easymock.classextension.EasyMock.createMock; +import static org.mockito.Mockito.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -32,7 +32,7 @@ public class PortsFetcherTest extends AbstractFetcherTestCase { @Before public void setUp() throws Exception { - config = createMock(ScannerConfig.class); + config = mock(ScannerConfig.class); fetcher = new PortsFetcher(config); } diff --git a/test/net/azib/ipscan/gui/PreferencesDialogTest.java b/test/net/azib/ipscan/gui/PreferencesDialogTest.java index 62728062..1d9d86c1 100644 --- a/test/net/azib/ipscan/gui/PreferencesDialogTest.java +++ b/test/net/azib/ipscan/gui/PreferencesDialogTest.java @@ -6,7 +6,7 @@ package net.azib.ipscan.gui; import static org.junit.Assert.*; -import static org.easymock.classextension.EasyMock.*; +import static org.mockito.Mockito.*; import net.azib.ipscan.gui.PreferencesDialog.PortsTextValidationListener; @@ -30,7 +30,7 @@ public class PreferencesDialogTest { private KeyEvent initPortsTextListener() { portsTextListener = new PortsTextValidationListener(); Event ev = new Event(); - ev.widget = createMock(Text.class); + ev.widget = mock(Text.class); ev.doit = true; return new KeyEvent(ev); } @@ -39,28 +39,24 @@ public class PreferencesDialogTest { public void portsTextTraversesOnTab() throws Exception { KeyEvent e = initPortsTextListener(); e.keyCode = SWT.TAB; - Shell shell = createMock(Shell.class); - expect(((Control)e.getSource()).getShell()).andReturn(shell); - expect(shell.traverse(SWT.TRAVERSE_TAB_NEXT)).andReturn(true); - replay(e.widget, shell); - + Shell shell = mock(Shell.class); + when(((Control)e.getSource()).getShell()).thenReturn(shell); + when(shell.traverse(SWT.TRAVERSE_TAB_NEXT)).thenReturn(true); + portsTextListener.keyPressed(e); assertFalse(e.doit); - verify(e.widget, shell); } @Test public void portsTextTraversesOnEnter() throws Exception { KeyEvent e = initPortsTextListener(); e.keyCode = SWT.CR; - Shell shell = createMock(Shell.class); - expect(((Control)e.getSource()).getShell()).andReturn(shell); - expect(shell.traverse(SWT.TRAVERSE_RETURN)).andReturn(true); - replay(e.widget, shell); - + Shell shell = mock(Shell.class); + when(((Control)e.getSource()).getShell()).thenReturn(shell); + when(shell.traverse(SWT.TRAVERSE_RETURN)).thenReturn(true); + portsTextListener.keyPressed(e); assertFalse(e.doit); - verify(e.widget, shell); } @Test @@ -69,14 +65,12 @@ public class PreferencesDialogTest { e.character = SWT.CR; e.keyCode = SWT.CR; e.stateMask = SWT.MOD1; // is Ctrl on most platforms - expect(((Text)e.widget).getText()).andReturn("1,"); - expect(((Text)e.widget).getCaretPosition()).andReturn(2); - replay(e.widget); + when(((Text)e.widget).getText()).thenReturn("1,"); + when(((Text)e.widget).getCaretPosition()).thenReturn(2); portsTextListener.keyPressed(e); assertEquals(0, e.stateMask); assertTrue(e.doit); - verify(e.widget); } @Test @@ -107,5 +101,4 @@ public class PreferencesDialogTest { assertTrue(listener.validateChar('7', "123,1-3,1-", 10)); assertTrue(listener.validateChar('3', "1, ", 4)); } - } diff --git a/test/net/azib/ipscan/gui/SelectFetchersDialogTest.java b/test/net/azib/ipscan/gui/SelectFetchersDialogTest.java index f040a993..ef9a6c3f 100755 --- a/test/net/azib/ipscan/gui/SelectFetchersDialogTest.java +++ b/test/net/azib/ipscan/gui/SelectFetchersDialogTest.java @@ -5,7 +5,7 @@ */ package net.azib.ipscan.gui; -import static org.easymock.EasyMock.*; +import static org.mockito.Mockito.*; import net.azib.ipscan.fetchers.FetcherRegistry; @@ -18,10 +18,8 @@ public class SelectFetchersDialogTest { @Test public void testSaveFetchersToRegistry() { - FetcherRegistry fetcherRegistry = createMock(FetcherRegistry.class); - fetcherRegistry.updateSelectedFetchers(aryEq(new String[] {"fetcher.ip", "fetcher.blah", "fetcher.hello"})); - replay(fetcherRegistry); - + FetcherRegistry fetcherRegistry = mock(FetcherRegistry.class); + SelectFetchersDialog selectFetchersDialog = new SelectFetchersDialog(fetcherRegistry); selectFetchersDialog.registeredFetcherIdsByNames.put("IP", "fetcher.ip"); @@ -30,7 +28,6 @@ public class SelectFetchersDialogTest { selectFetchersDialog.saveFetchersToRegistry(new String[] {"Blah", "Hello"}); - verify(fetcherRegistry); + verify(fetcherRegistry).updateSelectedFetchers(new String[] {"fetcher.ip", "fetcher.blah", "fetcher.hello"}); } - } diff --git a/test/net/azib/ipscan/gui/StatisticsDialogTest.java b/test/net/azib/ipscan/gui/StatisticsDialogTest.java index 703bb81c..e4c89062 100644 --- a/test/net/azib/ipscan/gui/StatisticsDialogTest.java +++ b/test/net/azib/ipscan/gui/StatisticsDialogTest.java @@ -6,10 +6,7 @@ package net.azib.ipscan.gui; -import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.mockito.Mockito.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -44,7 +41,7 @@ public class StatisticsDialogTest { @Test public void dialogContent() throws Exception { - ScanningResultList results = createMock(ScanningResultList.class); + ScanningResultList results = mock(ScanningResultList.class); ScanInfo scanInfo = new ScanInfo() { { this.startTime = System.currentTimeMillis(); @@ -55,11 +52,10 @@ public class StatisticsDialogTest { } }; - expect(results.getScanInfo()).andReturn(scanInfo); - expect(results.getFeederName()).andReturn("SomeFeeder"); - expect(results.getFeederInfo()).andReturn("SomeInfoHere"); - replay(results); - + when(results.getScanInfo()).thenReturn(scanInfo); + when(results.getFeederName()).thenReturn("SomeFeeder"); + when(results.getFeederInfo()).thenReturn("SomeInfoHere"); + String text = new StatisticsDialog(results).prepareText(); assertNotNull(text); @@ -70,6 +66,5 @@ public class StatisticsDialogTest { assertTrue(text.contains(Labels.getLabel("text.scan.hosts.total") + "20")); assertTrue(text.contains(Labels.getLabel("text.scan.hosts.alive") + "10")); assertTrue(text.contains(Labels.getLabel("text.scan.hosts.ports") + "5")); - verify(results); } } diff --git a/test/net/azib/ipscan/gui/actions/GotoActionsTest.java b/test/net/azib/ipscan/gui/actions/GotoActionsTest.java index 6649463d..7aeefa87 100644 --- a/test/net/azib/ipscan/gui/actions/GotoActionsTest.java +++ b/test/net/azib/ipscan/gui/actions/GotoActionsTest.java @@ -5,16 +5,14 @@ */ package net.azib.ipscan.gui.actions; -import net.azib.ipscan.core.ScanningResult; -import net.azib.ipscan.core.ScanningResultList; import net.azib.ipscan.core.ScanningResult.ResultType; +import net.azib.ipscan.core.ScanningResultList; import net.azib.ipscan.gui.ResultTable; import net.azib.ipscan.gui.actions.GotoMenuActions.NextHost; import net.azib.ipscan.gui.actions.GotoMenuActions.PrevHost; import org.junit.Test; - -import static org.easymock.classextension.EasyMock.*; +import static org.mockito.Mockito.*; /** * GotoActionsTest @@ -22,101 +20,71 @@ import static org.easymock.classextension.EasyMock.*; * @author Anton Keks */ public class GotoActionsTest { + private ResultTable table = mock(ResultTable.class, RETURNS_DEEP_STUBS); + private ScanningResultList results = table.getScanningResults(); - @Test - public void nextHost() throws Exception { - ResultTable table = createMock(ResultTable.class); - ScanningResultList results = createMock(ScanningResultList.class); - NextHost nextHostAction = new NextHost(table, ResultType.ALIVE); - - // first host (0) is found - expect(table.getScanningResults()).andReturn(results); - expect(table.getItemCount()).andReturn(2); - expect(table.getSelectionIndex()).andReturn(-1); - expect(results.getResult(0)).andReturn(result(ResultType.WITH_PORTS)); - table.setSelection(0); expectLastCall(); - expect(table.setFocus()).andReturn(true); - replay(table, results); - nextHostAction.handleEvent(null); - verify(table, results); + @Test + public void nextHostFindsFirstHost() throws Exception { + when(table.getItemCount()).thenReturn(2); + when(table.getSelectionIndex()).thenReturn(-1); + when(results.getResult(0).getType()).thenReturn(ResultType.WITH_PORTS); + new NextHost(table, ResultType.ALIVE).handleEvent(null); + verify(table).setFocus(); + verify(table).setSelection(0); + } - // start from the middle, rewind, first is found - reset(table, results); - expect(table.getScanningResults()).andReturn(results).times(2); - expect(table.getItemCount()).andReturn(2).times(2); - expect(table.getSelectionIndex()).andReturn(0); - expect(results.getResult(1)).andReturn(result(ResultType.DEAD)); - expect(results.getResult(0)).andReturn(result(ResultType.ALIVE)); - table.deselectAll(); expectLastCall(); - expect(table.getSelectionIndex()).andReturn(-1); - table.setSelection(0); expectLastCall(); - expect(table.setFocus()).andReturn(true); - replay(table, results); - nextHostAction.handleEvent(null); - verify(table, results); - - // second dead host (1) is found - nextHostAction = new NextHost(table, ResultType.DEAD); - reset(table, results); - expect(table.getScanningResults()).andReturn(results); - expect(table.getItemCount()).andReturn(2); - expect(table.getSelectionIndex()).andReturn(-1); - expect(results.getResult(0)).andReturn(result(ResultType.WITH_PORTS)); - expect(results.getResult(1)).andReturn(result(ResultType.DEAD)); - table.setSelection(1); expectLastCall(); - expect(table.setFocus()).andReturn(true); - replay(table, results); - nextHostAction.handleEvent(null); - verify(table, results); - } - - @Test - public void prevHost() throws Exception { - ResultTable table = createMock(ResultTable.class); - ScanningResultList results = createMock(ScanningResultList.class); - PrevHost nextHostAction = new PrevHost(table, ResultType.ALIVE); - - // last host (9) is found - expect(table.getScanningResults()).andReturn(results); - expect(table.getItemCount()).andReturn(10).times(2); - expect(table.getSelectionIndex()).andReturn(-1); - expect(results.getResult(9)).andReturn(result(ResultType.WITH_PORTS)); - table.setSelection(9); expectLastCall(); - expect(table.setFocus()).andReturn(true); - replay(table, results); - nextHostAction.handleEvent(null); - verify(table, results); + @Test + public void nextHostStartsFromMiddleRewindsAndFindsFirstOne() { + when(table.getItemCount()).thenReturn(2); + when(table.getSelectionIndex()).thenReturn(0); + when(results.getResult(1).getType()).thenReturn(ResultType.DEAD); + when(results.getResult(0).getType()).thenReturn(ResultType.ALIVE); + when(table.getSelectionIndex()).thenReturn(-1); + new NextHost(table, ResultType.ALIVE).handleEvent(null); + verify(table).setFocus(); + verify(table).setSelection(0); + } - // start from the start, rewind to the end, last is found - reset(table, results); - expect(table.getScanningResults()).andReturn(results).times(2); - expect(table.getItemCount()).andReturn(25).times(3); - expect(table.getSelectionIndex()).andReturn(0); - expect(results.getResult(24)).andReturn(result(ResultType.DEAD)); - expect(results.getResult(23)).andReturn(result(ResultType.ALIVE)); - table.deselectAll(); expectLastCall(); - expect(table.getSelectionIndex()).andReturn(-1); - table.setSelection(23); expectLastCall(); - expect(table.setFocus()).andReturn(true); - replay(table, results); - nextHostAction.handleEvent(null); - verify(table, results); - - // not found - reset(table, results); - expect(table.getScanningResults()).andReturn(results); - expect(table.getItemCount()).andReturn(1).times(2); - expect(table.getSelectionIndex()).andReturn(-1); - expect(results.getResult(0)).andReturn(result(ResultType.DEAD)); - replay(table, results); - nextHostAction.handleEvent(null); - verify(table, results); + @Test + public void nextHostFindsSecondItem() { + when(table.getItemCount()).thenReturn(2); + when(table.getSelectionIndex()).thenReturn(-1); + when(results.getResult(0).getType()).thenReturn(ResultType.WITH_PORTS); + when(results.getResult(1).getType()).thenReturn(ResultType.DEAD); + new NextHost(table, ResultType.DEAD).handleEvent(null); + verify(table).setFocus(); + verify(table).setSelection(1); } - private ScanningResult result(ResultType type) { - ScanningResult result = createMock(ScanningResult.class); - expect(result.getType()).andReturn(type); - replay(result); - return result; + @Test + public void prevHostFindsLastHost() throws Exception { + when(table.getItemCount()).thenReturn(10); + when(table.getSelectionIndex()).thenReturn(-1); + when(results.getResult(9).getType()).thenReturn(ResultType.WITH_PORTS); + when(table.setFocus()).thenReturn(true); + new PrevHost(table, ResultType.ALIVE).handleEvent(null); + verify(table).setFocus(); + verify(table).setSelection(9); + } + + @Test + public void prevHostRewindsAndFindsLastItem() { + when(table.getItemCount()).thenReturn(25); + when(table.getSelectionIndex()).thenReturn(0); + when(results.getResult(24).getType()).thenReturn(ResultType.DEAD); + when(results.getResult(23).getType()).thenReturn(ResultType.ALIVE); + when(table.getSelectionIndex()).thenReturn(-1); + new PrevHost(table, ResultType.ALIVE).handleEvent(null); + verify(table).setFocus(); + verify(table).setSelection(23); + } + + @Test + public void prevHostDoesntFindAnything() { + when(table.getItemCount()).thenReturn(1); + when(table.getSelectionIndex()).thenReturn(-1); + when(results.getResult(0).getType()).thenReturn(ResultType.DEAD); + new PrevHost(table, ResultType.ALIVE).handleEvent(null); + verify(table, never()).setSelection(anyInt()); } } diff --git a/test/net/azib/ipscan/gui/actions/OpenerLauncherTest.java b/test/net/azib/ipscan/gui/actions/OpenerLauncherTest.java index 7081fe1c..6b85848f 100755 --- a/test/net/azib/ipscan/gui/actions/OpenerLauncherTest.java +++ b/test/net/azib/ipscan/gui/actions/OpenerLauncherTest.java @@ -3,7 +3,7 @@ */ package net.azib.ipscan.gui.actions; -import static org.easymock.EasyMock.*; +import static org.mockito.Mockito.*; import static org.junit.Assert.*; import java.net.InetAddress; @@ -35,17 +35,16 @@ public class OpenerLauncherTest { @Test public void testReplaceValues() throws UnknownHostException { - FetcherRegistry fetcherRegistry = createMock(FetcherRegistry.class); - expect(fetcherRegistry.getSelectedFetchers()).andReturn(Collections.nCopies(5, null)).times(2); - expect(fetcherRegistry.getSelectedFetcherIndex(IPFetcher.ID)).andReturn(0).times(3); - expect(fetcherRegistry.getSelectedFetcherIndex(HostnameFetcher.ID)).andReturn(1).anyTimes(); - expect(fetcherRegistry.getSelectedFetcherIndex(PingFetcher.ID)).andReturn(2); - expect(fetcherRegistry.getSelectedFetcherIndex("fetcher.comment")).andReturn(3).anyTimes(); - expect(fetcherRegistry.getSelectedFetcherIndex("noSuchFetcher")).andReturn(-1); - replay(fetcherRegistry); - + FetcherRegistry fetcherRegistry = mock(FetcherRegistry.class); + when(fetcherRegistry.getSelectedFetchers()).thenReturn(Collections.nCopies(5, null)); + when(fetcherRegistry.getSelectedFetcherIndex(IPFetcher.ID)).thenReturn(0); + when(fetcherRegistry.getSelectedFetcherIndex(HostnameFetcher.ID)).thenReturn(1); + when(fetcherRegistry.getSelectedFetcherIndex(PingFetcher.ID)).thenReturn(2); + when(fetcherRegistry.getSelectedFetcherIndex("fetcher.comment")).thenReturn(3); + when(fetcherRegistry.getSelectedFetcherIndex("noSuchFetcher")).thenReturn(-1); + ScanningResultList scanningResults = new ScanningResultList(fetcherRegistry); - scanningResults.initNewScan(createMockFeeder("info")); + scanningResults.initNewScan(mockFeeder("info")); ScanningResult result = scanningResults.createResult(InetAddress.getByName("127.0.0.1")); result.setValue(0, new InetAddressHolder(InetAddress.getByName("127.0.0.1"))); result.setValue(1, "HOSTNAME"); @@ -88,8 +87,6 @@ public class OpenerLauncherTest { assertEquals("Hostname opening should fall back to the IP", "127.0.0.1", ol.prepareOpenerStringForItem("${" + HostnameFetcher.ID + "}", 0)); result.setValue(1, NotAvailable.VALUE); assertEquals("Hostname opening should fall back to the IP", "127.0.0.1", ol.prepareOpenerStringForItem("${" + HostnameFetcher.ID + "}", 0)); - - verify(fetcherRegistry); } @Test @@ -101,11 +98,10 @@ public class OpenerLauncherTest { assertArrayEquals(new String[] {"\"aaa"}, OpenerLauncher.splitCommand("\"aaa")); } - private Feeder createMockFeeder(String feederInfo) { - Feeder feeder = createMock(Feeder.class); - expect(feeder.getInfo()).andReturn(feederInfo); - expect(feeder.getName()).andReturn("feeder.range"); - replay(feeder); + private Feeder mockFeeder(String feederInfo) { + Feeder feeder = mock(Feeder.class); + when(feeder.getInfo()).thenReturn(feederInfo); + when(feeder.getName()).thenReturn("feeder.range"); return feeder; } } diff --git a/test/net/azib/ipscan/gui/feeders/FeederGUIRegistryTest.java b/test/net/azib/ipscan/gui/feeders/FeederGUIRegistryTest.java index 4fe67773..b3a032c4 100644 --- a/test/net/azib/ipscan/gui/feeders/FeederGUIRegistryTest.java +++ b/test/net/azib/ipscan/gui/feeders/FeederGUIRegistryTest.java @@ -16,7 +16,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; -import static org.easymock.classextension.EasyMock.*; +import static org.mockito.Mockito.*; /** * FeederGUIRegistryTest @@ -34,7 +34,7 @@ public class FeederGUIRegistryTest { public void createRegistry() { parent = new Shell(); - feederSelectionCombo = createMock(Combo.class); + feederSelectionCombo = mock(Combo.class); feederGUI = new RangeFeederGUI(parent); registry = new FeederGUIRegistry(new AbstractFeederGUI[] {feederGUI}, feederSelectionCombo, null); @@ -48,10 +48,8 @@ public class FeederGUIRegistryTest { @Test public void addFeederNamesToTheCombo() throws Exception { reset(feederSelectionCombo); - feederSelectionCombo.add(Labels.getLabel(feederGUI.getFeederId())); - replay(feederSelectionCombo); new FeederGUIRegistry(new AbstractFeederGUI[] {feederGUI}, feederSelectionCombo, null); - verify(feederSelectionCombo); + verify(feederSelectionCombo).add(Labels.getLabel(feederGUI.getFeederId())); } @Test @@ -64,7 +62,7 @@ public class FeederGUIRegistryTest { @Test public void createRescanFeederGetsOriginalFeeder() throws Exception { Feeder lastFeeder = registry.createFeeder(); - Feeder rescanFeeder = registry.createRescanFeeder(new TableItem[] {createMock(TableItem.class)}); + Feeder rescanFeeder = registry.createRescanFeeder(new TableItem[] {mock(TableItem.class)}); assertEquals(lastFeeder.getId(), rescanFeeder.getId()); } }