commit a640835c62c6275a2e6876cb0bb8efd48c5144bb
author Jim Laskey <jlaskey@openjdk.org> Wed Jul 15 09:22:29 2020 -0300
committer Jim Laskey <jlaskey@openjdk.org> Wed Jul 15 09:22:29 2020 -0300
tree 245598df8c3a2d6c753a3686273e9743a95e5f0a
parent b67814941f16e96681fdbfa5354fab612b559c65

8249258: java/util/StringJoiner/StringJoinerTest.java failed due to OOM

Reviewed-by: dcubed, rriggs

test/jdk/java/util/StringJoiner/StringJoinerTest.java

diff --git a/test/jdk/java/util/StringJoiner/StringJoinerTest.java b/test/jdk/java/util/StringJoiner/StringJoinerTest.java
index cbc057a..918823d 100644
--- a/test/jdk/java/util/StringJoiner/StringJoinerTest.java
+++ b/test/jdk/java/util/StringJoiner/StringJoinerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 /**
  * @test
- * @bug 5015163 7172553
+ * @bug 5015163 7172553 8249258
  * @summary tests StringJoinerTest
  * @modules java.base/jdk.internal.util
  * @requires os.maxMemory > 4G
@@ -49,6 +49,7 @@
     private static final String FOUR = "Four";
     private static final String FIVE = "Five";
     private static final String DASH = "-";
+    private static final String MAX_STRING = "*".repeat(MAX_ARRAY_LENGTH);
 
     public void addAddAll() {
         StringJoiner sj = new StringJoiner(DASH, "{", "}");
@@ -327,10 +328,8 @@
     }
 
     public void OOM1() {
-        String maxString = "*".repeat(MAX_ARRAY_LENGTH);
-
         try {
-            new StringJoiner(maxString, maxString, maxString).toString();
+            new StringJoiner(MAX_STRING, MAX_STRING, MAX_STRING).toString();
             fail("Should have thrown OutOfMemoryError");
         } catch (OutOfMemoryError ex) {
             // okay
@@ -338,10 +337,8 @@
     }
 
     public void OOM2() {
-        String maxString = "*".repeat(MAX_ARRAY_LENGTH);
-
         try {
-            new StringJoiner(maxString, maxString, "").toString();
+            new StringJoiner(MAX_STRING, MAX_STRING, "").toString();
             fail("Should have thrown OutOfMemoryError");
         } catch (OutOfMemoryError ex) {
             // okay
@@ -349,10 +346,8 @@
     }
 
     public void OOM3() {
-        String maxString = "*".repeat(MAX_ARRAY_LENGTH);
-
         try {
-            new StringJoiner(maxString, "", maxString).toString();
+            new StringJoiner(MAX_STRING, "", MAX_STRING).toString();
             fail("Should have thrown OutOfMemoryError");
         } catch (OutOfMemoryError ex) {
             // okay
@@ -360,10 +355,8 @@
     }
 
     public void OOM4() {
-        String maxString = "*".repeat(MAX_ARRAY_LENGTH);
-
         try {
-            new StringJoiner("", maxString, maxString).toString();
+            new StringJoiner("", MAX_STRING, MAX_STRING).toString();
             fail("Should have thrown OutOfMemoryError");
         } catch (OutOfMemoryError ex) {
             // okay