Skip to content

Commit

Permalink
CADC-12927 update vault for int-test library changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jburke-cadc committed Mar 7, 2024
1 parent 3081552 commit 8f75457
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 5 deletions.
4 changes: 2 additions & 2 deletions vault/build.gradle
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
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

0 comments on commit 8f75457

Please sign in to comment.