diff --git a/vault/build.gradle b/vault/build.gradle index a1154999..0fee8d36 100644 --- a/vault/build.gradle +++ b/vault/build.gradle @@ -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,)' @@ -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,)' } diff --git a/vault/src/intTest/java/org/opencadc/vault/TransferTest.java b/vault/src/intTest/java/org/opencadc/vault/TransferTest.java index f1392e1e..1ac8b159 100644 --- a/vault/src/intTest/java/org/opencadc/vault/TransferTest.java +++ b/vault/src/intTest/java/org/opencadc/vault/TransferTest.java @@ -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; @@ -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