cleanup and move unit tests

Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Aug 4, 2023 · 65a19b1 · 65a19b1
1 parent 01c2d77
commit 65a19b1
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 42 deletions.
diff --git a/libs/core/src/test/java/org/opensearch/core/common/StringsTests.java b/libs/core/src/test/java/org/opensearch/core/common/StringsTests.java
@@ -11,8 +11,37 @@
 import org.opensearch.common.util.set.Sets;
 import org.opensearch.test.OpenSearchTestCase;
 
+import static org.hamcrest.Matchers.is;
+
 /** tests for Strings utility class */
 public class StringsTests extends OpenSearchTestCase {
+    public void testIsAllOrWildCardString() {
+        assertThat(Strings.isAllOrWildcard("_all"), is(true));
+        assertThat(Strings.isAllOrWildcard("*"), is(true));
+        assertThat(Strings.isAllOrWildcard("foo"), is(false));
+        assertThat(Strings.isAllOrWildcard(""), is(false));
+        assertThat(Strings.isAllOrWildcard((String) null), is(false));
+    }
+
+    public void testCleanTruncate() {
+        assertEquals(null, Strings.cleanTruncate(null, 10));
+        assertEquals("foo", Strings.cleanTruncate("foo", 10));
+        assertEquals("foo", Strings.cleanTruncate("foo", 3));
+        // Throws out high surrogates
+        assertEquals("foo", Strings.cleanTruncate("foo\uD83D\uDEAB", 4));
+        // But will keep the whole character
+        assertEquals("foo\uD83D\uDEAB", Strings.cleanTruncate("foo\uD83D\uDEAB", 5));
+        /*
+         * Doesn't take care around combining marks. This example has its
+         * meaning changed because that last codepoint is supposed to combine
+         * backwards into the find "o" and be represented as the "o" with a
+         * circle around it with a slash through it. As in "no 'o's allowed
+         * here.
+         */
+        assertEquals("o", org.opensearch.core.common.Strings.cleanTruncate("o\uD83D\uDEAB", 1));
+        assertEquals("", org.opensearch.core.common.Strings.cleanTruncate("foo", 0));
+    }
+
     public void testSplitStringToSet() {
         assertEquals(Strings.tokenizeByCommaToSet(null), Sets.newHashSet());
         assertEquals(Strings.tokenizeByCommaToSet(""), Sets.newHashSet());

diff --git a/...terTest/java/org/opensearch/search/aggregations/bucket/terms/BaseStringTermsTestCase.java b/...terTest/java/org/opensearch/search/aggregations/bucket/terms/BaseStringTermsTestCase.java
@@ -131,9 +131,9 @@ public void setupSuiteScopeCluster() throws Exception {
                 client().prepareIndex("high_card_idx")
                     .setSource(
                         jsonBuilder().startObject()
-                            .field(SINGLE_VALUED_FIELD_NAME, "val" + org.opensearch.core.common.Strings.padStart(i + "", 3, '0'))
+                            .field(SINGLE_VALUED_FIELD_NAME, "val" + Strings.padStart(i + "", 3, '0'))
                             .startArray(MULTI_VALUED_FIELD_NAME)
-                            .value("val" + org.opensearch.core.common.Strings.padStart(i + "", 3, '0'))
+                            .value("val" + Strings.padStart(i + "", 3, '0'))
                             .value("val" + Strings.padStart((i + 1) + "", 3, '0'))
                             .endArray()
                             .endObject()

diff --git a/server/src/main/java/org/opensearch/index/IndexingSlowLog.java b/server/src/main/java/org/opensearch/index/IndexingSlowLog.java
@@ -245,7 +245,7 @@ private static Map<String, Object> prepareMap(
             }
             try {
                 String source = XContentHelper.convertToJson(doc.source(), reformat, doc.getMediaType());
-                String trim = org.opensearch.core.common.Strings.cleanTruncate(source, maxSourceCharsToLog).trim();
+                String trim = Strings.cleanTruncate(source, maxSourceCharsToLog).trim();
                 StringBuilder sb = new StringBuilder(trim);
                 StringBuilders.escapeJson(sb, 0);
                 map.put("source", sb.toString());

diff --git a/server/src/main/java/org/opensearch/rest/RestRequest.java b/server/src/main/java/org/opensearch/rest/RestRequest.java
@@ -37,18 +37,17 @@
 import org.opensearch.common.CheckedConsumer;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.SetOnce;
-import org.opensearch.common.Strings;
-import org.opensearch.core.common.bytes.BytesArray;
-import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.common.collect.Tuple;
-import org.opensearch.core.common.unit.ByteSizeValue;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.bytes.BytesArray;
+import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.common.unit.ByteSizeValue;
 import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.http.HttpChannel;
 import org.opensearch.http.HttpRequest;
 
@@ -337,7 +336,7 @@ public final long getRequestId() {
     }
 
     /**
-     * The {@link XContentType} that was parsed from the {@code Content-Type} header. This value will be {@code null} in the case of
+     * The {@link MediaType} that was parsed from the {@code Content-Type} header. This value will be {@code null} in the case of
      * a request without a valid {@code Content-Type} header, a request without content ({@link #hasContent()}, or a plain text request
      */
     @Nullable

diff --git a/server/src/test/java/org/opensearch/common/StringsTests.java b/server/src/test/java/org/opensearch/common/StringsTests.java
@@ -32,26 +32,17 @@
 
 package org.opensearch.common;
 
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.MediaTypeRegistry;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.util.Collections;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
 
 public class StringsTests extends OpenSearchTestCase {
 
-    public void testIsAllOrWildCardString() {
-        assertThat(org.opensearch.core.common.Strings.isAllOrWildcard("_all"), is(true));
-        assertThat(org.opensearch.core.common.Strings.isAllOrWildcard("*"), is(true));
-        assertThat(org.opensearch.core.common.Strings.isAllOrWildcard("foo"), is(false));
-        assertThat(org.opensearch.core.common.Strings.isAllOrWildcard(""), is(false));
-        assertThat(org.opensearch.core.common.Strings.isAllOrWildcard((String) null), is(false));
-    }
-
     public void testSubstring() {
         assertEquals(null, Strings.substring(null, 0, 1000));
         assertEquals("foo", Strings.substring("foo", 0, 1000));
@@ -61,25 +52,6 @@ public void testSubstring() {
         assertEquals("f", Strings.substring("foo", 0, 1));
     }
 
-    public void testCleanTruncate() {
-        assertEquals(null, org.opensearch.core.common.Strings.cleanTruncate(null, 10));
-        assertEquals("foo", org.opensearch.core.common.Strings.cleanTruncate("foo", 10));
-        assertEquals("foo", org.opensearch.core.common.Strings.cleanTruncate("foo", 3));
-        // Throws out high surrogates
-        assertEquals("foo", org.opensearch.core.common.Strings.cleanTruncate("foo\uD83D\uDEAB", 4));
-        // But will keep the whole character
-        assertEquals("foo\uD83D\uDEAB", org.opensearch.core.common.Strings.cleanTruncate("foo\uD83D\uDEAB", 5));
-        /*
-         * Doesn't take care around combining marks. This example has its
-         * meaning changed because that last codepoint is supposed to combine
-         * backwards into the find "o" and be represented as the "o" with a
-         * circle around it with a slash through it. As in "no 'o's allowed
-         * here.
-         */
-        assertEquals("o", org.opensearch.core.common.Strings.cleanTruncate("o\uD83D\uDEAB", 1));
-        assertEquals("", org.opensearch.core.common.Strings.cleanTruncate("foo", 0));
-    }
-
     public void testToStringToXContent() {
         final ToXContent toXContent;
         final boolean error;
@@ -104,7 +76,7 @@ public void testToStringToXContent() {
             }
         }
 
-        String toString = Strings.toString(XContentType.JSON, toXContent);
+        String toString = Strings.toString(MediaTypeRegistry.JSON, toXContent);
         if (error) {
             assertThat(toString, containsString("\"error\":\"error building toString out of XContent:"));
             assertThat(toString, containsString("\"stack_trace\":"));
@@ -117,10 +89,10 @@ public void testToStringToXContent() {
     public void testToStringToXContentWithOrWithoutParams() {
         ToXContent toXContent = (builder, params) -> builder.field("color_from_param", params.param("color", "red"));
         // Rely on the default value of "color" param when params are not passed
-        assertThat(Strings.toString(XContentType.JSON, toXContent), containsString("\"color_from_param\":\"red\""));
+        assertThat(Strings.toString(MediaTypeRegistry.JSON, toXContent), containsString("\"color_from_param\":\"red\""));
         // Pass "color" param explicitly
         assertThat(
-            Strings.toString(XContentType.JSON, toXContent, new ToXContent.MapParams(Collections.singletonMap("color", "blue"))),
+            Strings.toString(MediaTypeRegistry.JSON, toXContent, new ToXContent.MapParams(Collections.singletonMap("color", "blue"))),
             containsString("\"color_from_param\":\"blue\"")
         );
     }

diff --git a/test/framework/src/main/java/org/opensearch/cluster/coordination/LinearizabilityChecker.java b/test/framework/src/main/java/org/opensearch/cluster/coordination/LinearizabilityChecker.java
@@ -361,7 +361,7 @@ private static String visualizeEntry(Entry entry, Map<Tuple<EventType, Integer>,
         int beginIndex = eventToPosition.get(Tuple.tuple(EventType.INVOCATION, id));
         int endIndex = eventToPosition.get(Tuple.tuple(EventType.RESPONSE, id));
         input = input.substring(0, Math.min(beginIndex + 25, input.length()));
-        return org.opensearch.core.common.Strings.padStart(input, beginIndex + 25, ' ')
+        return Strings.padStart(input, beginIndex + 25, ' ')
             + "   "
             + Strings.padStart("", endIndex - beginIndex, 'X')
             + "   "