commit 6c6d9900144c6bc7bd61e04ea91e26fe73fecfe4
author cushon <cushon@google.com> Mon Aug 27 10:49:13 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Mon Aug 27 10:51:33 2018 -0700
tree 2c299670daaa4e6da65634a709346e9043d550b6
parent 0e0462589528154cb5160411991075a2000b5452

Clean up work-around for JDK-8056066

PiperOrigin-RevId: 210392711

src/test/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStoreTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStoreTest.java b/src/test/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStoreTest.java
index a2c6687..9e8af6d 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStoreTest.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStoreTest.java
@@ -296,14 +296,13 @@
   @Test
   public void expiredAuthTokensShouldBeRetried_get() throws Exception {
     expiredAuthTokensShouldBeRetried_get(
-        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.UNAUTHORIZED);
+        HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.UNAUTHORIZED);
     expiredAuthTokensShouldBeRetried_get(
-        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INVALID_TOKEN);
+        HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INVALID_TOKEN);
   }
 
   private void expiredAuthTokensShouldBeRetried_get(
-      com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType errorType)
-      throws Exception {
+      HttpBlobStoreTest.NotAuthorizedHandler.ErrorType errorType) throws Exception {
     ServerChannel server = null;
     try {
       server = testServer.start(new NotAuthorizedHandler(errorType));
@@ -328,13 +327,13 @@
   @Test
   public void expiredAuthTokensShouldBeRetried_put() throws Exception {
     expiredAuthTokensShouldBeRetried_put(
-        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.UNAUTHORIZED);
+        HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.UNAUTHORIZED);
     expiredAuthTokensShouldBeRetried_put(
-        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INVALID_TOKEN);
+        HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INVALID_TOKEN);
   }
 
   private void expiredAuthTokensShouldBeRetried_put(
-      com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType errorType) throws Exception {
+      HttpBlobStoreTest.NotAuthorizedHandler.ErrorType errorType) throws Exception {
     ServerChannel server = null;
     try {
       server = testServer.start(new NotAuthorizedHandler(errorType));
@@ -357,13 +356,13 @@
   @Test
   public void errorCodesThatShouldNotBeRetried_get() {
     errorCodeThatShouldNotBeRetried_get(
-        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INSUFFICIENT_SCOPE);
+        HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INSUFFICIENT_SCOPE);
     errorCodeThatShouldNotBeRetried_get(
-        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INVALID_REQUEST);
+        HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INVALID_REQUEST);
   }
 
   private void errorCodeThatShouldNotBeRetried_get(
-      com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType errorType) {
+      HttpBlobStoreTest.NotAuthorizedHandler.ErrorType errorType) {
     ServerChannel server = null;
     try {
       server = testServer.start(new NotAuthorizedHandler(errorType));
@@ -385,13 +384,13 @@
   @Test
   public void errorCodesThatShouldNotBeRetried_put() {
     errorCodeThatShouldNotBeRetried_put(
-        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INSUFFICIENT_SCOPE);
+        HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INSUFFICIENT_SCOPE);
     errorCodeThatShouldNotBeRetried_put(
-        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INVALID_REQUEST);
+        HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INVALID_REQUEST);
   }
 
   private void errorCodeThatShouldNotBeRetried_put(
-      com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType errorType) {
+      HttpBlobStoreTest.NotAuthorizedHandler.ErrorType errorType) {
     ServerChannel server = null;
     try {
       server = testServer.start(new NotAuthorizedHandler(errorType));