fix: add tests for utf16string char and byte traversal

Author: itsaky

android-tree-sitter/src/test/java/com/itsaky/androidide/treesitter/ParserTest.java

@@ -46,6 +46,7 @@
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.robolectric.RobolectricTestRunner;
+import static com.itsaky.androidide.treesitter.ResourceUtils.readResource;
 
 @RunWith(RobolectricTestRunner.class)
 public class ParserTest extends TreeSitterTest {
@@ -641,8 +642,4 @@ private static int getTrimmedLength(CharSequence s) {
 
     return end - start;
   }
-
-  private static String readResource(String... names) {
-    return readString(Paths.get("./src/test/resources", names));
-  }
 }

android-tree-sitter/src/test/java/com/itsaky/androidide/treesitter/ResourceUtils.java

@@ -0,0 +1,36 @@
+/*
+ *  This file is part of android-tree-sitter.
+ *
+ *  android-tree-sitter library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  android-tree-sitter library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *  along with android-tree-sitter.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.itsaky.androidide.treesitter;
+
+import static com.itsaky.androidide.treesitter.TestUtils.readString;
+
+import java.nio.file.Paths;
+
+/**
+ * @author Akash Yadav
+ */
+public class ResourceUtils {
+
+  private ResourceUtils() {
+    throw new UnsupportedOperationException();
+  }
+
+  public static String readResource(String... names) {
+    return readString(Paths.get("./src/test/resources", names));
+  }
+}

android-tree-sitter/src/test/java/com/itsaky/androidide/treesitter/UTF16StringTest.java

@@ -18,6 +18,7 @@
 package com.itsaky.androidide.treesitter;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.itsaky.androidide.treesitter.ResourceUtils.readResource;
 
 import com.itsaky.androidide.treesitter.string.UTF16String;
 import com.itsaky.androidide.treesitter.string.UTF16StringFactory;
@@ -182,4 +183,22 @@ public void testInsertAtLength() {
     assertThat(str.toString()).isEqualTo("Hello World!");
     str.close();
   }
+
+  @Test
+  public void testCharIteration() {
+    try (final var str = UTF16StringFactory.newString(readResource("View.java.txt"))) {
+      assertThat(str).isNotNull();
+      str.forEachChar(c -> {});
+      str.forEachChar(100, 1000, c -> {});
+    }
+  }
+
+  @Test
+  public void testByteIteration() {
+    try (final var str = UTF16StringFactory.newString(readResource("View.java.txt"))) {
+      assertThat(str).isNotNull();
+      str.forEachByte(b -> {});
+      str.forEachByte(100, 1000, b -> {});
+    }
+  }
 }

app/src/main/java/com/itsaky/androidide/androidtreesitter/MainActivity.kt

@@ -81,6 +81,39 @@ class MainActivity : AppCompatActivity() {
   private var parseCount = 0L
   private var avgParse = 0L
 
+  companion object {
+
+    private const val TAG = "MainActivity"
+    private const val DEF_ITERS = 1000
+
+    private val languageMap = hashMapOf<String, TSLanguage>()
+
+    init {
+      TreeSitter.loadLibrary()
+
+      System.loadLibrary("tree-sitter-java")
+      System.loadLibrary("tree-sitter-json")
+      System.loadLibrary("tree-sitter-kotlin")
+      System.loadLibrary("tree-sitter-log")
+      System.loadLibrary("tree-sitter-python")
+      System.loadLibrary("tree-sitter-xml")
+
+      languageMap["Java"] = TSLanguageJava.getInstance()
+      languageMap["JSON"] = TSLanguageJson.getInstance()
+      languageMap["Kotlin"] = TSLanguageKotlin.getInstance()
+      languageMap["Log"] = TSLanguageLog.getInstance()
+      languageMap["Python"] = TSLanguagePython.getInstance()
+      languageMap["XML"] = TSLanguageXml.getInstance()
+    }
+
+    private fun StringBuilder.repeatKt(text: String, indent: Int
+    ): StringBuilder {
+      for (i in 1..indent) append(text)
+      return this
+    }
+  }
+
+
   public override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     val binding = ActivityMainBinding.inflate(layoutInflater)
@@ -202,6 +235,9 @@ class MainActivity : AppCompatActivity() {
 
               // byteLength
               string.byteLength()
+
+              string.forEachChar {  }
+              string.forEachByte {  }
             }
 
             val duration = System.currentTimeMillis() - start
@@ -221,7 +257,7 @@ class MainActivity : AppCompatActivity() {
         Total duration: ${totalDuration / 1000} seconds
       """.trimIndent())
       }
-    }
+    }.logOnErr("doStringPerfTest")
   }
 
   @Suppress("DEPRECATION")
@@ -293,7 +329,7 @@ class MainActivity : AppCompatActivity() {
           """.trimIndent())
         }
       }
-    }
+    }.logOnErr("doParserPerfTest")
   }
 
   private inline fun viewJavaTxt(syncString: Boolean = true,
@@ -452,6 +488,14 @@ class MainActivity : AppCompatActivity() {
     }
   }
 
+  private fun Job.logOnErr(name: String) {
+    invokeOnCompletion { err ->
+      if (err != null) {
+        Log.e(TAG, "logOnErr: Failed to run job: $name", err)
+      }
+    }
+  }
+
   private fun trace(err: Throwable): String {
     val sw = StringWriter()
     err.printStackTrace(PrintWriter(sw))
@@ -470,35 +514,4 @@ class MainActivity : AppCompatActivity() {
     ) {
     }
   }
-
-  companion object {
-
-    private const val DEF_ITERS = 1000
-
-    private val languageMap = hashMapOf<String, TSLanguage>()
-
-    init {
-      TreeSitter.loadLibrary()
-
-      System.loadLibrary("tree-sitter-java")
-      System.loadLibrary("tree-sitter-json")
-      System.loadLibrary("tree-sitter-kotlin")
-      System.loadLibrary("tree-sitter-log")
-      System.loadLibrary("tree-sitter-python")
-      System.loadLibrary("tree-sitter-xml")
-
-      languageMap["Java"] = TSLanguageJava.getInstance()
-      languageMap["JSON"] = TSLanguageJson.getInstance()
-      languageMap["Kotlin"] = TSLanguageKotlin.getInstance()
-      languageMap["Log"] = TSLanguageLog.getInstance()
-      languageMap["Python"] = TSLanguagePython.getInstance()
-      languageMap["XML"] = TSLanguageXml.getInstance()
-    }
-
-    private fun StringBuilder.repeatKt(text: String, indent: Int
-    ): StringBuilder {
-      for (i in 1..indent) append(text)
-      return this
-    }
-  }
 }