Tidy, improve naming

Author: nicktindall

modules/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobContainerRetriesTests.java

@@ -584,12 +584,13 @@ public void testCompareAndExchangeWhenThrottled() throws IOException {
     public void testContentsChangeWhileStreaming() throws IOException {
         GoogleCloudStorageHttpHandler handler = new GoogleCloudStorageHttpHandler("bucket");
         httpServer.createContext("/", handler);
-        final int enoughBytesToTriggerChunkedDownload = Math.toIntExact(ByteSizeValue.ofMb(30).getBytes());
+        // The blob needs to be large enough that it won't be entirely buffered on the first request
+        final int enoughBytesToNotBeEntirelyBuffered = Math.toIntExact(ByteSizeValue.ofMb(30).getBytes());
 
         final BlobContainer container = createBlobContainer(1, null, null, null, null, null, null);
 
         final String key = randomIdentifier();
-        byte[] initialValue = randomByteArrayOfLength(enoughBytesToTriggerChunkedDownload);
+        byte[] initialValue = randomByteArrayOfLength(enoughBytesToNotBeEntirelyBuffered);
         container.writeBlob(randomPurpose(), key, new BytesArray(initialValue), true);
 
         BytesReference reference = readFully(container.readBlob(randomPurpose(), key));
@@ -605,7 +606,7 @@ public void testContentsChangeWhileStreaming() throws IOException {
             httpServer.createContext("/", handler);
 
             // Update the file
-            byte[] updatedValue = randomByteArrayOfLength(enoughBytesToTriggerChunkedDownload);
+            byte[] updatedValue = randomByteArrayOfLength(enoughBytesToNotBeEntirelyBuffered);
             container.writeBlob(randomPurpose(), key, new BytesArray(updatedValue), false);
 
             // Read the rest of the stream, it should throw because the contents changed

modules/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageRetryingInputStreamTests.java

@@ -170,7 +170,7 @@ public LowLevelHttpResponse execute() throws IOException {
                         result.setContent(content);
                         result.setContentLength(contentLength);
                         result.setContentType("application/octet-stream");
-                        result.addHeader("x-goog-generation", String.valueOf(randomIntBetween(0, Integer.MAX_VALUE)));
+                        result.addHeader("x-goog-generation", String.valueOf(randomNonNegativeInt()));
                         result.setStatusCode(RestStatus.OK.getStatus());
                         return result;
                     }