Add parameters to tests

Author: Caitlin Bales (MSFT)

src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java

@@ -20,7 +20,7 @@ public class BaseCollectionPageTests {
 
     private IRequestBuilder mRequestBuilder;
     private static ArrayList<String> list;
-    private BaseCollectionPage baseCollectionPage;
+    private BaseCollectionPage<String, IRequestBuilder> baseCollectionPage;
     private String requestUrl = "https://a.b.c";
 
     @Before

src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java

@@ -26,7 +26,7 @@ public class BaseCollectionRequestTests {
 
     private MockAuthenticationProvider mAuthenticationProvider;
     private MockBaseClient mBaseClient;
-    private BaseCollectionRequest request;
+    private BaseCollectionRequest<JsonObject, String> request;
 
     @Before
     public void setUp() throws Exception {
@@ -78,7 +78,7 @@ public void testPost() {
     public void testFunctionParameters() {
         final Option f1 = new FunctionOption("1", "one");
         final Option f2 = new FunctionOption("2", null);
-        final BaseCollectionRequest request = new BaseCollectionRequest<String,String>("https://a.b.c", null, Arrays.asList(f1, f2), null,null){};
+        final BaseCollectionRequest<String,String> request = new BaseCollectionRequest<String,String>("https://a.b.c", null, Arrays.asList(f1, f2), null,null){};
         String urlTest = request.getRequestUrl().toString();
         assertEquals("https://a.b.c(1='one',2=null)", request.getRequestUrl().toString());
         request.addFunctionOption(new FunctionOption("3","two"));;
@@ -90,7 +90,7 @@ public void testFunctionParameters() {
     public void testQueryParameters() {
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
-        final BaseCollectionRequest request = new BaseCollectionRequest<String,String>("https://a.b.c", null, Arrays.asList(q1, q2), null,null){};
+        final BaseCollectionRequest<String,String> request = new BaseCollectionRequest<String,String>("https://a.b.c", null, Arrays.asList(q1, q2), null,null){};
         assertEquals("https://a.b.c?q1=option1+&q2=option2", request.getRequestUrl().toString());
         request.addQueryOption(new QueryOption("q3","option3"));
         assertEquals("https://a.b.c?q1=option1+&q2=option2&q3=option3", request.getRequestUrl().toString());
@@ -103,7 +103,7 @@ public void testFunctionAndQueryParameters() {
         final Option f2 = new FunctionOption("f2", null);
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
-        final BaseCollectionRequest request = new BaseCollectionRequest<String,String>("https://a.b.c", null, Arrays.asList(f1, f2, q1, q2), null,null){};
+        final BaseCollectionRequest<String,String> request = new BaseCollectionRequest<String,String>("https://a.b.c", null, Arrays.asList(f1, f2, q1, q2), null,null){};
         assertEquals("https://a.b.c(f1='fun1',f2=null)?q1=option1+&q2=option2", request.getRequestUrl().toString());
         assertEquals(5, request.getOptions().size());
     }
@@ -121,7 +121,7 @@ public void testHttpMethod() {
     public void testHeader() {
         String expectedHeader = "header key";
         String expectedValue = "header value";
-        final BaseCollectionRequest request = new BaseCollectionRequest<String,String>("https://a.b.c", null, null, null,null){};
+        final BaseCollectionRequest<String,String> request = new BaseCollectionRequest<String,String>("https://a.b.c", null, null, null,null){};
         assertEquals(1, request.getHeaders().size());
         request.addHeader(expectedHeader,expectedValue);
         assertEquals(2,request.getHeaders().size());

src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java

@@ -58,7 +58,7 @@ public Map<String, String> getHeaders() {
                 new MockLogger());
         mProvider.setConnectionFactory(new MockConnectionFactory(new MockConnection(data)));
         mBaseClient.setHttpProvider(mProvider);
-        final BaseStreamRequest request = new BaseStreamRequest<String>("https://a.b.c", mBaseClient,null, null){};
+        final BaseStreamRequest<String> request = new BaseStreamRequest<String>("https://a.b.c", mBaseClient,null, null){};
         request.send();
         assertEquals(1, mAuthenticationProvider.getInterceptionCount());
     }
@@ -102,7 +102,7 @@ public void failure(ClientException ex) {
                 failure.set(true);
             }
         };
-        final BaseStreamRequest request = new BaseStreamRequest<InputStream>("https://a.b.c", mBaseClient,null, InputStream.class){};
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c", mBaseClient,null, InputStream.class){};
         request.send(callback);
         assertTrue(success.get());
         assertFalse(failure.get());
@@ -148,7 +148,7 @@ public void failure(ClientException ex) {
                 failure.set(true);
             }
         };
-        final BaseStreamRequest request = new BaseStreamRequest<InputStream>("https://a.b.c", mBaseClient,null, InputStream.class){};
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c", mBaseClient,null, InputStream.class){};
         request.send(new byte[]{1, 2, 3, 4},callback);
         assertTrue(success.get());
         assertFalse(failure.get());
@@ -181,14 +181,14 @@ public Map<String, String> getHeaders() {
                 new MockLogger());
         mProvider.setConnectionFactory(new MockConnectionFactory(new MockConnection(data)));
         mBaseClient.setHttpProvider(mProvider);
-        final BaseStreamRequest request = new BaseStreamRequest<InputStream>("https://a.b.c", mBaseClient,null, InputStream.class){};
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c", mBaseClient,null, InputStream.class){};
         request.send(new byte[]{1, 2, 3, 4});
         assertEquals(1, mAuthenticationProvider.getInterceptionCount());
     }
 
     @Test
     public void testBaseMethod() {
-        final BaseStreamRequest request = new BaseStreamRequest<InputStream>("https://a.b.c", mBaseClient,null, InputStream.class){};
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c", mBaseClient,null, InputStream.class){};
         assertEquals("https://a.b.c", request.getRequestUrl().toString());
         request.addHeader("header key", "header value");
         assertEquals(2,request.getHeaders().size());