From 010c1128761d9c74ba1af33bc34e9264f34b8c80 Mon Sep 17 00:00:00 2001 From: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com> Date: Fri, 27 Mar 2020 15:59:00 -0700 Subject: [PATCH] deps: update conformance test dep (#210) * Update conformance test dep * Update conformance test dep --- .../java/com/google/cloud/storage/V4SigningTest.java | 9 +++++---- pom.xml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/V4SigningTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/V4SigningTest.java index d45cb6dc8..29fe002a6 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/V4SigningTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/V4SigningTest.java @@ -23,6 +23,7 @@ import com.google.auth.oauth2.ServiceAccountCredentials; import com.google.cloud.conformance.storage.v1.SigningV4Test; import com.google.cloud.conformance.storage.v1.TestFile; +import com.google.cloud.conformance.storage.v1.UrlStyle; import com.google.cloud.storage.Storage.SignUrlOption; import com.google.cloud.storage.testing.RemoteStorageHelper; import com.google.common.base.Charsets; @@ -104,14 +105,14 @@ public void test() { SignUrlOption style = SignUrlOption.withPathStyle(); - if (testData.getUrlStyle().equals(SigningV4Test.UrlStyle.VIRTUAL_HOSTED_STYLE)) { + if (testData.getUrlStyle().equals(UrlStyle.VIRTUAL_HOSTED_STYLE)) { style = SignUrlOption.withVirtualHostedStyle(); - } else if (testData.getUrlStyle().equals(SigningV4Test.UrlStyle.PATH_STYLE)) { + } else if (testData.getUrlStyle().equals(UrlStyle.PATH_STYLE)) { style = SignUrlOption.withPathStyle(); - } else if (testData.getUrlStyle().equals(SigningV4Test.UrlStyle.BUCKET_BOUND_DOMAIN)) { + } else if (testData.getUrlStyle().equals(UrlStyle.BUCKET_BOUND_HOSTNAME)) { style = SignUrlOption.withBucketBoundHostname( - testData.getBucketBoundDomain(), + testData.getBucketBoundHostname(), Storage.UriScheme.valueOf(testData.getScheme().toUpperCase())); } diff --git a/pom.xml b/pom.xml index 6aa2e33da..6591aa40a 100644 --- a/pom.xml +++ b/pom.xml @@ -212,7 +212,7 @@ com.google.cloud google-cloud-conformance-tests - 0.0.7 + 0.0.9 test