From 11a2cf129cdeccf376674b2ee9326cf79bcd8e23 Mon Sep 17 00:00:00 2001 From: Mixpa <514518274@qq.com> Date: Mon, 26 Aug 2019 08:43:07 -0700 Subject: [PATCH] Simplify while+break into do-while. Fixes #3577 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=265464337 --- .../test/com/google/common/base/CharMatcherTest.java | 7 ++----- .../test/com/google/common/base/CharMatcherTest.java | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/android/guava-tests/test/com/google/common/base/CharMatcherTest.java b/android/guava-tests/test/com/google/common/base/CharMatcherTest.java index db5626017cff..5412882c5641 100644 --- a/android/guava-tests/test/com/google/common/base/CharMatcherTest.java +++ b/android/guava-tests/test/com/google/common/base/CharMatcherTest.java @@ -727,12 +727,9 @@ static char[] randomChars(Random rand, int size) { Set chars = new HashSet<>(size); for (int i = 0; i < size; i++) { char c; - while (true) { + do { c = (char) rand.nextInt(Character.MAX_VALUE - Character.MIN_VALUE + 1); - if (!chars.contains(c)) { - break; - } - } + } while (chars.contains(c)); chars.add(c); } char[] retValue = new char[chars.size()]; diff --git a/guava-tests/test/com/google/common/base/CharMatcherTest.java b/guava-tests/test/com/google/common/base/CharMatcherTest.java index db5626017cff..5412882c5641 100644 --- a/guava-tests/test/com/google/common/base/CharMatcherTest.java +++ b/guava-tests/test/com/google/common/base/CharMatcherTest.java @@ -727,12 +727,9 @@ static char[] randomChars(Random rand, int size) { Set chars = new HashSet<>(size); for (int i = 0; i < size; i++) { char c; - while (true) { + do { c = (char) rand.nextInt(Character.MAX_VALUE - Character.MIN_VALUE + 1); - if (!chars.contains(c)) { - break; - } - } + } while (chars.contains(c)); chars.add(c); } char[] retValue = new char[chars.size()];