Added a new IntegrationTest type for JWT tests

box · Feb 13, 2017 · cfbb4ed · cfbb4ed
1 parent 0a43984
commit cfbb4ed
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -95,6 +95,17 @@ task integrationTest(type: Test) {
     }
 }
 
+task integrationTestJWT(type: Test) {
+    description 'Runs the JWT based integration tests.'
+    group 'Verification'
+    testLogging.showStandardStreams = true
+    useJUnit {
+        includeCategories 'com.box.sdk.IntegrationTestJWT'
+
+    }
+}
+
+
 jacocoTestReport.dependsOn(integrationTest);
 
 tasks.withType(JavaCompile) {
@@ -125,6 +136,7 @@ artifacts {
 test {
     useJUnit {
         excludeCategories 'com.box.sdk.IntegrationTest'
+        excludeCategories 'com.box.sdk.IntegrationTestJWT'
     }
 }
 

diff --git a/src/main/java/com/box/sdk/BoxFile.java b/src/main/java/com/box/sdk/BoxFile.java
@@ -515,9 +515,9 @@ public void uploadVersion(InputStream fileContent, String fileContentSHA1, Date
 
         BoxJSONResponse response;
         if (listener == null) {
-            response = (BoxJSONResponse)request.send();
+            response = (BoxJSONResponse) request.send();
         } else {
-            response = (BoxJSONResponse)request.send(listener);
+            response = (BoxJSONResponse) request.send(listener);
         }
         response.getJSON();
     }

diff --git a/src/test/java/com/box/sdk/BoxAPIConnectionTest.java b/src/test/java/com/box/sdk/BoxAPIConnectionTest.java
@@ -210,7 +210,7 @@ public void successfullySavesAndRestoresConnection() {
     }
 
     @Test
-    @Category(IntegrationTest.class)
+    @Category(IntegrationTestJWT.class)
     public void developerEditionAppAuthWorks() {
         final String enterpriseId = TestConfig.getEnterpriseID();
         final String clientId = TestConfig.getClientID();
@@ -253,7 +253,7 @@ public void developerEditionAppAuthWorks() {
     }
 
     @Test
-    @Category(IntegrationTest.class)
+    @Category(IntegrationTestJWT.class)
     public void developerEditionAppUserWorks() {
         final String enterpriseId = TestConfig.getEnterpriseID();
         final String clientId = TestConfig.getClientID();

diff --git a/src/test/java/com/box/sdk/BoxFileTest.java b/src/test/java/com/box/sdk/BoxFileTest.java
@@ -17,7 +17,6 @@
 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;
@@ -847,7 +846,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(new Date().getTime()+1000*24*60*60);
+        Date dueAt = new Date(new Date().getTime() + (1000 * 24 * 60 * 60));
 
         InputStream uploadStream = new ByteArrayInputStream(fileBytes);
         BoxFile uploadedFile = rootFolder.uploadFile(uploadStream, fileName).getResource();

diff --git a/src/test/java/com/box/sdk/BoxTaskTest.java b/src/test/java/com/box/sdk/BoxTaskTest.java
@@ -559,7 +559,7 @@ public void updateInfoSucceeds() {
         Calendar calendar = new GregorianCalendar();
         calendar.set(Calendar.SECOND, 0);
         calendar.set(Calendar.MILLISECOND, 0);
-        calendar.add(Calendar.DATE,1);
+        calendar.add(Calendar.DATE, 1);
         Date dueAt = calendar.getTime();
 
         BoxTask.Info taskInfo = uploadedFile.addTask(BoxTask.Action.REVIEW, originalMessage, dueAt);

diff --git a/src/test/java/com/box/sdk/BoxTransactionalAPIConnectionTest.java b/src/test/java/com/box/sdk/BoxTransactionalAPIConnectionTest.java
@@ -12,7 +12,7 @@
 
 public class BoxTransactionalAPIConnectionTest {
     @Test
-    @Category(IntegrationTest.class)
+    @Category(IntegrationTestJWT.class)
     public void successfullyCreatesTransactionalConnection() {
         final String transactionalAccessToken = TestConfig.getTransactionalAccessToken();
 
@@ -22,7 +22,7 @@ public void successfullyCreatesTransactionalConnection() {
     }
 
     @Test
-    @Category(IntegrationTest.class)
+    @Category(IntegrationTestJWT.class)
     public void successfullyCreatesEmbedLinkWithTransactionalConnection() {
         final String transactionalAccessToken = TestConfig.getTransactionalAccessToken();
 
@@ -55,7 +55,7 @@ public void successfullyCreatesEmbedLinkWithTransactionalConnection() {
     }
 
     @Test
-    @Category(IntegrationTest.class)
+    @Category(IntegrationTestJWT.class)
     public void successfullyCreatesEmbedLinkWithResourceScopedTransactionalConnection() {
         final String transactionalAccessToken = TestConfig.getTransactionalAccessToken();
 
@@ -83,7 +83,7 @@ public void successfullyCreatesEmbedLinkWithResourceScopedTransactionalConnectio
     }
 
     @Test(expected = BoxAPIException.class)
-    @Category(IntegrationTest.class)
+    @Category(IntegrationTestJWT.class)
     public void throwsWhenAttemptingToCreatesEmbedLinkWithAnotherFilesResourceScopedTransactionalConnection() {
         final String transactionalAccessToken = TestConfig.getTransactionalAccessToken();
 

diff --git a/src/test/java/com/box/sdk/BoxUserTest.java b/src/test/java/com/box/sdk/BoxUserTest.java
@@ -5,7 +5,6 @@
 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;
@@ -966,7 +965,7 @@ public void createAndDeleteEnterpriseUserSucceeds() {
         // 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 = "login2@box.com";
+        final String login = "login2@boz.com";
         final String name = "non-empty name";
 
         BoxUser.Info createdUserInfo = BoxUser.createEnterpriseUser(api, login, name);
@@ -1002,7 +1001,7 @@ public void getMembershipsHasCorrectMemberships() {
     @Category(IntegrationTest.class)
     public void updateInfoSucceeds() {
         BoxAPIConnection api = new BoxAPIConnection(TestConfig.getAccessToken());
-        final String login = "login3@box.com";
+        final String login = "login3@boz.com";
         final String originalName = "original name";
         final String updatedName = "updated name";
 

diff --git a/src/test/java/com/box/sdk/BoxWebHookTest.java b/src/test/java/com/box/sdk/BoxWebHookTest.java
@@ -10,7 +10,6 @@
 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;

diff --git a/src/test/java/com/box/sdk/EventStreamTest.java b/src/test/java/com/box/sdk/EventStreamTest.java
@@ -2,7 +2,6 @@
 
 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;
@@ -29,7 +28,6 @@ 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);

diff --git a/src/test/java/com/box/sdk/IntegrationTestJWT.java b/src/test/java/com/box/sdk/IntegrationTestJWT.java
@@ -0,0 +1,7 @@
+package com.box.sdk;
+
+/**
+ * Created by dmaynard on 2/9/17.
+ */
+public interface IntegrationTestJWT {
+}