--- old/test/hotspot/gtest/gc/z/test_zArray.cpp	2020-06-17 15:03:22.858830106 +0200
+++ new/test/hotspot/gtest/gc/z/test_zArray.cpp	2020-06-17 15:03:22.670826943 +0200
@@ -25,63 +25,49 @@
 #include "gc/z/zArray.inline.hpp"
 #include "unittest.hpp"
 
-TEST(ZArrayTest, test_add) {
+TEST(ZArray, test_add) {
   ZArray<int> a;
 
   // Add elements
   for (int i = 0; i < 10; i++) {
-    a.add(i);
+    a.append(i);
   }
 
-  // Check size
-  ASSERT_EQ(a.size(), 10u);
-
-  // Check elements
-  for (int i = 0; i < 10; i++) {
-    EXPECT_EQ(a.at(i), i);
-  }
-}
+  ZArray<int> b;
 
-TEST(ZArrayTest, test_clear) {
-  ZArray<int> a;
-
-  // Add elements
-  for (int i = 0; i < 10; i++) {
-    a.add(i);
-  }
+  b.transfer(&a);
 
   // Check size
-  ASSERT_EQ(a.size(), 10u);
-  ASSERT_EQ(a.is_empty(), false);
-
-  // Clear elements
-  a.clear();
-
-  // Check size
-  ASSERT_EQ(a.size(), 0u);
+  ASSERT_EQ(a.length(), 0);
+  ASSERT_EQ(a.max_length(), 0);
   ASSERT_EQ(a.is_empty(), true);
 
-  // Add element
-  a.add(11);
-
-  // Check size
-  ASSERT_EQ(a.size(), 1u);
-  ASSERT_EQ(a.is_empty(), false);
+  ASSERT_EQ(b.length(), 10);
+  ASSERT_GE(b.max_length(), 10);
+  ASSERT_EQ(b.is_empty(), false);
 
   // Clear elements
   a.clear();
 
-  // Check size
-  ASSERT_EQ(a.size(), 0u);
-  ASSERT_EQ(a.is_empty(), true);
+  // Check that b is unaffected
+  ASSERT_EQ(b.length(), 10);
+  ASSERT_GE(b.max_length(), 10);
+  ASSERT_EQ(b.is_empty(), false);
+
+  a.append(1);
+
+  // Check that b is unaffected
+  ASSERT_EQ(b.length(), 10);
+  ASSERT_GE(b.max_length(), 10);
+  ASSERT_EQ(b.is_empty(), false);
 }
 
-TEST(ZArrayTest, test_iterator) {
+TEST(ZArray, iterator) {
   ZArray<int> a;
 
   // Add elements
   for (int i = 0; i < 10; i++) {
-    a.add(i);
+    a.append(i);
   }
 
   // Iterate