Updating to dropbox-api-spec. July 13, 2022. (#400)

* Updating to latest api spec, July 13, 2022

* Added basic logging to help debugging integration tests.

Debugging and stability for Tagging.

Author: handstandsam

scripts/run-integration-tests

@@ -51,12 +51,12 @@ echo "Running integration tests..."
 gradle clean
 gradle check
 
-# prepare examples to be run
-android_gradle clean
-android_gradle assemble
-
 # Run integration tests against major HTTP requestor implementations
-for requestor in "StandardHttpRequestor" "OkHttpRequestor" "OkHttp3Requestor" ; do
-    gradle -Pcom.dropbox.test.httpRequestor="${requestor}" -Pcom.dropbox.test.authInfoFile="${AUTH_FILE}" integrationTest proguardTest
+for requestor in "OkHttpRequestor" "OkHttp3Requestor" "StandardHttpRequestor" ; do
+    gradle -Pcom.dropbox.test.httpRequestor="${requestor}" -Pcom.dropbox.test.authInfoFile="${AUTH_FILE}" integrationTest --info
+    gradle -Pcom.dropbox.test.httpRequestor="${requestor}" -Pcom.dropbox.test.authInfoFile="${AUTH_FILE}" proguardTest
 done
 
+# prepare examples to be run
+android_gradle clean
+android_gradle assemble

src/main/stone

@@ -18,6 +18,8 @@
 
 import com.squareup.okhttp.OkHttpClient;
 
+import okhttp3.Request;
+import okhttp3.Response;
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeSuite;
 
@@ -48,11 +50,13 @@ public final class ITUtil {
         new LocalURLFetchServiceTestConfig());
 
     public static DbxRequestConfig.Builder newRequestConfig() {
+        HttpRequestor httpRequestor = newHttpRequestor();
+        System.out.println("Using HttpRequestor of type: " + httpRequestor.getClass().getSimpleName());
         return DbxRequestConfig.newBuilder("sdk-integration-test")
             // enable auto-retry to avoid flakiness
             .withAutoRetryEnabled(MAX_RETRIES)
             .withUserLocaleFrom(Locale.US)
-            .withHttpRequestor(newHttpRequestor());
+            .withHttpRequestor(httpRequestor);
     }
 
     /**
@@ -98,13 +102,25 @@ public static HttpRequestor newHttpRequestor() {
     public static OkHttpRequestor newOkHttpRequestor() {
         OkHttpClient httpClient = OkHttpRequestor.defaultOkHttpClient().clone();
         httpClient.setReadTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS);
+        httpClient.interceptors().add(chain -> {
+            com.squareup.okhttp.Request request = chain.request();
+            com.squareup.okhttp.Response response = chain.proceed(request);
+            System.out.println(response.code() + " | " + request.method() + " | " + request.url() + " | X-Dropbox-Request-Id: " + response.header("X-Dropbox-Request-Id"));
+            return response;
+        });
         return new OkHttpRequestor(httpClient);
     }
 
     public static OkHttp3Requestor newOkHttp3Requestor() {
         okhttp3.OkHttpClient httpClient = OkHttp3Requestor.defaultOkHttpClient().newBuilder()
-            .readTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS)
-            .build();
+                .addInterceptor(chain -> {
+                    Request request = chain.request();
+                    Response response = chain.proceed(request);
+                    System.out.println(response.code() + " | " + request.method() + " | " + request.url() + " | X-Dropbox-Request-Id: " + response.header("X-Dropbox-Request-Id"));
+                    return response;
+                })
+                .readTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS)
+                .build();
         return new OkHttp3Requestor(httpClient);
     }
 

src/test/java/com/dropbox/core/ITUtil.java

@@ -22,46 +22,36 @@ private List<TagObject> getTagsForPath(DbxClientV2 client, String dropboxPath) t
         assertEquals(1, pathToTags.size()); // There is only one path (the one we asked for)
         PathToTags pathToTag = pathToTags.get(0);
         assertEquals(dropboxPath, pathToTag.getPath()); // This is the path we are looking for
-        System.out.println("Path to Tags: " + pathToTag.getTags());
         return pathToTag.getTags();
     }
 
     @Test
     public void testTagging() throws Exception {
         DbxClientV2 client = ITUtil.newClientV2();
 
-        int randomInt = new Random().nextInt();
-
-
-        byte[] contents = ("Tagging Test " + randomInt).getBytes();
-        String dropboxPath = ITUtil.path(getClass(), "/tagging-test-" + randomInt + ".txt");
+        byte[] contents = ("Tagging Test").getBytes();
+        String dropboxPath = ITUtil.path(getClass(), "/tagging-test.txt");
 
         // Upload File
         client.files().uploadBuilder(dropboxPath)
                 .withMode(WriteMode.OVERWRITE)
                 .uploadAndFinish(new ByteArrayInputStream(contents));
+        Thread.sleep(1000);
 
         // Add Tag "a" to file
         client.files().tagsAdd(dropboxPath, "a");
-        assertEquals("a", getTagsForPath(client, dropboxPath).get(0).getUserGeneratedTagValue().getTagText());
+        Thread.sleep(1000);
+
+        List<TagObject> tagsWithA = getTagsForPath(client, dropboxPath);
+        assertEquals("a", tagsWithA.get(0).getUserGeneratedTagValue().getTagText());
+        Thread.sleep(1000);
 
-        // Add Tag "b" to file
-        client.files().tagsAdd(dropboxPath, "b");
-        List<TagObject> tagsAandB = getTagsForPath(client, dropboxPath);
-        assertEquals(2, tagsAandB.size());
-        assertEquals("a", tagsAandB.get(0).getUserGeneratedTagValue().getTagText());
-        assertEquals("b", tagsAandB.get(1).getUserGeneratedTagValue().getTagText());
 
         // Remove Tag "a" from file
         client.files().tagsRemove(dropboxPath, "a");
-        List<TagObject> tagsJustB = getTagsForPath(client, dropboxPath);
-        assertEquals(1, tagsJustB.size());
-        assertEquals("b", tagsJustB.get(0).getUserGeneratedTagValue().getTagText());
-
-        // Remove Tag "b" from file
-        client.files().tagsRemove(dropboxPath, "b");
         List<TagObject> tagsNone = getTagsForPath(client, dropboxPath);
         assertEquals(0, tagsNone.size());
+        Thread.sleep(1000);
 
         // Cleanup, delete our test directory.
         client.files().deleteV2(dropboxPath);