Skip to content
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

Jump to bottom

don't expect "Dataverse" in name/brand in test #3897 #3898

Merged
merged 1 commit into from
Jun 20, 2017
Merged

don't expect "Dataverse" in name/brand in test #3897 #3898

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,23 +81,23 @@ public void testDataverseCategory() {
.body("data.dataverseType", equalTo("UNCATEGORIZED"))
.statusCode(Status.CREATED.getStatusCode());

String alias1 = UtilIT.getRandomIdentifier();
String alias1 = UtilIT.getRandomDvAlias();
String category1 = Dataverse.DataverseType.LABORATORY.toString();
Response createDataverseWithCategory = UtilIT.createDataverse(alias1, category1, apiToken);
createDataverseWithCategory.prettyPrint();
createDataverseWithCategory.then().assertThat()
.body("data.dataverseType", equalTo("LABORATORY"))
.statusCode(Status.CREATED.getStatusCode());

String alias2 = UtilIT.getRandomIdentifier();
String alias2 = UtilIT.getRandomDvAlias();
String madeUpCategory = "madeUpCategory";
Response createDataverseWithInvalidCategory = UtilIT.createDataverse(alias2, madeUpCategory, apiToken);
createDataverseWithInvalidCategory.prettyPrint();
createDataverseWithInvalidCategory.then().assertThat()
.body("data.dataverseType", equalTo("UNCATEGORIZED"))
.statusCode(Status.CREATED.getStatusCode());

String alias3 = UtilIT.getRandomIdentifier();
String alias3 = UtilIT.getRandomDvAlias();
String category3 = Dataverse.DataverseType.LABORATORY.toString().toLowerCase();
Response createDataverseWithLowerCaseCategory = UtilIT.createDataverse(alias3, category3, apiToken);
createDataverseWithLowerCaseCategory.prettyPrint();
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/edu/harvard/iq/dataverse/api/SwordIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,13 +239,13 @@ public void testCreateDataverseCreateDatasetUploadFileDownloadFileEditTitle() {

Response attemptToDownloadUnpublishedFileWithoutApiToken = UtilIT.downloadFile(fileId);
attemptToDownloadUnpublishedFileWithoutApiToken.then().assertThat()
.body("html.head.title", equalTo("403 Not Authorized - Root Dataverse"))
.body("html.head.title", equalTo("403 Not Authorized - Root"))
.statusCode(FORBIDDEN.getStatusCode());

Response attemptToDownloadUnpublishedFileUnauthApiToken = UtilIT.downloadFile(fileId, apiTokenNoPrivs);
attemptToDownloadUnpublishedFileUnauthApiToken.prettyPrint();
attemptToDownloadUnpublishedFileUnauthApiToken.then().assertThat()
.body("html.head.title", equalTo("403 Not Authorized - Root Dataverse"))
.body("html.head.title", equalTo("403 Not Authorized - Root"))
.statusCode(FORBIDDEN.getStatusCode());

Response downloadUnpublishedFileWithValidApiToken = UtilIT.downloadFile(fileId, apiToken);
Expand Down
4 changes: 4 additions & 0 deletions src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ public static String getRandomIdentifier() {
return UUID.randomUUID().toString().substring(0, 8);
}

public static String getRandomDvAlias() {
return "dv" + getRandomIdentifier();
}

static String getUsernameFromResponse(Response createUserResponse) {
JsonPath createdUser = JsonPath.from(createUserResponse.body().asString());
String username = createdUser.getString("data.user." + USERNAME_KEY);
Expand Down