Merge pull request #81 from maxmind/greg/network

Update geoip2 and add network tests

Author: horgh

pom.xml

@@ -57,7 +57,7 @@
         <dependency>
             <groupId>com.maxmind.geoip2</groupId>
             <artifactId>geoip2</artifactId>
-            <version>2.12.0</version>
+            <version>2.13.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

src/test/java/com/maxmind/minfraud/WebServiceClientTest.java

@@ -80,8 +80,10 @@ public void testFullInsightsTransaction() throws Exception {
             assertTrue(
                     "response.getIpAddress().getRepresentedCountry().isInEuropeanUnion() does not return true",
                     response.getIpAddress().getRepresentedCountry().isInEuropeanUnion());
-            assertEquals(response.getDevice().getLocalTime(),
-                    "2018-04-05T15:34:40-07:00");
+            assertEquals("2018-04-05T15:34:40-07:00", response.getDevice().getLocalTime());
+
+            assertEquals("81.2.69.160", response.getIpAddress().getTraits().getIpAddress() );
+            assertEquals("81.2.69.0/24", response.getIpAddress().getTraits().getNetwork().toString());
 
             assertTrue(response.getCreditCard().isVirtual());
         }
@@ -108,6 +110,10 @@ public void testFullFactorsTransaction() throws Exception {
             assertFalse(
                     "response.getIpAddress().getRepresentedCountry().isInEuropeanUnion() does not return false",
                     response.getIpAddress().getRepresentedCountry().isInEuropeanUnion());
+
+
+            assertEquals("81.2.69.160", response.getIpAddress().getTraits().getIpAddress() );
+            assertEquals("81.2.69.0/24", response.getIpAddress().getTraits().getNetwork().toString());
         }
     }
 

src/test/java/com/maxmind/minfraud/response/InsightsResponseTest.java

@@ -25,6 +25,10 @@ public void testInsights() throws Exception {
                         .startObjectField("country")
                         .put("iso_code", "US")
                         .end()
+                        .startObjectField("traits")
+                        .put("ip_address", "81.2.69.160")
+                        .put("network", "81.2.69.0/24")
+                        .end()
                         .end()
                         .startObjectField("credit_card")
                         .put("is_prepaid", true)
@@ -58,5 +62,7 @@ public void testInsights() throws Exception {
         assertEquals("correct queries remaining", Integer.valueOf(123), insights.getQueriesRemaining());
         assertEquals("correct risk score", Double.valueOf(0.01), insights.getRiskScore());
         assertEquals("correct warning code", "INVALID_INPUT", insights.getWarnings().get(0).getCode());
+        assertEquals("81.2.69.160", insights.getIpAddress().getTraits().getIpAddress());
+        assertEquals("81.2.69.0/24", insights.getIpAddress().getTraits().getNetwork().toString());
     }
 }

src/test/java/com/maxmind/minfraud/response/IpAddressTest.java

@@ -31,13 +31,15 @@ public void testIpAddress() throws Exception {
                         .put("is_hosting_provider", true)
                         .put("is_public_proxy", true)
                         .put("is_tor_exit_node", true)
+                        .put("network", "1.2.0.0/16")
                         .end()
                         .end()
                         .finish()
         );
 
         assertEquals("IP risk", new Double(99), address.getRisk());
         assertEquals("correct local time", time, address.getLocation().getLocalTime());
+        assertEquals("1.2.0.0/16", address.getTraits().getNetwork().toString());
         assertTrue("isHighRisk", address.getCountry().isHighRisk());
         assertTrue("isAnonymous", address.getTraits().isAnonymous());
         assertTrue("isAnonymousVpn", address.getTraits().isAnonymousVpn());

src/test/resources/test-data/factors-response.json

@@ -94,6 +94,7 @@
       "is_satellite_provider": true,
       "is_tor_exit_node": true,
       "isp": "Andrews & Arnold Ltd",
+      "network": "81.2.69.0/24",
       "organization": "STONEHOUSE office network",
       "user_type": "government"
     }

src/test/resources/test-data/insights-response.json

@@ -108,6 +108,7 @@
       "is_satellite_provider": true,
       "is_tor_exit_node": true,
       "isp": "Andrews & Arnold Ltd",
+      "network": "81.2.69.0/24",
       "organization": "STONEHOUSE office network",
       "user_type": "government"
     }