From 0f24ff6a48f16bcc0809cd9c69c21f274882b248 Mon Sep 17 00:00:00 2001 From: Andrey Markelov Date: Fri, 24 Jul 2026 10:46:49 -0700 Subject: [PATCH 1/2] fix shared account state for proguard test --- .../com/dropbox/core/test/proguard/Main.java | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/proguard/src/main/java/com/dropbox/core/test/proguard/Main.java b/proguard/src/main/java/com/dropbox/core/test/proguard/Main.java index 207a0cf229..26edfbf2ac 100644 --- a/proguard/src/main/java/com/dropbox/core/test/proguard/Main.java +++ b/proguard/src/main/java/com/dropbox/core/test/proguard/Main.java @@ -1,5 +1,16 @@ package com.dropbox.core.test.proguard; +import com.dropbox.core.DbxAuthInfo; +import com.dropbox.core.DbxException; +import com.dropbox.core.DbxRequestConfig; +import com.dropbox.core.DbxWebAuth; +import com.dropbox.core.json.JsonReader; +import com.dropbox.core.v2.DbxClientV2; +import com.dropbox.core.v2.fileproperties.PropertyGroup; +import com.dropbox.core.v2.files.*; +import com.dropbox.core.v2.users.BasicAccount; +import com.dropbox.core.v2.users.FullAccount; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.LinkedHashMap; @@ -11,25 +22,6 @@ import static org.testng.Assert.*; -import com.dropbox.core.DbxAuthInfo; -import com.dropbox.core.DbxException; -import com.dropbox.core.DbxRequestConfig; -import com.dropbox.core.DbxWebAuth; -import com.dropbox.core.json.JsonReader; -import com.dropbox.core.v2.DbxClientV2; -import com.dropbox.core.v2.fileproperties.PropertyGroup; -import com.dropbox.core.v2.files.CreateFolderErrorException; -import com.dropbox.core.v2.files.DeleteErrorException; -import com.dropbox.core.v2.files.DeletedMetadata; -import com.dropbox.core.v2.files.FileMetadata; -import com.dropbox.core.v2.files.FolderMetadata; -import com.dropbox.core.v2.files.GetMetadataErrorException; -import com.dropbox.core.v2.files.Metadata; -import com.dropbox.core.v2.files.WriteConflictError; -import com.dropbox.core.v2.files.WriteMode; -import com.dropbox.core.v2.users.BasicAccount; -import com.dropbox.core.v2.users.FullAccount; - /** * An example command-line application that runs through the web-based OAuth * flow (using {@link DbxWebAuth}). @@ -37,7 +29,7 @@ public class Main { private static final Random RAND = new Random(0L); - private static void testBasicSerialization(DbxClientV2 client) throws DbxException, IOException { + private static void testBasicSerialization(DbxClientV2 client) throws DbxException { // Make the /account/info API call. FullAccount expected = client.users().getCurrentAccount(); assertNotNull(expected); @@ -53,7 +45,7 @@ private static void testBasicSerialization(DbxClientV2 client) throws DbxExcepti } private static void testEnumeratedSubtypeSerialization(DbxClientV2 client) throws DbxException, IOException { - String rootPath = "/test/proguard-tests"; + String rootPath = "/javatest/proguard-tests"; try { FolderMetadata root = client.files().createFolderV2(rootPath).getMetadata(); @@ -139,7 +131,7 @@ private static void testErrorSerialization(DbxClientV2 client) throws IOExceptio fail("No exception thrown"); } - public static void main(String[] args) throws IOException { + public static void main(String[] args) { // Only display important log messages. Logger.getLogger("").setLevel(Level.WARNING); From 742ab7d03e3ca05956834ec75ea6d52e674cd434 Mon Sep 17 00:00:00 2001 From: Andrey Markelov Date: Fri, 24 Jul 2026 10:56:14 -0700 Subject: [PATCH 2/2] fix shared account state for proguard test --- .../com/dropbox/core/test/proguard/Main.java | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/proguard/src/main/java/com/dropbox/core/test/proguard/Main.java b/proguard/src/main/java/com/dropbox/core/test/proguard/Main.java index 26edfbf2ac..6e12380af6 100644 --- a/proguard/src/main/java/com/dropbox/core/test/proguard/Main.java +++ b/proguard/src/main/java/com/dropbox/core/test/proguard/Main.java @@ -1,16 +1,5 @@ package com.dropbox.core.test.proguard; -import com.dropbox.core.DbxAuthInfo; -import com.dropbox.core.DbxException; -import com.dropbox.core.DbxRequestConfig; -import com.dropbox.core.DbxWebAuth; -import com.dropbox.core.json.JsonReader; -import com.dropbox.core.v2.DbxClientV2; -import com.dropbox.core.v2.fileproperties.PropertyGroup; -import com.dropbox.core.v2.files.*; -import com.dropbox.core.v2.users.BasicAccount; -import com.dropbox.core.v2.users.FullAccount; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.LinkedHashMap; @@ -22,6 +11,25 @@ import static org.testng.Assert.*; +import com.dropbox.core.DbxAuthInfo; +import com.dropbox.core.DbxException; +import com.dropbox.core.DbxRequestConfig; +import com.dropbox.core.DbxWebAuth; +import com.dropbox.core.json.JsonReader; +import com.dropbox.core.v2.DbxClientV2; +import com.dropbox.core.v2.fileproperties.PropertyGroup; +import com.dropbox.core.v2.files.CreateFolderErrorException; +import com.dropbox.core.v2.files.DeleteErrorException; +import com.dropbox.core.v2.files.DeletedMetadata; +import com.dropbox.core.v2.files.FileMetadata; +import com.dropbox.core.v2.files.FolderMetadata; +import com.dropbox.core.v2.files.GetMetadataErrorException; +import com.dropbox.core.v2.files.Metadata; +import com.dropbox.core.v2.files.WriteConflictError; +import com.dropbox.core.v2.files.WriteMode; +import com.dropbox.core.v2.users.BasicAccount; +import com.dropbox.core.v2.users.FullAccount; + /** * An example command-line application that runs through the web-based OAuth * flow (using {@link DbxWebAuth}).