Repository: nifi Updated Branches: refs/heads/master 8b9034371 -> 598563277
NIFI-3485: This closes #1514. Updated test to mock out use of InetAdress when looking up domain. There was an issue where unresolvable domains got routed to an ISP page. This should fix that issue. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/59856327 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/59856327 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/59856327 Branch: refs/heads/master Commit: 598563277e039b7a4b5c2a1212c817a11cce482e Parents: 8b90343 Author: JJ <[email protected]> Authored: Wed Feb 15 18:05:28 2017 -0600 Committer: joewitt <[email protected]> Committed: Thu Feb 16 00:07:00 2017 -0500 ---------------------------------------------------------------------- .../org/apache/nifi/processors/TestGeoEnrichIP.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/59856327/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java index a404b56..e3e86dc 100644 --- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java +++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java @@ -30,9 +30,13 @@ import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunners; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; import java.io.IOException; import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -41,11 +45,14 @@ import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import static org.powermock.api.mockito.PowerMockito.mock; +import static org.powermock.api.mockito.PowerMockito.mockStatic; +@RunWith(PowerMockRunner.class) +@PrepareForTest({GeoEnrichIP.class}) @SuppressWarnings("WeakerAccess") public class TestGeoEnrichIP { DatabaseReader databaseReader; @@ -54,6 +61,7 @@ public class TestGeoEnrichIP { @Before public void setUp() throws Exception { + mockStatic(InetAddress.class); databaseReader = mock(DatabaseReader.class); geoEnrichIP = new TestableGeoEnrichIP(); testRunner = TestRunners.newTestRunner(geoEnrichIP); @@ -260,6 +268,8 @@ public class TestGeoEnrichIP { final Map<String, String> attributes = new HashMap<>(); attributes.put("ip", "somenonexistentdomain.comm"); + when(InetAddress.getByName("somenonexistentdomain.comm")).thenThrow(UnknownHostException.class); + testRunner.enqueue(new byte[0], attributes); testRunner.run();
