Changes to improve Integration Tests

Author: dmaynard

.gitignore

@@ -1,3 +1,6 @@
+gradle/
+gradlew
+gradlew.bat
 .gradle/
 gradle.properties
 build/

src/main/java/com/box/sdk/BoxFile.java

@@ -513,13 +513,13 @@ public void uploadVersion(InputStream fileContent, String fileContentSHA1, Date
             request.putField("content_modified_at", modified);
         }
 
-        BoxAPIResponse response;
+        BoxJSONResponse response;
         if (listener == null) {
-            response = request.send();
+            response = (BoxJSONResponse)request.send();
         } else {
-            response = request.send(listener);
+            response = (BoxJSONResponse)request.send(listener);
         }
-        response.disconnect();
+        response.getJSON();
     }
 
     /**

src/main/java/com/box/sdk/BoxFileVersion.java

@@ -224,7 +224,6 @@ public void promote() {
         BoxJSONRequest request = new BoxJSONRequest(this.getAPI(), url, "POST");
         request.setBody(jsonObject.toString());
         BoxJSONResponse response = (BoxJSONResponse) request.send();
-        response.disconnect();
         this.parseJSON(JsonObject.readFrom(response.getJSON()));
     }
 }

src/test/java/com/box/sdk/BoxCollectionTest.java

@@ -192,5 +192,6 @@ public void getCollectionItemsSucceeds() {
 
         uploadedFile.setCollections(favorites);
         assertThat(favorites, hasItem(Matchers.<BoxItem.Info>hasProperty("ID", equalTo(uploadedFile.getID()))));
+        uploadedFile.delete();
     }
 }

src/test/java/com/box/sdk/BoxFileTest.java

@@ -17,6 +17,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.logging.Logger;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
@@ -846,7 +847,7 @@ public void addTaskSucceeds() {
         byte[] fileBytes = "Non-empty string".getBytes(StandardCharsets.UTF_8);
         String taskMessage = "Non-empty message";
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
-        Date dueAt = new Date();
+        Date dueAt = new Date(new Date().getTime()+1000*24*60*60);
 
         InputStream uploadStream = new ByteArrayInputStream(fileBytes);
         BoxFile uploadedFile = rootFolder.uploadFile(uploadStream, fileName).getResource();

src/test/java/com/box/sdk/BoxTaskTest.java

@@ -559,6 +559,7 @@ public void updateInfoSucceeds() {
         Calendar calendar = new GregorianCalendar();
         calendar.set(Calendar.SECOND, 0);
         calendar.set(Calendar.MILLISECOND, 0);
+        calendar.add(Calendar.DATE,1);
         Date dueAt = calendar.getTime();
 
         BoxTask.Info taskInfo = uploadedFile.addTask(BoxTask.Action.REVIEW, originalMessage, dueAt);

src/test/java/com/box/sdk/BoxUserTest.java

@@ -5,6 +5,7 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.logging.Logger;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
@@ -962,7 +963,10 @@ public void getCurrentUserInfoIsCorrect() throws InterruptedException {
     @Category(IntegrationTest.class)
     public void createAndDeleteEnterpriseUserSucceeds() {
         BoxAPIConnection api = new BoxAPIConnection(TestConfig.getAccessToken());
-        final String login = "[email protected]";
+        // Since deleting users happens in a separate process in the backend
+        // it is really an asynchronous call.  So we have to use a new user in
+        // this test in case the previous user's deletion hasn't completed.
+        final String login = "[email protected]";
         final String name = "non-empty name";
 
         BoxUser.Info createdUserInfo = BoxUser.createEnterpriseUser(api, login, name);
@@ -998,7 +1002,7 @@ public void getMembershipsHasCorrectMemberships() {
     @Category(IntegrationTest.class)
     public void updateInfoSucceeds() {
         BoxAPIConnection api = new BoxAPIConnection(TestConfig.getAccessToken());
-        final String login = "login@box.com";
+        final String login = "login3@box.com";
         final String originalName = "original name";
         final String updatedName = "updated name";
 

src/test/java/com/box/sdk/BoxWebHookTest.java

@@ -10,6 +10,7 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.logging.Logger;
 import java.util.Set;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -463,7 +464,7 @@ public void createWebHookFileSucceeds() throws IOException {
         BoxFile uploadedFile = rootFolder.uploadFile(uploadStream, fileName).getResource();
 
         try {
-            URL address = new URL("https://0.0.0.0");
+            URL address = new URL("https://www.google.com");
             BoxWebHook.Info info = BoxWebHook.create(uploadedFile, address,
                     BoxWebHook.Trigger.FILE_PREVIEWED, BoxWebHook.Trigger.FILE_LOCKED);
 
@@ -489,7 +490,7 @@ public void createWebHookFolderSucceeds() throws IOException {
         BoxFolder folder = rootFolder.createFolder(folderName).getResource();
 
         try {
-            URL address = new URL("https://0.0.0.0");
+            URL address = new URL("https://www.google.com");
             BoxWebHook.Info info = BoxWebHook.create(folder, address,
                     BoxWebHook.Trigger.FOLDER_DOWNLOADED, BoxWebHook.Trigger.FOLDER_COPIED);
 
@@ -518,7 +519,7 @@ public void listWebHooksSucceeds() throws IOException {
         BoxFile uploadedFile = rootFolder.uploadFile(uploadStream, fileName).getResource();
 
         try {
-            URL address = new URL("https://0.0.0.0");
+            URL address = new URL("https://www.google.com");
             BoxWebHook.Info info = BoxWebHook.create(uploadedFile, address, BoxWebHook.Trigger.FILE_PREVIEWED);
             Iterable<BoxWebHook.Info> webhooks = BoxWebHook.all(api);
 
@@ -545,11 +546,11 @@ public void updateWebHookInfoSucceeds() throws IOException {
         BoxFile uploadedFile = rootFolder.uploadFile(uploadStream, fileName).getResource();
 
         try {
-            URL address = new URL("https://0.0.0.0");
+            URL address = new URL("https://www.google.com");
             BoxWebHook webHook = BoxWebHook.create(uploadedFile, address,
                     BoxWebHook.Trigger.FILE_PREVIEWED, BoxWebHook.Trigger.FILE_LOCKED).getResource();
 
-            URL newAddress = new URL("https://0.0.0.1");
+            URL newAddress = new URL("https://www.yahoo.com");
 
             BoxWebHook.Info newInfo = webHook.new Info();
             newInfo.setTriggers(BoxWebHook.Trigger.FILE_UNLOCKED);

src/test/java/com/box/sdk/EventStreamTest.java

@@ -2,6 +2,7 @@
 
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
@@ -28,8 +29,8 @@ public class EventStreamTest {
     @Test
     @Category(IntegrationTest.class)
     public void receiveEventsForFolderCreateAndFolderDelete() throws InterruptedException {
+        // Logger logger = TestConfig.setLogLevel("FINE");
         final LinkedBlockingQueue<BoxEvent> observedEvents = new LinkedBlockingQueue<BoxEvent>();
-
         BoxAPIConnection api = new BoxAPIConnection(TestConfig.getAccessToken());
         EventStream stream = new EventStream(api);
         stream.addListener(new EventListener() {
@@ -60,7 +61,12 @@ public boolean onException(Throwable e) {
         boolean deletedEventFound = false;
         while (!createdEventFound || !deletedEventFound) {
             BoxEvent event = observedEvents.poll(1, TimeUnit.MINUTES);
-            BoxResource source = event.getSourceInfo().getResource();
+            BoxResource.Info  sourceInfo = event.getSourceInfo();
+            //  Some events may not have sourceInfo
+            if (sourceInfo == null) {
+                continue;
+            }
+            BoxResource source = sourceInfo.getResource();
             if (source instanceof BoxFolder) {
                 BoxFolder sourceFolder = (BoxFolder) source;
                 if (sourceFolder.getID().equals(expectedID)) {

src/test/java/com/box/sdk/TestConfig.java

@@ -25,7 +25,7 @@ final class TestConfig {
 
     private TestConfig() { }
 
-    public static Logger  setLogLevel(String levelString) {
+    public static Logger  enableLogger(String levelString) {
         Level level = Level.parse(levelString);
         Logger logger = Logger.getLogger("com.box.sdk");
         logger.setLevel(level);