From bb2014b62d40af39078f20b4628d4492330f6dba Mon Sep 17 00:00:00 2001
From: angryziber <angryziber@375186e5-ef17-0410-b0b6-91563547dcda>
Date: Sun, 22 Mar 2009 19:37:25 +0000
Subject: [PATCH] fixing tests

git-svn-id: https://ipscan.svn.sourceforge.net/svnroot/ipscan/trunk@451 375186e5-ef17-0410-b0b6-91563547dcda
---
 .../ipscan/core/ScanningResultListTest.java   |  7 ++++---
 .../gui/feeders/FeederGUIRegistryTest.java    | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/test/net/azib/ipscan/core/ScanningResultListTest.java b/test/net/azib/ipscan/core/ScanningResultListTest.java
index 3d91030a..feb31a8b 100755
--- a/test/net/azib/ipscan/core/ScanningResultListTest.java
+++ b/test/net/azib/ipscan/core/ScanningResultListTest.java
@@ -25,6 +25,7 @@ import net.azib.ipscan.core.ScanningResultList.ScanInfo;
 import net.azib.ipscan.core.ScanningResultList.StopScanningListener;
 import net.azib.ipscan.core.state.ScanningState;
 import net.azib.ipscan.core.state.StateMachine;
+import net.azib.ipscan.core.state.StateMachine.Transition;
 import net.azib.ipscan.core.values.NotScanned;
 import net.azib.ipscan.feeders.Feeder;
 import net.azib.ipscan.fetchers.Fetcher;
@@ -202,10 +203,10 @@ public class ScanningResultListTest {
 		StopScanningListener stopListener = scanningResults.new StopScanningListener();
 		assertFalse(scanningResults.getScanInfo().isCompletedNormally());
 		
-		stopListener.transitionTo(ScanningState.IDLE, null);
+		stopListener.transitionTo(ScanningState.IDLE, Transition.COMPLETE);
 		assertTrue(scanningResults.getScanInfo().isCompletedNormally());
 
-		stopListener.transitionTo(ScanningState.KILLING, null);
+		stopListener.transitionTo(ScanningState.KILLING, Transition.STOP);
 		assertFalse(scanningResults.getScanInfo().isCompletedNormally());
 	}
 	
@@ -337,7 +338,7 @@ public class ScanningResultListTest {
 		assertTrue("Scanning has just begun", scanTime1 >= 0 && scanTime1 <= 10);
 		
 		Thread.sleep(10);
-		scanningResults.new StopScanningListener().transitionTo(ScanningState.IDLE, null);
+		scanningResults.new StopScanningListener().transitionTo(ScanningState.IDLE, Transition.COMPLETE);
 		assertTrue(scanInfo.isCompletedNormally());
 		long scanTime2 = scanInfo.getScanTime();
 		assertTrue("Scanning has just finished", scanTime2 >= 10 && scanTime1 <= 20);
diff --git a/test/net/azib/ipscan/gui/feeders/FeederGUIRegistryTest.java b/test/net/azib/ipscan/gui/feeders/FeederGUIRegistryTest.java
index 2c6af365..4fe67773 100644
--- a/test/net/azib/ipscan/gui/feeders/FeederGUIRegistryTest.java
+++ b/test/net/azib/ipscan/gui/feeders/FeederGUIRegistryTest.java
@@ -5,8 +5,10 @@
  */
 package net.azib.ipscan.gui.feeders;
 
+import net.azib.ipscan.config.Labels;
 import net.azib.ipscan.feeders.Feeder;
 
+import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.TableItem;
@@ -25,17 +27,32 @@ public class FeederGUIRegistryTest {
 	
 	private Composite parent;
 	private FeederGUIRegistry registry;
+	private Combo feederSelectionCombo;
+	private RangeFeederGUI feederGUI;
 	
 	@Before
 	public void createRegistry() {
 		parent = new Shell();
-		registry = new FeederGUIRegistry(new AbstractFeederGUI[] {new RangeFeederGUI(parent)}, null, null);
+		
+		feederSelectionCombo = createMock(Combo.class);
+		
+		feederGUI = new RangeFeederGUI(parent);
+		registry = new FeederGUIRegistry(new AbstractFeederGUI[] {feederGUI}, feederSelectionCombo, null);
 	}
 	
 	@After
 	public void dispose() {
 		parent.dispose();
 	}
+	
+	@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);
+	}
 
 	@Test
 	public void createFeederRemembersTheLastOne() throws Exception {