From da7176f9d4aa52c4c702a582e5cd434ae19b2400 Mon Sep 17 00:00:00 2001 From: EmilyTheStrange <167097415+EmilyTheStrange1207@users.noreply.github.com> Date: Sat, 28 Sep 2024 07:22:07 +0200 Subject: [PATCH] Revert "Refactor StringUtils.isContains" --- src/main/java/org/tron/keystore/StringUtils.java | 5 ++--- src/test/java/org/tron/keystore/StringUtilsTest.java | 11 +---------- 2 files changed, 3 insertions(+), 13 deletions(-) mode change 100755 => 100644 src/main/java/org/tron/keystore/StringUtils.java mode change 100755 => 100644 src/test/java/org/tron/keystore/StringUtilsTest.java diff --git a/src/main/java/org/tron/keystore/StringUtils.java b/src/main/java/org/tron/keystore/StringUtils.java old mode 100755 new mode 100644 index d722340db..d2224a508 --- a/src/main/java/org/tron/keystore/StringUtils.java +++ b/src/main/java/org/tron/keystore/StringUtils.java @@ -57,11 +57,10 @@ public static boolean isContains(char[] a, char[] b) { if (ArrayUtils.isEmpty(a) || ArrayUtils.isEmpty(b)) { return false; } + int alen = a.length; int blen = b.length; - if (alen < blen) { - return false; - } + for (int i = 0; i < alen; i++) { if (alen - i < blen) { return false; diff --git a/src/test/java/org/tron/keystore/StringUtilsTest.java b/src/test/java/org/tron/keystore/StringUtilsTest.java old mode 100755 new mode 100644 index ac0282a70..194cc82db --- a/src/test/java/org/tron/keystore/StringUtilsTest.java +++ b/src/test/java/org/tron/keystore/StringUtilsTest.java @@ -7,6 +7,7 @@ public class StringUtilsTest { + @Test public void isCharEqual() { char[] a = "aaaaaa".toCharArray(); @@ -29,16 +30,6 @@ public void isContains() { char[] b = "ghijkl".toCharArray(); char[] c = "defghi".toCharArray(); char[] d = "abcdefghijkl".toCharArray(); - char[] empty = "".toCharArray(); - - char[] longarr = "xxxxxxxx123xxxxxxxxx".toCharArray(); - char[] shortarr = "123".toCharArray(); - Assert.assertFalse(StringUtils.isContains(shortarr, longarr)); - Assert.assertTrue(StringUtils.isContains(longarr, shortarr)); - - Assert.assertFalse(StringUtils.isContains(empty, d)); - Assert.assertFalse(StringUtils.isContains(d, empty)); - Assert.assertTrue(StringUtils.isContains(d, d)); Assert.assertTrue(StringUtils.isContains(d, a)); Assert.assertTrue(StringUtils.isContains(d, b));