@@ -82,22 +82,22 @@ public void testSendWithCallback() throws InterruptedException, ExecutionExcepti
8282 public void testFunctionParameters () {
8383 final Option fo1 = new FunctionOption ("1" , "one" );
8484 final Option fo2 = new FunctionOption ("2" , null );
85- final BaseRequest <Void > request = new BaseRequest <Void >("https://a.b.c/" , null , Arrays .asList (fo1 , fo2 ), null ){};
85+ final BaseRequest <Void > request = new BaseRequest <Void >("https://a.b.c/" , mock ( IBaseClient . class ) , Arrays .asList (fo1 , fo2 ), null ){};
8686 assertEquals ("https://a.b.c/(1='one',2=null)" , request .getRequestUrl ().toString ());
8787 request .addFunctionOption (new FunctionOption ("3" ,"two" ));;
8888 assertEquals ("https://a.b.c/(1='one',2=null,3='two')" , request .getRequestUrl ().toString ());
89- assertEquals (4 , request .getOptions ().size ());
89+ assertEquals (3 , request .getOptions ().size ());
9090 }
9191
9292 @ Test
9393 public void testQueryParameters () {
9494 final Option q1 = new QueryOption ("q1" ,"option1 " );
9595 final Option q2 = new QueryOption ("q2" ,"option2" );
96- final BaseRequest <Void > request = new BaseRequest <Void >("https://a.b.c/" , null , Arrays .asList (q1 , q2 ), null ){};
96+ final BaseRequest <Void > request = new BaseRequest <Void >("https://a.b.c/" , mock ( IBaseClient . class ) , Arrays .asList (q1 , q2 ), null ){};
9797 assertEquals ("https://a.b.c/?q1=option1%20&q2=option2" , request .getRequestUrl ().toString ());
9898 request .addQueryOption (new QueryOption ("q3" ,"option3" ));
9999 assertEquals ("https://a.b.c/?q1=option1%20&q2=option2&q3=option3" , request .getRequestUrl ().toString ());
100- assertEquals (4 ,request .getOptions ().size ());
100+ assertEquals (3 ,request .getOptions ().size ());
101101 }
102102
103103 @ Test
@@ -106,14 +106,14 @@ public void testFunctionAndQueryParameters() {
106106 final Option f2 = new FunctionOption ("f2" , null );
107107 final Option q1 = new QueryOption ("q1" ,"option1 " );
108108 final Option q2 = new QueryOption ("q2" ,"option2" );
109- final BaseRequest <Void > request = new BaseRequest <Void >("https://a.b.c/" , null , Arrays .asList (f1 , f2 , q1 , q2 ), null ){};
109+ final BaseRequest <Void > request = new BaseRequest <Void >("https://a.b.c/" , mock ( IBaseClient . class ) , Arrays .asList (f1 , f2 , q1 , q2 ), null ){};
110110 assertEquals ("https://a.b.c/(f1='fun1',f2=null)?q1=option1%20&q2=option2" , request .getRequestUrl ().toString ());
111- assertEquals (5 , request .getOptions ().size ());
111+ assertEquals (4 , request .getOptions ().size ());
112112 }
113113
114114 @ Test
115115 public void testHttpMethod () {
116- final BaseRequest <Void > request = new BaseRequest <Void >("https://a.b.c/" , null , null , null ){};
116+ final BaseRequest <Void > request = new BaseRequest <Void >("https://a.b.c/" , mock ( IBaseClient . class ) , null , null ){};
117117 assertNull (request .getHttpMethod ());
118118 request .setHttpMethod (HttpMethod .GET );
119119 assertEquals (HttpMethod .GET , request .getHttpMethod ());
@@ -123,12 +123,10 @@ public void testHttpMethod() {
123123 public void testHeader () {
124124 final String expectedHeader = "header key" ;
125125 final String expectedValue = "header value" ;
126- final BaseRequest <Void > request = new BaseRequest <Void >("https://a.b.c/" , null , null , null ){};
127- assertEquals (1 , request .getHeaders ().size ());
128- assertEquals ("SdkVersion" , request .getHeaders ().get (0 ).getName ());
129- //assertEquals(String.format("graph-android-v%s", BuildConfig.VERSION_NAME), request.getHeaders().get(0).getValue());
126+ final BaseRequest <Void > request = new BaseRequest <Void >("https://a.b.c/" , mock (IBaseClient .class ), null , null ){};
127+ assertEquals (0 , request .getHeaders ().size ());
130128 request .addHeader (expectedHeader ,expectedValue );
131- assertEquals (2 ,request .getHeaders ().size ());
129+ assertEquals (1 ,request .getHeaders ().size ());
132130 }
133131
134132 @ Test
@@ -137,7 +135,7 @@ public void testProtectedProperties() {
137135 assertEquals (0 , mRequest .queryOptions .size ());
138136 final Option q1 = new QueryOption ("q1" ,"option1 " );
139137 final Option f1 = new FunctionOption ("f1" ,"option2" );
140- final BaseRequest <Void > request = new BaseRequest <Void >("https://a.b.c/" , null , Arrays .asList (q1 ,f1 ), null ){};
138+ final BaseRequest <Void > request = new BaseRequest <Void >("https://a.b.c/" , mock ( IBaseClient . class ) , Arrays .asList (q1 ,f1 ), null ){};
141139 assertEquals (1 , request .functionOptions .size ());
142140 assertEquals (1 , request .queryOptions .size ());
143141 assertEquals ("q1" , request .queryOptions .get (0 ).getName ());
0 commit comments