Minor updates to host resolver tests

Author: jekh

browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolverCacheTest.java

@@ -6,6 +6,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.InetAddress;
 import java.util.Arrays;
@@ -21,6 +23,8 @@
 
 @RunWith(Parameterized.class)
 public class AdvancedHostResolverCacheTest {
+    private static final Logger log = LoggerFactory.getLogger(AdvancedHostResolverCacheTest.class);
+
     @Parameterized.Parameters
     public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][]{
@@ -194,13 +198,13 @@ public void testSetEternalPositiveCacheTtl() {
         resolver.clearDNSCache();
         resolver.setPositiveDNSCacheTimeout(-1, TimeUnit.SECONDS);
 
-        System.out.println("Resolver: " + resolver);
+        log.info("Using resolver: {}", resolver.getClass().getSimpleName());
 
         // populate the cache
         long one = System.nanoTime();
         Collection<InetAddress> addresses = resolver.resolve("www.msn.com");
         long two = System.nanoTime();
-        System.out.println("Time to resolve without cache: " + TimeUnit.MILLISECONDS.convert(two - one, TimeUnit.NANOSECONDS));
+        log.info("Time to resolve address without cache: {}ms", TimeUnit.MILLISECONDS.convert(two - one, TimeUnit.NANOSECONDS));
 
         // make sure there are addresses, since this is a *positive* TTL test
         assertNotNull("Collection of resolved addresses should never be null", addresses);
@@ -212,7 +216,7 @@ public void testSetEternalPositiveCacheTtl() {
 
         long cachedLookupMs = TimeUnit.MILLISECONDS.convert(finish - start, TimeUnit.NANOSECONDS);
 
-        System.out.println("Time to resolve with cache: " + TimeUnit.MILLISECONDS.convert(finish - start, TimeUnit.NANOSECONDS));
+        log.info("Time to resolve address with cache: {}ms", TimeUnit.MILLISECONDS.convert(finish - start, TimeUnit.NANOSECONDS));
 
         assertNotNull("Collection of resolved addresses should never be null", addresses);
         assertNotEquals("Expected to find addresses for www.msn.com", 0, addresses.size());

browsermob-core/src/test/java/net/lightbody/bmp/proxy/dns/AdvancedHostResolverTest.java

@@ -96,9 +96,8 @@ public void testResolveIPv4AndIPv6Addresses() {
 
         // disabling this assert to prevent test failures on systems without ipv6 access, or when the DNS server does not return IPv6 addresses
         //assertTrue("Expected to find at least one IPv6 address for www.google.com", foundIPv6);
-        if (!foundIPv6) {
-            log.warn("Could not resolve IPv6 address for www.google.com using resolver {}", resolver.getClass().getSimpleName());
-        }
+        // update: since the dnsjava resolver now returns ipv6 addresses *only if there are no ipv4 addresses*, it will generally not return
+        // any ipv6 addresses for most hostnames
 
     }