Skip to content

Iqss adaptations #2

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

Merged
Ash84 merged 6 commits into from
Apr 26, 2023
Merged

Iqss adaptations #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
001b53a
Reusing the maven-archiva configuration
Ash84 Mar 22, 2023
5502260
Text returned from an error in the Exception body
Ash84 Mar 23, 2023
691a12d
Test 8 failure from slf4j fixed
Ash84 Apr 3, 2023
b863af5
Dates fixed in tests, Dataset.getDoiId() ignored for marshalDataset.
Ash84 Apr 25, 2023
7e55fc1
Tests and code adaptation with https://demo.dataverse.org/
Ash84 Apr 26, 2023
56052c3
Using back otter606 configuration in build.gradle
Ash84 Apr 26, 2023
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
5 changes: 1 addition & 4 deletions src/integration-test/java/com/researchspace/dataverse/http/DatasetOperationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.RandomStringUtils;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;

import com.researchspace.dataverse.entities.Dataset;
Expand Down Expand Up @@ -67,10 +66,8 @@ public void testListDatasets() {
assertTrue(results.size() > 0);
}

//TODO figure out why data is invalid
@Test
@Ignore("this test fails with message: Error parsing Json: incorrect multiple for field collectionMode")
public void testPostSampleDataset() throws IOException, InterruptedException, URISyntaxException {
public void testPostSampleDataset() throws IOException {
final String toPost = FileUtils.readFileToString(exampleDatasetJson);
final Identifier datasetId = dataverseOps.createDataset(toPost, dataverseAlias);
assertNotNull(datasetId.getId());
Expand Down
32 changes: 25 additions & 7 deletions src/integration-test/java/com/researchspace/dataverse/http/DataverseOperationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,24 @@
public class DataverseOperationsTest extends AbstractIntegrationTest {

/**
* Not found error.
* Not permitted error.
*/
private static final String NOT_FOUND = "Not Found";
private static final String UNAUTHORIZED = "is not permitted to perform requested action";

/**
* Not found error code.
* Not permitted error code.
*/
private static final Integer NOT_FOUND_CODE = 404;
private static final Integer UNAUTHORIZED_CODE = 401;

/**
* Not published error.
*/
private static final String NOT_PUBLISHED = "may not be published because its host dataverse";

/**
* Not published part 2 error.
*/
private static final String NOT_PUBLISHED_2 = "has not been published";

@Before
public void setup() throws Exception {
Expand All @@ -66,8 +76,15 @@ public void createPublishAndDeleteNewDataverse(){
final DataverseResponse<DataversePost> success = dataverseOps.createNewDataverse(dataverseAlias, dv);
assertNotNull(success.getData());
assertNotNull(success.getData().getId());
try {

dataverseOps.publishDataverse(dvName);
dataverseOps.publishDataverse(dvName);
} catch (final RestClientException e) {
assertTrue("[" + e.getLocalizedMessage() + "] should contain ["
+ NOT_PUBLISHED + "] & [" + NOT_PUBLISHED_2 + "]",
e.getLocalizedMessage().contains(NOT_PUBLISHED)
&& e.getLocalizedMessage().contains(NOT_PUBLISHED_2));
}

final DataverseResponse<DvMessage> deleted = dataverseOps.deleteDataverse(dvName);
assertTrue(deleted.getStatus().equals("OK"));
Expand All @@ -89,8 +106,9 @@ public void deleteUnknownDataverseHandled() {
dataverseOps.deleteDataverse("ra");
} catch (final RestClientException e) {
exception = e;
assertEquals(NOT_FOUND_CODE, e.getCode());
assertEquals(NOT_FOUND, e.getLocalizedMessage());
assertEquals(UNAUTHORIZED_CODE, e.getCode());
assertTrue("[" + e.getLocalizedMessage() + "] should contain [" + UNAUTHORIZED + "]",
e.getLocalizedMessage().contains(UNAUTHORIZED));
}
assertNotNull(exception);
}
Expand Down
Loading