Fixed naming, added variable CAPACITY_PROVISIONING_TYPE

Author: TetyanaYahodska

compute/cloud-client/src/test/java/compute/disks/HyperdisksIT.java

@@ -29,25 +29,27 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.junit.Assert;
-import org.junit.FixMethodOrder;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.junit.runners.MethodSorters;
 
 @RunWith(JUnit4.class)
 @Timeout(value = 6, unit = TimeUnit.MINUTES)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class HyperdisksIT {
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String ZONE = "us-central1-a";
-  private static String HYPERDISK_NAME;
-  private static String HYPERDISK_IN_POOL_NAME;
-  private static String STORAGE_POOL_NAME;
+  private static final String  HYPERDISK_NAME = "test-hyperdisk-enc-" + UUID.randomUUID();
+  private static final String  HYPERDISK_IN_POOL_NAME = "test-hyperdisk-enc-" + UUID.randomUUID();
+  private static final String STORAGE_POOL_NAME = "test-storage-pool-enc-" + UUID.randomUUID();
   private static final String PERFORMANCE_PROVISIONING_TYPE = "advanced";
+  private static final String CAPACITY_PROVISIONING_TYPE = "advanced";
 
   // Check if the required environment variables are set.
   public static void requireEnvVar(String envVarName) {
@@ -60,9 +62,6 @@ public static void setUp()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
-    HYPERDISK_NAME = "test-hyperdisk-enc-" + UUID.randomUUID();
-    HYPERDISK_IN_POOL_NAME = "test-hyperdisk-enc-" + UUID.randomUUID();
-    STORAGE_POOL_NAME = "test-storage-pool-enc-" + UUID.randomUUID();
   }
 
   @AfterAll
@@ -76,7 +75,8 @@ public static void cleanup()
   }
 
   @Test
-  public void stage1_CreateHyperdiskTest()
+  @Order(1)
+  public void testCreateHyperdisk()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     String diskType = String.format("zones/%s/diskTypes/hyperdisk-balanced", ZONE);
 
@@ -94,29 +94,32 @@ public void stage1_CreateHyperdiskTest()
   }
 
   @Test
-  public void stage1_CreateHyperdiskStoragePoolTest()
+  @Order(1)
+  public void testCreateHyperdiskStoragePool()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     String poolType = String.format("projects/%s/zones/%s/storagePoolTypes/hyperdisk-balanced",
         PROJECT_ID, ZONE);
     StoragePool storagePool = CreateHyperdiskStoragePool
          .createHyperdiskStoragePool(PROJECT_ID, ZONE, STORAGE_POOL_NAME, poolType,
-         "advanced", 10240, 10000, 10240,
+             CAPACITY_PROVISIONING_TYPE, 10240, 10000, 1024,
              PERFORMANCE_PROVISIONING_TYPE);
 
     Assert.assertNotNull(storagePool);
     Assert.assertEquals(STORAGE_POOL_NAME, storagePool.getName());
     Assert.assertEquals(10000, storagePool.getPoolProvisionedIops());
-    Assert.assertEquals(10240, storagePool.getPoolProvisionedThroughput());
+    Assert.assertEquals(1024, storagePool.getPoolProvisionedThroughput());
     Assert.assertEquals(10240, storagePool.getPoolProvisionedCapacityGb());
     Assert.assertTrue(storagePool.getStoragePoolType().contains("hyperdisk-balanced"));
-    Assert.assertTrue(storagePool.getCapacityProvisioningType().equalsIgnoreCase("advanced"));
+    Assert.assertTrue(storagePool.getCapacityProvisioningType()
+        .equalsIgnoreCase(CAPACITY_PROVISIONING_TYPE));
     Assert.assertTrue(storagePool.getPerformanceProvisioningType()
         .equalsIgnoreCase(PERFORMANCE_PROVISIONING_TYPE));
     Assert.assertTrue(storagePool.getZone().contains(ZONE));
   }
 
   @Test
-  public void stage2_CreateHyperdiskStoragePoolTest()
+  @Order(2)
+  public void testCreateDiskInStoragePool()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     String diskType = String.format("zones/%s/diskTypes/hyperdisk-balanced", ZONE);
     String storagePoolLink = String