Skip to content

Commit cfbb4ed

Browse files
dmaynardGreg Curtis
authored andcommitted
Added a new IntegrationTest type for JWT tests
1 parent 0a43984 commit cfbb4ed

File tree

10 files changed

+31
-17
lines changed

10 files changed

+31
-17
lines changed

build.gradle

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,17 @@ task integrationTest(type: Test) {
9595
}
9696
}
9797

98+
task integrationTestJWT(type: Test) {
99+
description 'Runs the JWT based integration tests.'
100+
group 'Verification'
101+
testLogging.showStandardStreams = true
102+
useJUnit {
103+
includeCategories 'com.box.sdk.IntegrationTestJWT'
104+
105+
}
106+
}
107+
108+
98109
jacocoTestReport.dependsOn(integrationTest);
99110

100111
tasks.withType(JavaCompile) {
@@ -125,6 +136,7 @@ artifacts {
125136
test {
126137
useJUnit {
127138
excludeCategories 'com.box.sdk.IntegrationTest'
139+
excludeCategories 'com.box.sdk.IntegrationTestJWT'
128140
}
129141
}
130142

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,9 +515,9 @@ public void uploadVersion(InputStream fileContent, String fileContentSHA1, Date
515515

516516
BoxJSONResponse response;
517517
if (listener == null) {
518-
response = (BoxJSONResponse)request.send();
518+
response = (BoxJSONResponse) request.send();
519519
} else {
520-
response = (BoxJSONResponse)request.send(listener);
520+
response = (BoxJSONResponse) request.send(listener);
521521
}
522522
response.getJSON();
523523
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public void successfullySavesAndRestoresConnection() {
210210
}
211211

212212
@Test
213-
@Category(IntegrationTest.class)
213+
@Category(IntegrationTestJWT.class)
214214
public void developerEditionAppAuthWorks() {
215215
final String enterpriseId = TestConfig.getEnterpriseID();
216216
final String clientId = TestConfig.getClientID();
@@ -253,7 +253,7 @@ public void developerEditionAppAuthWorks() {
253253
}
254254

255255
@Test
256-
@Category(IntegrationTest.class)
256+
@Category(IntegrationTestJWT.class)
257257
public void developerEditionAppUserWorks() {
258258
final String enterpriseId = TestConfig.getEnterpriseID();
259259
final String clientId = TestConfig.getClientID();

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import java.util.Collection;
1818
import java.util.Date;
1919
import java.util.Iterator;
20-
import java.util.logging.Logger;
2120

2221
import static org.hamcrest.Matchers.equalTo;
2322
import static org.hamcrest.Matchers.hasItem;
@@ -847,7 +846,7 @@ public void addTaskSucceeds() {
847846
byte[] fileBytes = "Non-empty string".getBytes(StandardCharsets.UTF_8);
848847
String taskMessage = "Non-empty message";
849848
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
850-
Date dueAt = new Date(new Date().getTime()+1000*24*60*60);
849+
Date dueAt = new Date(new Date().getTime() + (1000 * 24 * 60 * 60));
851850

852851
InputStream uploadStream = new ByteArrayInputStream(fileBytes);
853852
BoxFile uploadedFile = rootFolder.uploadFile(uploadStream, fileName).getResource();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ public void updateInfoSucceeds() {
559559
Calendar calendar = new GregorianCalendar();
560560
calendar.set(Calendar.SECOND, 0);
561561
calendar.set(Calendar.MILLISECOND, 0);
562-
calendar.add(Calendar.DATE,1);
562+
calendar.add(Calendar.DATE, 1);
563563
Date dueAt = calendar.getTime();
564564

565565
BoxTask.Info taskInfo = uploadedFile.addTask(BoxTask.Action.REVIEW, originalMessage, dueAt);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
public class BoxTransactionalAPIConnectionTest {
1414
@Test
15-
@Category(IntegrationTest.class)
15+
@Category(IntegrationTestJWT.class)
1616
public void successfullyCreatesTransactionalConnection() {
1717
final String transactionalAccessToken = TestConfig.getTransactionalAccessToken();
1818

@@ -22,7 +22,7 @@ public void successfullyCreatesTransactionalConnection() {
2222
}
2323

2424
@Test
25-
@Category(IntegrationTest.class)
25+
@Category(IntegrationTestJWT.class)
2626
public void successfullyCreatesEmbedLinkWithTransactionalConnection() {
2727
final String transactionalAccessToken = TestConfig.getTransactionalAccessToken();
2828

@@ -55,7 +55,7 @@ public void successfullyCreatesEmbedLinkWithTransactionalConnection() {
5555
}
5656

5757
@Test
58-
@Category(IntegrationTest.class)
58+
@Category(IntegrationTestJWT.class)
5959
public void successfullyCreatesEmbedLinkWithResourceScopedTransactionalConnection() {
6060
final String transactionalAccessToken = TestConfig.getTransactionalAccessToken();
6161

@@ -83,7 +83,7 @@ public void successfullyCreatesEmbedLinkWithResourceScopedTransactionalConnectio
8383
}
8484

8585
@Test(expected = BoxAPIException.class)
86-
@Category(IntegrationTest.class)
86+
@Category(IntegrationTestJWT.class)
8787
public void throwsWhenAttemptingToCreatesEmbedLinkWithAnotherFilesResourceScopedTransactionalConnection() {
8888
final String transactionalAccessToken = TestConfig.getTransactionalAccessToken();
8989

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.util.Date;
66
import java.util.Iterator;
77
import java.util.List;
8-
import java.util.logging.Logger;
98

109
import static org.hamcrest.Matchers.equalTo;
1110
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
@@ -966,7 +965,7 @@ public void createAndDeleteEnterpriseUserSucceeds() {
966965
// Since deleting users happens in a separate process in the backend
967966
// it is really an asynchronous call. So we have to use a new user in
968967
// this test in case the previous user's deletion hasn't completed.
969-
final String login = "login2@box.com";
968+
final String login = "login2@boz.com";
970969
final String name = "non-empty name";
971970

972971
BoxUser.Info createdUserInfo = BoxUser.createEnterpriseUser(api, login, name);
@@ -1002,7 +1001,7 @@ public void getMembershipsHasCorrectMemberships() {
10021001
@Category(IntegrationTest.class)
10031002
public void updateInfoSucceeds() {
10041003
BoxAPIConnection api = new BoxAPIConnection(TestConfig.getAccessToken());
1005-
final String login = "login3@box.com";
1004+
final String login = "login3@boz.com";
10061005
final String originalName = "original name";
10071006
final String updatedName = "updated name";
10081007

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import java.util.Date;
1111
import java.util.HashSet;
1212
import java.util.Iterator;
13-
import java.util.logging.Logger;
1413
import java.util.Set;
1514

1615
import static org.hamcrest.Matchers.equalTo;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.concurrent.LinkedBlockingQueue;
44
import java.util.concurrent.TimeUnit;
5-
import java.util.logging.Logger;
65

76
import static org.hamcrest.Matchers.equalTo;
87
import static org.hamcrest.Matchers.is;
@@ -29,7 +28,6 @@ public class EventStreamTest {
2928
@Test
3029
@Category(IntegrationTest.class)
3130
public void receiveEventsForFolderCreateAndFolderDelete() throws InterruptedException {
32-
// Logger logger = TestConfig.setLogLevel("FINE");
3331
final LinkedBlockingQueue<BoxEvent> observedEvents = new LinkedBlockingQueue<BoxEvent>();
3432
BoxAPIConnection api = new BoxAPIConnection(TestConfig.getAccessToken());
3533
EventStream stream = new EventStream(api);
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.box.sdk;
2+
3+
/**
4+
* Created by dmaynard on 2/9/17.
5+
*/
6+
public interface IntegrationTestJWT {
7+
}

0 commit comments

Comments
 (0)