Merge pull request #82 from daboxu/utf8-encode

Utf8 encode for segment path

Author: daboxu

onedrivesdk/src/androidTest/java/com/onedrive/sdk/core/MockClient.java

@@ -0,0 +1,76 @@
+package com.onedrive.sdk.core;
+
+import com.onedrive.sdk.authentication.IAuthenticator;
+import com.onedrive.sdk.concurrency.IExecutors;
+import com.onedrive.sdk.extensions.IDriveCollectionRequestBuilder;
+import com.onedrive.sdk.extensions.IDriveRequestBuilder;
+import com.onedrive.sdk.extensions.IOneDriveClient;
+import com.onedrive.sdk.extensions.IShareCollectionRequestBuilder;
+import com.onedrive.sdk.extensions.IShareRequestBuilder;
+import com.onedrive.sdk.http.IHttpProvider;
+import com.onedrive.sdk.logger.ILogger;
+import com.onedrive.sdk.serializer.ISerializer;
+
+public class MockClient implements IOneDriveClient{
+    private ILogger mLogger;
+
+    @Override
+    public IDriveRequestBuilder getDrive() {
+        return null;
+    }
+
+    @Override
+    public IDriveCollectionRequestBuilder getDrives() {
+        return null;
+    }
+
+    @Override
+    public IDriveRequestBuilder getDrive(String id) {
+        return null;
+    }
+
+    @Override
+    public IShareCollectionRequestBuilder getShares() {
+        return null;
+    }
+
+    @Override
+    public IShareRequestBuilder getShare(String id) {
+        return null;
+    }
+
+    @Override
+    public IAuthenticator getAuthenticator() {
+        return null;
+    }
+
+    @Override
+    public String getServiceRoot() {
+        return null;
+    }
+
+    @Override
+    public IExecutors getExecutors() {
+        return null;
+    }
+
+    @Override
+    public IHttpProvider getHttpProvider() {
+        return null;
+    }
+
+    @Override
+    public ILogger getLogger() {
+        return mLogger;
+    }
+
+    @Override
+    public ISerializer getSerializer() {
+        return null;
+    }
+
+    @Override
+    public void validate() {
+
+    }
+}

onedrivesdk/src/androidTest/java/com/onedrive/sdk/http/BaseRequestTests.java

@@ -0,0 +1,52 @@
+package com.onedrive.sdk.http;
+
+import android.net.Uri;
+import android.test.AndroidTestCase;
+
+import com.onedrive.sdk.core.MockClient;
+import com.onedrive.sdk.extensions.IOneDriveClient;
+
+import junit.framework.Assert;
+
+import java.net.URL;
+
+/**
+ * Test cases for (@see BaseRequest)
+ */
+public class BaseRequestTests extends AndroidTestCase{
+    private IOneDriveClient mockClient;
+    private BaseRequest mRequest;
+
+    private final String baseUrl = "https://localhost:8080/";
+    private final String[] testingSegments = { "Hello World", "你好世界", "Καλημέρα κόσμε", "안녕하세요", "コンニチハ", "แผ่นดินฮั่นเสื่อมโทรมแสนสังเวช" };
+
+    @Override
+    public void setUp() {
+        mockClient = new MockClient();
+        StringBuilder sb = new StringBuilder(baseUrl);
+
+        for (String segment : testingSegments) {
+            sb.append(segment);
+            sb.append("/");
+        }
+
+        sb.deleteCharAt(sb.length()-1);
+
+        mRequest = new BaseRequest(sb.toString(), mockClient, /*options:*/ null, null) {
+            @Override
+            public IOneDriveClient getClient() {
+                return mockClient;
+            }
+        };
+    }
+    public void testUrlEncoded() throws Exception {
+        URL requestUrl = mRequest.getRequestUrl();
+        final Uri.Builder expectBuilder = Uri.parse(baseUrl).buildUpon();
+
+        for (String segment : testingSegments) {
+            expectBuilder.appendPath(segment);
+        }
+
+        Assert.assertEquals(expectBuilder.build().toString(), requestUrl.toString());
+    }
+}

onedrivesdk/src/main/java/com/onedrive/sdk/http/BaseRequest.java

@@ -125,7 +125,12 @@ public BaseRequest(final String requestUrl,
     @Override
     public URL getRequestUrl() {
         Uri baseUrl = Uri.parse(mRequestUrl);
-        final Uri.Builder uriBuilder = baseUrl.buildUpon();
+        final Uri.Builder uriBuilder = new Uri.Builder().scheme(baseUrl.getScheme()).encodedAuthority(baseUrl.getEncodedAuthority());
+
+        for (final String segment : baseUrl.getPathSegments()) {
+            uriBuilder.appendPath(segment);
+        }
+
         for (final QueryOption option : mQueryOptions) {
             uriBuilder.appendQueryParameter(option.getName(), option.getValue());
         }