Skip to content

Commit b72c46d

Browse files
jean-philippe-martinjean-philippe-martin
committed
---
yaml --- r: 4421 b: refs/heads/gcs-nio c: b0ad5dd h: refs/heads/master i: 4419: b9f093f
1 parent 9d136ec commit b72c46d

8 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ refs/tags/v0.0.12: 2fd8066e891fb3dfea69b65f6bf6461db79342b9
1111
refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
1212
refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
1313
refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
14-
refs/heads/gcs-nio: 576c763677974142ae2b227d747f7452f3e96f31
14+
refs/heads/gcs-nio: b0ad5ddb3f67d775fad3ee36c36056e24a5bda25
1515
refs/heads/logging-alpha: db5312bffa7fccac194f6a7feb8cc3066de16aff
1616
refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
1717
refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0

‎branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import com.google.common.testing.EqualsTester;
2323
import com.google.common.testing.NullPointerTester;
24-
import com.google.cloud.storage.testing.LocalGcsHelper;
24+
import com.google.cloud.storage.testing.LocalStorageHelper;
2525

2626
import org.junit.Before;
2727
import org.junit.Rule;
@@ -52,7 +52,7 @@ public class CloudStorageFileAttributeViewTest {
5252

5353
@Before
5454
public void before() {
55-
CloudStorageFileSystemProvider.setGCloudOptions(LocalGcsHelper.options());
55+
CloudStorageFileSystemProvider.setGCloudOptions(LocalStorageHelper.options());
5656
path = Paths.get(URI.create("gs://red/water"));
5757
}
5858

‎branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.google.common.testing.EqualsTester;
2323
import com.google.common.testing.NullPointerTester;
2424
import com.google.cloud.storage.Acl;
25-
import com.google.cloud.storage.testing.LocalGcsHelper;
25+
import com.google.cloud.storage.testing.LocalStorageHelper;
2626

2727
import org.junit.Before;
2828
import org.junit.Test;
@@ -48,7 +48,7 @@ public class CloudStorageFileAttributesTest {
4848

4949
@Before
5050
public void before() {
51-
CloudStorageFileSystemProvider.setGCloudOptions(LocalGcsHelper.options());
51+
CloudStorageFileSystemProvider.setGCloudOptions(LocalStorageHelper.options());
5252
path = Paths.get(URI.create("gs://bucket/randompath"));
5353
dir = Paths.get(URI.create("gs://bucket/randompath/"));
5454
}

‎branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
import com.google.common.collect.ImmutableList;
3030
import com.google.common.testing.NullPointerTester;
31-
import com.google.cloud.storage.testing.LocalGcsHelper;
31+
import com.google.cloud.storage.testing.LocalStorageHelper;
3232

3333
import org.junit.Before;
3434
import org.junit.Rule;
@@ -91,7 +91,7 @@ public class CloudStorageFileSystemProviderTest {
9191

9292
@Before
9393
public void before() {
94-
CloudStorageFileSystemProvider.setGCloudOptions(LocalGcsHelper.options());
94+
CloudStorageFileSystemProvider.setGCloudOptions(LocalStorageHelper.options());
9595
}
9696

9797
@Test

‎branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.google.common.testing.EqualsTester;
2323
import com.google.common.testing.NullPointerTester;
2424
import com.google.cloud.storage.StorageOptions;
25-
import com.google.cloud.storage.testing.LocalGcsHelper;
25+
import com.google.cloud.storage.testing.LocalStorageHelper;
2626

2727
import org.junit.Before;
2828
import org.junit.Test;
@@ -57,7 +57,7 @@ public class CloudStorageFileSystemTest {
5757

5858
@Before
5959
public void before() {
60-
CloudStorageFileSystemProvider.setGCloudOptions(LocalGcsHelper.options());
60+
CloudStorageFileSystemProvider.setGCloudOptions(LocalStorageHelper.options());
6161
}
6262

6363
@Test
@@ -132,7 +132,7 @@ public void testNullness() throws IOException, NoSuchMethodException, SecurityEx
132132
new NullPointerTester()
133133
.ignore(CloudStorageFileSystem.class.getMethod("equals", Object.class))
134134
.setDefault(CloudStorageConfiguration.class, CloudStorageConfiguration.DEFAULT)
135-
.setDefault(StorageOptions.class, LocalGcsHelper.options());
135+
.setDefault(StorageOptions.class, LocalStorageHelper.options());
136136
tester.testAllPublicStaticMethods(CloudStorageFileSystem.class);
137137
tester.testAllPublicInstanceMethods(fs);
138138
}

‎branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageOptionsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import com.google.common.testing.NullPointerTester;
2323
import com.google.cloud.storage.Acl;
24-
import com.google.cloud.storage.testing.LocalGcsHelper;
24+
import com.google.cloud.storage.testing.LocalStorageHelper;
2525

2626
import org.junit.Before;
2727
import org.junit.Test;
@@ -42,7 +42,7 @@ public class CloudStorageOptionsTest {
4242

4343
@Before
4444
public void before() {
45-
CloudStorageFileSystemProvider.setGCloudOptions(LocalGcsHelper.options());
45+
CloudStorageFileSystemProvider.setGCloudOptions(LocalStorageHelper.options());
4646
}
4747

4848
@Test

‎branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.google.common.collect.Iterables;
2323
import com.google.common.testing.EqualsTester;
2424
import com.google.common.testing.NullPointerTester;
25-
import com.google.cloud.storage.testing.LocalGcsHelper;
25+
import com.google.cloud.storage.testing.LocalStorageHelper;
2626

2727
import org.junit.Before;
2828
import org.junit.Rule;
@@ -48,7 +48,7 @@ public class CloudStoragePathTest {
4848

4949
@Before
5050
public void before() {
51-
CloudStorageFileSystemProvider.setGCloudOptions(LocalGcsHelper.options());
51+
CloudStorageFileSystemProvider.setGCloudOptions(LocalStorageHelper.options());
5252
}
5353

5454
@Test

branches/gcs-nio/gcloud-java-storage/src/main/java/com/google/cloud/storage/testing/LocalGcsHelper.java renamed to branches/gcs-nio/gcloud-java-storage/src/main/java/com/google/cloud/storage/testing/LocalStorageHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* Utility to create an in-memory storage configuration for testing. Storage options can be
2525
* obtained via the {@link #options()} method. Returned options will point to FakeStorageRpc.
2626
*/
27-
public class LocalGcsHelper {
27+
public class LocalStorageHelper {
2828

2929
// used for testing. Will throw if you pass it an option.
3030
private static final FakeStorageRpc instance = new FakeStorageRpc(true);

0 commit comments

Comments
 (0)