Skip to content

Commit 8035f6d

Browse files
committed
#11634 clean up test
1 parent 3b22a5d commit 8035f6d

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5628,6 +5628,9 @@ public void getAvailableDatasetFileCategories() throws IOException, InterruptedE
56285628
Response createUser = UtilIT.createRandomUser();
56295629
createUser.then().assertThat().statusCode(OK.getStatusCode());
56305630
String apiToken = UtilIT.getApiTokenFromResponse(createUser);
5631+
String username = UtilIT.getUsernameFromResponse(createUser);
5632+
//for cleanup
5633+
Response makeSuperUser = UtilIT.setSuperuserStatus(username, true);
56315634

56325635
Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
56335636
createDataverseResponse.then().assertThat().statusCode(CREATED.getStatusCode());
@@ -5638,15 +5641,6 @@ public void getAvailableDatasetFileCategories() throws IOException, InterruptedE
56385641
String datasetPersistentId = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
56395642
int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
56405643

5641-
// Creating test files
5642-
String testFileName1 = "test_1.txt";
5643-
String testFileName2 = "test_2.txt";
5644-
String testFileName3 = "test_3.png";
5645-
5646-
UtilIT.createAndUploadTestFile(datasetPersistentId, testFileName1, new byte[50], apiToken);
5647-
UtilIT.createAndUploadTestFile(datasetPersistentId, testFileName2, new byte[200], apiToken);
5648-
UtilIT.createAndUploadTestFile(datasetPersistentId, testFileName3, new byte[100], apiToken);
5649-
56505644
// Creating a categorized test file
56515645
String pathToTestFile = "src/test/resources/images/coffeeshop.png";
56525646
Response uploadResponse = UtilIT.uploadFileViaNative(Integer.toString(datasetId), pathToTestFile, Json.createObjectBuilder().build(), apiToken);
@@ -5661,6 +5655,20 @@ public void getAvailableDatasetFileCategories() throws IOException, InterruptedE
56615655
getDatasetAvailableCategories.then().assertThat().statusCode(OK.getStatusCode());
56625656
getDatasetAvailableCategories.prettyPrint();
56635657
assertTrue(getDatasetAvailableCategories.prettyPrint().contains("testCategory"));
5658+
assertTrue(getDatasetAvailableCategories.prettyPrint().contains("Documentation"));
5659+
assertTrue(getDatasetAvailableCategories.prettyPrint().contains("Data"));
5660+
assertTrue(getDatasetAvailableCategories.prettyPrint().contains("Code"));
5661+
5662+
// Clean up
5663+
Response destroyDatasetResponse = UtilIT.destroyDataset(datasetId, apiToken);
5664+
assertEquals(200, destroyDatasetResponse.getStatusCode());
5665+
5666+
Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
5667+
assertEquals(200, deleteDataverseResponse.getStatusCode());
5668+
5669+
Response deleteUserResponse = UtilIT.deleteUser(username);
5670+
assertEquals(200, deleteUserResponse.getStatusCode());
5671+
56645672

56655673
}
56665674

0 commit comments

Comments
 (0)