fixed some unit tests

Author: allmightyspiff

src/main/java/com/softlayer/api/RestApiClient.java

@@ -225,11 +225,10 @@ class ServiceProxy<S extends Service> implements InvocationHandler {
 
         final Class<S> serviceClass;
         final String id;
-        public Mask mask;
+        Mask mask;
         String maskString;
         ResultLimit resultLimit;
         Integer lastResponseTotalItemCount;
-
 
         public ServiceProxy(Class<S> serviceClass, String id) {
             this.serviceClass = serviceClass;
@@ -305,7 +304,6 @@ public Object logAndHandleResponse(HttpResponse response, String url,
         }
 
         public Object invokeService(Method method, final Object[] args) throws Throwable {
-
             ApiMethod methodInfo = method.getAnnotation(ApiMethod.class);
             // Must have ID if instance is required
             if (methodInfo.instanceRequired() && id == null) {
@@ -442,6 +440,7 @@ public boolean isDone() {
         @Override
         public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
             boolean noParams = args == null || args.length == 0;
+
             if ("asAsync".equals(method.getName()) && noParams) {
                 ServiceProxy<S> asyncProxy = new ServiceProxy<>(serviceClass, id);
                 asyncProxy.mask = mask;

src/test/java/com/softlayer/api/MaskTest.java

@@ -90,14 +90,14 @@ public void testSetStringMask() {
 
     @Test(expected = IllegalArgumentException.class)
     public void testMaskMustNotBeNull() {
-        RestApiClient client = new RestApiClient("http://example.com/");
+        RestApiClient client = new TestApiClient("http://example.com/");
         TestEntity.Service service = TestEntity.service(client);
         service.setMask((Mask) null);
     }
 
     @Test
     public void testMaskRemoval() {
-        RestApiClient client = new RestApiClient("http://example.com/");
+        RestApiClient client = new TestApiClient("http://example.com/");
         TestEntity.Service service = TestEntity.service(client);
         service.withMask().baz();
         assertEquals("baz", service.withMask().toString());
@@ -107,7 +107,7 @@ public void testMaskRemoval() {
 
     @Test
     public void testRecursiveMaskAndLocal() {
-        RestApiClient client = new RestApiClient("http://example.com/");
+        RestApiClient client = new TestApiClient("http://example.com/");
         TestEntity.Service service = TestEntity.service(client);
         service.withMask().recursiveProperty().recursiveProperty().baz();
         service.withMask().recursiveProperty().recursiveProperty().foo();
@@ -118,7 +118,7 @@ public void testRecursiveMaskAndLocal() {
 
     @Test
     public void testRecursiveMask() {
-        RestApiClient client = new RestApiClient("http://example.com/");
+        RestApiClient client = new TestApiClient("http://example.com/");
         TestEntity.Service service = TestEntity.service(client);
         service.withMask().recursiveProperty().baz();
         service.withMask().recursiveProperty().foo();
@@ -130,7 +130,7 @@ public void testRecursiveMask() {
 
     @Test
     public void testMultiLevelMask() {
-        RestApiClient client = new RestApiClient("http://example.com/");
+        RestApiClient client = new TestApiClient("http://example.com/");
         TestEntity.Service service = TestEntity.service(client);
         service.withMask().recursiveProperty().baz();
         service.withMask().recursiveProperty().foo();
@@ -149,12 +149,13 @@ public void testNoChangeMaskScope() {
 
         TestApiClient client = new TestApiClient("http://example.com/");
 
-        client.setLoggingEnabled(true);
+//        client.setLoggingEnabled(true);
 
         TestEntity.Service service = TestEntity.service(client);
         service.withMask().testThing().id();
         service.withMask().testThing().first();
 
+
         TestEntity result = service.getObject();
         assertEquals("testThing[id,first]", service.withMask().toString());
         String expected = "http://example.com/SoftLayer_TestEntity.json?objectMask=mask%5BtestThing%5Bid%2Cfirst%5D%5D";
@@ -165,20 +166,17 @@ public void testNoChangeMaskScope() {
 
     @Test
     public void testChangeMaskScope() {
+// https://github.com/softlayer/softlayer-java/issues/19
+
         TestApiClient client = new TestApiClient("http://example.com/");
-        client.setLoggingEnabled(true);
+//        client.setLoggingEnabled(true);
 
         TestEntity.Service service = TestEntity.service(client);
         service.withMask().recursiveProperty().baz();
         service.withMask().recursiveProperty().foo();
 
         String result = service.getRecursiveProperty();
-        System.out.print(result);
-//        RestApiClient.ServiceProxy serviceProxy = client.createService(TestEntity, 1234);
-//        serviceProxy.invoke(service, service.getRecursiveProperty(),null);
-//        assertEquals("http://example.com/SomeService/1234/someMethod.json?objectMask=someMask%26%26",
-//                client.ServiceProxy.
-//        )
+//        assertEquals("baz,foo", service.withMask());
     }
 }
 

src/test/java/com/softlayer/api/http/FakeHttpClientFactory.java

@@ -81,11 +81,11 @@ public OutputStream getBodyStream() {
     @Override
     public HttpResponse invokeSync(Callable<?> setupBody) {
         invokeSyncCalled = true;
-//        try {
-//            setupBody.call();
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
-//        }
+        try {
+            setupBody.call();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
         return this;
     }
 

src/test/java/com/softlayer/api/service/TestEntity.java

@@ -278,9 +278,6 @@ public Void doSomethingNonStatic(GregorianCalendar param1) {
 
         @Override
         public String getRecursiveProperty() {
-            System.out.print("getRecursiveProperty\n");
-            System.out.print("MASK: " + withMask().toString() +"\n");
-
             return "Hello World";
         }