Skip to content

Fix proguard INT test to use correct comparison #597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AndreyVMarkelov wants to merge 1 commit into from
+21 −27
Closed

Fix proguard INT test to use correct comparison #597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 21 additions & 27 deletions proguard/src/main/java/com/dropbox/core/test/proguard/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -11,33 +22,14 @@

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}).
*/
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);
Expand All @@ -58,8 +50,10 @@ private static void testEnumeratedSubtypeSerialization(DbxClientV2 client) throw
try {
FolderMetadata root = client.files().createFolderV2(rootPath).getMetadata();
assertNotNull(root);
assertNotNull(root.getPathLower());
assertNotNull(root.getPathDisplay());
assertEquals(root.getPathLower(), rootPath);
assertEquals(root.getPathDisplay(), rootPath);
assertTrue(root.getPathDisplay().equalsIgnoreCase(rootPath));
} catch (CreateFolderErrorException ex) {
if (ex.errorValue.isPath() &&
ex.errorValue.getPathValue().isConflict() &&
Expand All @@ -70,7 +64,7 @@ private static void testEnumeratedSubtypeSerialization(DbxClientV2 client) throw
}
}

Map<String, byte[]> files = new LinkedHashMap<String, byte []>();
Map<String, byte[]> files = new LinkedHashMap<>();
files.put(rootPath + "/foo.blob", bytes(1024));
files.put(rootPath + "/bar.blob", bytes(512));
files.put(rootPath + "/sub/a.dat", bytes(4096));
Expand Down Expand Up @@ -139,18 +133,18 @@ 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);

if (args.length != 1) {
System.out.println("");
System.out.println();
System.out.println("Usage: COMMAND <auth-file>");
System.out.println("");
System.out.println();
System.out.println(" <auth-file>: An \"auth file\" that contains the information necessary to make");
System.out.println(" an authorized Dropbox API request. Generate this file using the \"authorize\"");
System.out.println(" example program.");
System.out.println("");
System.out.println();
System.exit(1);
return;
}
Expand All @@ -169,7 +163,7 @@ private static void runTest(DbxClientV2 client, ClientTest test, String name) {
System.out.println("PASS");
} catch (IOException|DbxException ex) {
System.out.println("FAILED");
System.out.println("");
System.out.println();
System.err.println("Error making API call: " + ex.getMessage());
ex.printStackTrace(System.err);
System.exit(1);
Expand Down
Loading