mirrors/ipscan
2
0
Fork 0
mirror of https://github.com/angryip/ipscan.git synced 2025-10-26 11:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: opener launching fixed, more tests written. Problem was due to casting of all values to String.

Browse Source 
git-svn-id: https://ipscan.svn.sourceforge.net/svnroot/ipscan/trunk@213 375186e5-ef17-0410-b0b6-91563547dcda
This commit is contained in:
angryziber 2007-08-28 21:34:56 +00:00
parent 9b634e3227
commit aa6b3a055b
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/azib/ipscan/gui/actions/OpenerLauncher.java
View File

@ -83,6 +83,7 @@ public class OpenerLauncher {
matcher.appendReplacement(sb, scannedValue);
}
catch (Exception e) {
LOG.log(Level.INFO, "opener.nullFetcherValue", e);
throw new UserErrorException("opener.nullFetcherValue", fetcherName);
}
}
@ -91,6 +92,7 @@ public class OpenerLauncher {
}
String getScannedValue(int selectedItem, int fetcherIndex) {
return (String) scanningResults.getResult(selectedItem).getValues().get(fetcherIndex);
Object value = scanningResults.getResult(selectedItem).getValues().get(fetcherIndex);
return value != null ? value.toString() : null;
}
}

48
test/net/azib/ipscan/gui/actions/OpenerLauncherTest.java
View File

@ -9,9 +9,21 @@ import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.Collections;
import net.azib.ipscan.config.Config;
import net.azib.ipscan.config.Labels;
import net.azib.ipscan.core.ScanningResult;
import net.azib.ipscan.core.ScanningResultList;
import net.azib.ipscan.core.UserErrorException;
import net.azib.ipscan.core.values.InetAddressValue;
import net.azib.ipscan.core.values.NotAvailableValue;
import net.azib.ipscan.feeders.Feeder;
import net.azib.ipscan.fetchers.Fetcher;
import net.azib.ipscan.fetchers.FetcherRegistry;
import org.junit.Before;
@ -30,30 +42,30 @@ public class OpenerLauncherTest {
}
@Test
public void testReplaceValues() {
public void testReplaceValues() throws UnknownHostException {
FetcherRegistry fetcherRegistry = createMock(FetcherRegistry.class);
expect(fetcherRegistry.getSelectedFetchers()).andReturn(Collections.<Fetcher>nCopies(5, null)).times(2);
expect(fetcherRegistry.getSelectedFetcherIndex("fetcher.ip")).andReturn(0).times(3);
expect(fetcherRegistry.getSelectedFetcherIndex("fetcher.hostname")).andReturn(1);
expect(fetcherRegistry.getSelectedFetcherIndex("fetcher.comment")).andReturn(2);
expect(fetcherRegistry.getSelectedFetcherIndex("fetcher.ping")).andReturn(2);
expect(fetcherRegistry.getSelectedFetcherIndex("fetcher.comment")).andReturn(3);
expect(fetcherRegistry.getSelectedFetcherIndex("noSuchFetcher")).andReturn(-1);
replay(fetcherRegistry);
OpenerLauncher ol = new OpenerLauncher(fetcherRegistry, null) {
String getScannedValue(int selectedItem, int fetcherIndex) {
switch (fetcherIndex) {
case 0:
return "127.0.0.1";
case 1:
return "HOSTNAME";
default:
return null;
}
}
};
ScanningResultList scanningResults = new ScanningResultList(fetcherRegistry);
scanningResults.initNewScan(createMockFeeder("info"));
ScanningResult result = scanningResults.createResult(InetAddress.getByName("127.0.0.1"));
result.setValue(0, new InetAddressValue(InetAddress.getByName("127.0.0.1")));
result.setValue(1, "HOSTNAME");
result.setValue(2, NotAvailableValue.INSTANCE);
scanningResults.registerAtIndex(0, result);
OpenerLauncher ol = new OpenerLauncher(fetcherRegistry, scanningResults);
assertEquals("\\\\127.0.0.1", ol.prepareOpenerStringForItem("\\\\${fetcher.ip}", 0));
assertEquals("HOSTNAME$$$127.0.0.1xxx${}", ol.prepareOpenerStringForItem("${fetcher.hostname}$$$${fetcher.ip}xxx${}", 0));
assertEquals("http://127.0.0.1:80/www", ol.prepareOpenerStringForItem("http://${fetcher.ip}:80/www", 0));
assertEquals(NotAvailableValue.INSTANCE.toString() + ", xx", ol.prepareOpenerStringForItem("${fetcher.ping}, xx", 0));
try {
ol.prepareOpenerStringForItem("${noSuchFetcher}", 0);
@ -73,4 +85,12 @@ public class OpenerLauncherTest {
verify(fetcherRegistry);
}
private Feeder createMockFeeder(String feederInfo) {
Feeder feeder = createMock(Feeder.class);
expect(feeder.getInfo()).andReturn(feederInfo);
expect(feeder.getLabel()).andReturn("feeder.range");
replay(feeder);
return feeder;
}
}