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

CADC-12927 update vault int-tests for test library changes #559

Closed
wants to merge 1 commit into from
Closed

CADC-12927 update vault int-tests for test library changes #559

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
4 changes: 2 additions & 2 deletions vault/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies {
compile 'org.opencadc:cadc-gms:[1.0.5,)'
compile 'org.opencadc:cadc-rest:[1.3.16,)'
compile 'org.opencadc:cadc-vos:[2.0.3,)'
compile 'org.opencadc:cadc-vos-server:[2.0.9,)'
compile 'org.opencadc:cadc-vos-server:[2.0.12,)'
compile 'org.opencadc:cadc-vosi:[1.3.2,)'
compile 'org.opencadc:cadc-uws:[1.0,)'
compile 'org.opencadc:cadc-uws-server:[1.2.19,)'
Expand All @@ -53,7 +53,7 @@ dependencies {
runtime 'org.opencadc:cadc-access-control-identity:[1.2.1,)'
runtime 'org.opencadc:cadc-gms:[1.0.5,)'

intTestCompile 'org.opencadc:cadc-test-vosi:[1.0.11,)'
intTestCompile 'org.opencadc:cadc-test-vosi:[1.0.12,)'
intTestCompile 'org.opencadc:cadc-test-vos:[2.1.6,)'
}

Expand Down
20 changes: 17 additions & 3 deletions vault/src/intTest/java/org/opencadc/vault/TransferTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
import org.apache.log4j.Logger;
import org.junit.Before;
import org.junit.Ignore;
import org.opencadc.gms.GroupURI;
import org.opencadc.inventory.StorageSite;
import org.opencadc.inventory.db.SQLGenerator;
import org.opencadc.inventory.db.StorageSiteDAO;
Expand All @@ -103,11 +104,24 @@ public class TransferTest extends org.opencadc.conformance.vos.TransferTest {
static String SERVER = "VAULT_TEST";
static String DATABASE = "cadctest";
static String SCHEMA = "inventory";

private static File ADMIN_CERT = FileUtil.getFileFromResource("vault-test.pem", NodesTest.class);

static final URI RESOURCE_ID;
private static File TEST_CERT;
static final File AUTH_TEST_CERT;
static final GroupURI AUTH_TEST_GROUP;

static {
RESOURCE_ID = URI.create("ivo://opencadc.org/vault");
TEST_CERT = FileUtil.getFileFromResource("vault-test.pem", TransferTest.class);
AUTH_TEST_CERT = FileUtil.getFileFromResource("cavern-auth-test.pem", TransferTest.class);
AUTH_TEST_GROUP = new GroupURI(URI.create("ivo://cadc.nrc.ca/gms?opencadc-vospace-test"));
}

public TransferTest() {
super(URI.create("ivo://opencadc.org/vault"), ADMIN_CERT);
super(URI.create("ivo://opencadc.org/vault"), TEST_CERT);

// enables testDataNodePermission, AUTH_TEST_CERT user is a member of AUTH_TEST_GROUP.
super.enableTestDataNodePermission(AUTH_TEST_GROUP, AUTH_TEST_CERT);
}

@Before
Expand Down
Loading