add tests for auth-datafile

Author: jaeopt

core-httpclient-impl/src/main/java/com/optimizely/ab/config/HttpProjectConfigManager.java

@@ -113,15 +113,7 @@ static ProjectConfig parseProjectConfig(String datafile) throws ConfigParseExcep
 
     @Override
     protected ProjectConfig poll() {
-        HttpGet httpGet = new HttpGet(uri);
-
-        if (authDatafileToken != null) {
-            httpGet.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + authDatafileToken);
-        }
-
-        if (datafileLastModified != null) {
-            httpGet.setHeader(HttpHeaders.IF_MODIFIED_SINCE, datafileLastModified);
-        }
+        HttpGet httpGet = createHttpRequest();
 
         logger.debug("Fetching datafile from: {}", httpGet.getURI());
         try {
@@ -138,6 +130,20 @@ protected ProjectConfig poll() {
         return null;
     }
 
+    HttpGet createHttpRequest() {
+        HttpGet httpGet = new HttpGet(uri);
+
+        if (authDatafileToken != null) {
+            httpGet.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + authDatafileToken);
+        }
+
+        if (datafileLastModified != null) {
+            httpGet.setHeader(HttpHeaders.IF_MODIFIED_SINCE, datafileLastModified);
+        }
+
+        return httpGet;
+    }
+
     public static Builder builder() {
         return new Builder();
     }

core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyFactoryTest.java

@@ -191,6 +191,13 @@ public void newDefaultInstanceWithFallback() throws Exception {
         assertTrue(optimizely.isValid());
     }
 
+    @Test
+    public void newDefaultInstanceWithAuthDatafileToken() throws Exception {
+        String datafileString = Resources.toString(Resources.getResource("valid-project-config-v4.json"), Charsets.UTF_8);
+        optimizely = OptimizelyFactory.newDefaultInstance("sdk-key", "auth-token", datafileString);
+        assertTrue(optimizely.isValid());
+    }
+
     @Test
     public void newDefaultInstanceWithProjectConfig() throws Exception {
         optimizely = OptimizelyFactory.newDefaultInstance(() -> null);

core-httpclient-impl/src/test/java/com/optimizely/ab/config/HttpProjectConfigManagerTest.java

@@ -43,9 +43,7 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.class)
 public class HttpProjectConfigManagerTest {
@@ -125,6 +123,58 @@ public void testHttpGetByCustomUrl() throws Exception {
         assertEquals(new URI(expected), actual);
     }
 
+    @Test
+    public void testHttpGetBySdkKeyForAuthDatafile() throws Exception {
+        projectConfigManager = builder()
+            .withOptimizelyHttpClient(mockHttpClient)
+            .withSdkKey("sdk-key")
+            .withAuthDatafileToken("auth-token")
+            .build();
+
+        URI actual = projectConfigManager.getUri();
+        assertEquals(new URI("https://www.optimizely-cdn.com/datafiles/auth/sdk-key.json"), actual);
+    }
+    
+    @Test
+    public void testHttpGetByCustomUrlForAuthDatafile() throws Exception {
+        String expected = "https://custom.optimizely.com/custom-location.json";
+
+        projectConfigManager = builder()
+            .withOptimizelyHttpClient(mockHttpClient)
+            .withUrl(expected)
+            .withSdkKey("sdk-key")
+            .withAuthDatafileToken("auth-token")
+            .build();
+
+        URI actual = projectConfigManager.getUri();
+        assertEquals(new URI(expected), actual);
+    }
+
+    @Test
+    public void testCreateHttpRequest() throws Exception {
+        projectConfigManager = builder()
+            .withOptimizelyHttpClient(mockHttpClient)
+            .withSdkKey("sdk-key")
+            .build();
+
+        HttpGet request = projectConfigManager.createHttpRequest();
+        assertEquals(request.getURI().toString(), "https://cdn.optimizely.com/datafiles/sdk-key.json");
+        assertEquals(request.getHeaders("Authorization").length, 0);
+    }
+
+    @Test
+    public void testCreateHttpRequestForAuthDatafile() throws Exception {
+        projectConfigManager = builder()
+            .withOptimizelyHttpClient(mockHttpClient)
+            .withSdkKey("sdk-key")
+            .withAuthDatafileToken("auth-token")
+            .build();
+
+        HttpGet request = projectConfigManager.createHttpRequest();
+        assertEquals(request.getURI().toString(), "https://www.optimizely-cdn.com/datafiles/auth/sdk-key.json");
+        assertEquals(request.getHeaders("Authorization")[0].getValue(), "Bearer auth-token");
+    }
+
     @Test
     public void testPoll() throws Exception {
         projectConfigManager = builder()