From f9131e901c2d5c21f3f5fc4d51c0ba0cd400d77e Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 20 Jun 2023 16:47:13 +0200
Subject: [PATCH 1/9] Add wrapper for libzim search and suggestion.

---
 .../test/org/kiwix/test/libzim/TestQuery.java | 35 ++++++++++++++
 .../org/kiwix/test/libzim/TestSearch.java     | 31 ++++++++++++
 .../kiwix/test/libzim/TestSearchIterator.java | 40 ++++++++++++++++
 .../org/kiwix/test/libzim/TestSearcher.java   | 47 +++++++++++++++++++
 .../kiwix/test/libzim/TestSuggestionItem.java | 32 +++++++++++++
 .../test/libzim/TestSuggestionIterator.java   | 31 ++++++++++++
 .../test/libzim/TestSuggestionSearch.java     | 31 ++++++++++++
 .../test/libzim/TestSuggestionSearcher.java   | 37 +++++++++++++++
 lib/src/test/test.java                        | 22 ++++-----
 9 files changed, 295 insertions(+), 11 deletions(-)
 create mode 100644 lib/src/test/org/kiwix/test/libzim/TestQuery.java
 create mode 100644 lib/src/test/org/kiwix/test/libzim/TestSearch.java
 create mode 100644 lib/src/test/org/kiwix/test/libzim/TestSearchIterator.java
 create mode 100644 lib/src/test/org/kiwix/test/libzim/TestSearcher.java
 create mode 100644 lib/src/test/org/kiwix/test/libzim/TestSuggestionItem.java
 create mode 100644 lib/src/test/org/kiwix/test/libzim/TestSuggestionIterator.java
 create mode 100644 lib/src/test/org/kiwix/test/libzim/TestSuggestionSearch.java
 create mode 100644 lib/src/test/org/kiwix/test/libzim/TestSuggestionSearcher.java

diff --git a/lib/src/test/org/kiwix/test/libzim/TestQuery.java b/lib/src/test/org/kiwix/test/libzim/TestQuery.java
new file mode 100644
index 0000000..24b4dcb
--- /dev/null
+++ b/lib/src/test/org/kiwix/test/libzim/TestQuery.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2022 Matthieu Gautier <mgautier@kymeria.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package org.kiwix.test.libzim;
+
+import org.kiwix.libzim.Query;
+
+public class TestQuery
+{
+  private Query inner;
+  public Query inner() { return inner; }
+  public TestQuery(String query) {
+    inner = new Query(query);
+  }
+
+  public TestQuery setQuery(String query) { inner.setQuery(query); return this; }
+  public TestQuery setGeorange(float latitude, float longitute, float distance) { inner.setGeorange(latitude, latitude, distance); return this; }
+
+}
diff --git a/lib/src/test/org/kiwix/test/libzim/TestSearch.java b/lib/src/test/org/kiwix/test/libzim/TestSearch.java
new file mode 100644
index 0000000..d7c2ca1
--- /dev/null
+++ b/lib/src/test/org/kiwix/test/libzim/TestSearch.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 Matthieu Gautier <mgautier@kymeria.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package org.kiwix.test.libzim;
+
+import org.kiwix.libzim.Search;
+import org.kiwix.libzim.SearchIterator;
+
+public class TestSearch
+{
+  private Search inner;
+  public TestSearch(Search _inner) { inner = _inner; }
+  public TestSearchIterator getResults(int start, int maxResults) { return new TestSearchIterator(inner.getResults(start, maxResults)); }
+  public long getEstimatedMatches() { return inner.getEstimatedMatches(); }
+}
diff --git a/lib/src/test/org/kiwix/test/libzim/TestSearchIterator.java b/lib/src/test/org/kiwix/test/libzim/TestSearchIterator.java
new file mode 100644
index 0000000..f942c28
--- /dev/null
+++ b/lib/src/test/org/kiwix/test/libzim/TestSearchIterator.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2022 Matthieu Gautier <mgautier@kymeria.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package org.kiwix.test.libzim;
+
+import org.kiwix.libzim.SearchIterator;
+import java.util.Iterator;
+
+public class TestSearchIterator implements Iterator<TestEntry>
+{
+  private SearchIterator inner;
+  public TestSearchIterator(SearchIterator _inner) { inner = _inner; }
+  public String getPath() { return inner.getPath(); }
+  public String getTitle() { return inner.getTitle(); }
+  public int getScore() { return inner.getScore(); }
+  public String getSnippet() { return inner.getSnippet(); }
+  public int getWordCount() { return inner.getWordCount(); }
+  public int getFileIndex() { return inner.getFileIndex(); }
+  public int getSize() { return inner.getSize(); }
+  public String getZimId() { return inner.getZimId(); }
+
+  public boolean hasNext() { return inner.hasNext(); }
+  public TestEntry next() { return new TestEntry(inner.next()); }
+}
diff --git a/lib/src/test/org/kiwix/test/libzim/TestSearcher.java b/lib/src/test/org/kiwix/test/libzim/TestSearcher.java
new file mode 100644
index 0000000..4fd7de4
--- /dev/null
+++ b/lib/src/test/org/kiwix/test/libzim/TestSearcher.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2022 Matthieu Gautier <mgautier@kymeria.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package org.kiwix.test.libzim;
+
+import org.kiwix.libzim.Archive;
+import org.kiwix.libzim.Searcher;
+import org.kiwix.libzim.Search;
+import java.util.stream.Stream;
+
+public class TestSearcher
+{
+  private Searcher inner;
+  public TestSearcher(TestArchive archive) throws Exception
+  {
+    inner = new Searcher(archive.inner());
+  }
+
+  public TestSearcher(TestArchive[] archives) throws Exception
+  {
+    inner = new Searcher(
+      Stream.of(archives).map(a -> a.inner()).toArray(Archive[]::new)
+    );
+  }
+
+  public TestSearcher addArchive(TestArchive archive) { inner.addArchive(archive.inner()); return this; }
+  public TestSearch search(TestQuery query) { return new TestSearch(inner.search(query.inner())); }
+  public void setVerbose(boolean verbose) { inner.setVerbose(verbose); }
+
+  public void dispose() { inner.dispose(); }
+}
diff --git a/lib/src/test/org/kiwix/test/libzim/TestSuggestionItem.java b/lib/src/test/org/kiwix/test/libzim/TestSuggestionItem.java
new file mode 100644
index 0000000..b3f9ab3
--- /dev/null
+++ b/lib/src/test/org/kiwix/test/libzim/TestSuggestionItem.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2022 Matthieu Gautier <mgautier@kymeria.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package org.kiwix.test.libzim;
+
+import org.kiwix.libzim.SuggestionItem;
+
+public class TestSuggestionItem
+{
+  private SuggestionItem inner;
+  public TestSuggestionItem(SuggestionItem _inner) { inner = _inner; }
+  public String getTitle() { return inner.getTitle(); }
+  public String getPath() { return inner.getPath(); }
+  public String getSnippet() { return inner.getSnippet(); }
+  public boolean hasSnippet() { return inner.hasSnippet(); }
+}
diff --git a/lib/src/test/org/kiwix/test/libzim/TestSuggestionIterator.java b/lib/src/test/org/kiwix/test/libzim/TestSuggestionIterator.java
new file mode 100644
index 0000000..89133fe
--- /dev/null
+++ b/lib/src/test/org/kiwix/test/libzim/TestSuggestionIterator.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 Matthieu Gautier <mgautier@kymeria.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package org.kiwix.test.libzim;
+
+import org.kiwix.libzim.SuggestionIterator;
+import java.util.Iterator;
+
+public class TestSuggestionIterator implements Iterator<TestSuggestionItem>
+{
+  private SuggestionIterator inner;
+  public TestSuggestionIterator(SuggestionIterator _inner) { inner = _inner; }
+  public boolean hasNext() { return inner.hasNext(); }
+  public TestSuggestionItem next() { return new TestSuggestionItem(inner.next()); }
+}
diff --git a/lib/src/test/org/kiwix/test/libzim/TestSuggestionSearch.java b/lib/src/test/org/kiwix/test/libzim/TestSuggestionSearch.java
new file mode 100644
index 0000000..093bff7
--- /dev/null
+++ b/lib/src/test/org/kiwix/test/libzim/TestSuggestionSearch.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 Matthieu Gautier <mgautier@kymeria.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package org.kiwix.test.libzim;
+
+import org.kiwix.libzim.SuggestionSearch;
+
+public class TestSuggestionSearch
+{
+  private SuggestionSearch inner;
+  public TestSuggestionSearch(SuggestionSearch _inner) { inner = _inner; }
+
+  public TestSuggestionIterator getResults(int start, int maxResults) { return new TestSuggestionIterator(inner.getResults(start, maxResults)); }
+  public long getEstimatedMatches() { return inner.getEstimatedMatches(); }
+}
diff --git a/lib/src/test/org/kiwix/test/libzim/TestSuggestionSearcher.java b/lib/src/test/org/kiwix/test/libzim/TestSuggestionSearcher.java
new file mode 100644
index 0000000..e91eba5
--- /dev/null
+++ b/lib/src/test/org/kiwix/test/libzim/TestSuggestionSearcher.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2022 Matthieu Gautier <mgautier@kymeria.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package org.kiwix.test.libzim;
+
+import org.kiwix.libzim.SuggestionSearcher;
+
+import java.io.FileDescriptor;
+
+public class TestSuggestionSearcher
+{
+  private SuggestionSearcher inner;
+  public TestSuggestionSearcher(TestArchive archive) throws Exception
+  {
+    inner = new SuggestionSearcher(archive.inner());
+  }
+
+  public TestSuggestionSearch suggest(String query) { return new TestSuggestionSearch(inner.suggest(query)); }
+  public void setVerbose(boolean verbose) { inner.setVerbose(verbose); }
+  public void dispose() { inner.dispose(); }
+}
diff --git a/lib/src/test/test.java b/lib/src/test/test.java
index 6528de2..8a636cb 100644
--- a/lib/src/test/test.java
+++ b/lib/src/test/test.java
@@ -177,30 +177,30 @@ public class test {
         bookmarkArray = lib.getBookmarks(true);
         assertEquals(0, bookmarkArray.length);
     }
-/*
+
     @Test
     public void testSearcher() throws Exception, ZimFileFormatException, JNIKiwixException {
-        Archive archive = new Archive("small.zim");
+        TestArchive archive = new TestArchive("small.zim");
 
-        Searcher searcher = new Searcher(archive);
-        Query query = new Query("test");
-        Search search = searcher.search(query);
+        TestSearcher searcher = new TestSearcher(archive);
+        TestQuery query = new TestQuery("test");
+        TestSearch search = searcher.search(query);
         int estimatedMatches = (int) search.getEstimatedMatches();
         assertEquals(1, estimatedMatches);
-        SearchIterator iterator = search.getResults(0, estimatedMatches);
+        TestSearchIterator iterator = search.getResults(0, estimatedMatches);
         assertEquals("Test ZIM file", iterator.getTitle());
         searcher.dispose();
 
-        SuggestionSearcher suggestionSearcher = new SuggestionSearcher(archive);
-        SuggestionSearch suggestionSearch = suggestionSearcher.suggest("test");
+        TestSuggestionSearcher suggestionSearcher = new TestSuggestionSearcher(archive);
+        TestSuggestionSearch suggestionSearch = suggestionSearcher.suggest("test");
         int matches = (int) suggestionSearch.getEstimatedMatches();
         assertEquals(1, matches);
-        SuggestionIterator results = suggestionSearch.getResults(1, matches);
-        SuggestionItem suggestionItem = results.next();
+        TestSuggestionIterator results = suggestionSearch.getResults(1, matches);
+        TestSuggestionItem suggestionItem = results.next();
         assertEquals("Test ZIM file", suggestionItem.getTitle());
         suggestionSearcher.dispose();
     }
-*/
+
     static
     public void main(String[] args) {
         Library lib = new Library();

From fb83f1154b284fe9e25ac4181b5b8976a2ccb2a1 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 21 Jun 2023 11:34:29 +0200
Subject: [PATCH 2/9] Create the test zim file with a xapian FT index.

---
 lib/src/test/create_test_zimfiles | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/src/test/create_test_zimfiles b/lib/src/test/create_test_zimfiles
index 4610b7d..95e0dfd 100755
--- a/lib/src/test/create_test_zimfiles
+++ b/lib/src/test/create_test_zimfiles
@@ -8,8 +8,7 @@ die()
 
 cd "$(dirname "$0")"
 rm -f small.zim
-zimwriterfs --withoutFTIndex \
-            -w main.html \
+zimwriterfs -w main.html \
             -f favicon.png \
             -l en \
             -t "Test ZIM file" \

From 61faa653430d71a4a0fc6ea09e0af7150097aa9f Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 21 Jun 2023 11:35:08 +0200
Subject: [PATCH 3/9] Addapt create_test_zimfiles to last zimwriterfs.

---
 lib/src/test/create_test_zimfiles | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/src/test/create_test_zimfiles b/lib/src/test/create_test_zimfiles
index 95e0dfd..ac60bcd 100755
--- a/lib/src/test/create_test_zimfiles
+++ b/lib/src/test/create_test_zimfiles
@@ -9,10 +9,12 @@ die()
 cd "$(dirname "$0")"
 rm -f small.zim
 zimwriterfs -w main.html \
-            -f favicon.png \
-            -l en \
+            -n "Test" \
+            -I favicon.png \
+            -l eng \
             -t "Test ZIM file" \
             -d "N/A" \
+            -L "Test File" \
             -c "N/A" \
             -p "N/A" \
             small_zimfile_data \

From c7ac3a0878686e1e0b9ab18c4af4927dff5b9066 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 21 Jun 2023 11:36:36 +0200
Subject: [PATCH 4/9] Update test zim file.

zim files have been created using a recent version of zimwriterfs
(including the fix for openzim/zim-tools#355
---
 lib/src/test/small.zim          | Bin 4070 -> 66910 bytes
 lib/src/test/small.zim.embedded | Bin 4084 -> 66924 bytes
 lib/src/test/test.java          |  14 +++++++++-----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/src/test/small.zim b/lib/src/test/small.zim
index cb7072da6ec68a73f35bfe73c81c745b087ae8d5..eb9674bd6a7809353ab0313919d1bd0586d26857 100644
GIT binary patch
literal 66910
zcmeI*c|4SB-vID?%-HumQX_Pdoyb;FlqFk{r6XoCV@%DAWd=hW(neBb3l*nCi|9!U
zC0Vl-qLLhIRA?iTB=0?Pdd}%R@B99D-sgEfzxjNw`Ca#YU31^p{hiTteP-r&ZMU(<
z@gNwa%0#!a+U<0Vsl})8q5wKh5<w6ywB+G1=skjHa(#<t+~1<p{9XhRLE{{Hb6D6<
z3<#i6eTXcoKSSH!hec*-GFd@nB3+$L44@Jj$p6?LPNmbROcs?vL8x>hg{&Qb)>vdV
zOWTh{r+uph(1=vVAF8H4e#9UqnYA{U<*RA5Fd_&b00JNY0w4ea|Ca!_>UHf|#BVtt
zlGbXds(8tj7x7g>Qa|al(`2@NHL_kk`qb&9$dRODcNsU_cF@HM(a{)Nj4GmoXdt3(
zMh-cF!uf$YywlPTi>yDb8}lBR`_lV<-FQ_0TxHb0xz@S8a~RAqmC&lm)(a~<8zu6h
z`})qWc8>PA5VUz|=7D0r659>*RlylXT;Yl5z7TfMNn2$F(ozR#aoU<8-GwQ!*Yi|U
zo35U#Jw=LaX?wxIy%i_={p04D!6PSLpHlQWa`}jL{^=s!E|E<qA2oKxo%~eE+YzoO
z!Od03+tHrMt*n*0W$66ii$<XedJRShS*IM(tmC&vp&^TSLN>DYV7ngIW_Gqiv4px#
zoVk##6h;B{Iwgc4OXbiKhL&jr*@YGcTH>4>tb_&R1<)?SHrAF~(Wt{Id_3sA8`tz9
z1QD{fv0U%Me)hnf+ex8Q=0MzSrNAlN&63-ko211$iDkEr)+7hVU#{h}9LlIHojX}r
zsHN9*<x1lv6N9y@x{F%wyz>leQIb6tVNTC6O1xzCOU^1C!B08v|JX?hHtA-1<|CVf
zR*f}Ahn7c7_qY~$&C=s#G>;z=S)!I8Zy@pIG;X3fAy;$n$BL<;rgX!PZ@W#YUp|fL
zk?O@VbbSs!D)P?uiozJZ*fees?JTYCdStZgrvK+F#Ohqv%iFhJbXh64HvHP7%Rd`p
z=DfLS%*A7CDq@s29$pkaIg*+uk#CnvsEiSqHVGb48JICNuY7Ii_i`X_=C(~5W;>U2
z^l*hvj$kW)$(CYY`{yNr&ucn6Jv1~mZM@cBa=lzrUA?cPXil}OuQMXSb4Q)&ty2H%
z%;2o)(8LhTN95i3%NGCrzx0N@d1esUSFyKYZTN&vjAvPLa`I9WN4&wVl$4du2Q3Yx
z)Lg9nq+;BUy_-df&+aW|l6eh}snbnZkEWIwsdDqYnmeqpiOX<vn#KjZ?oP{RN0*qA
z=DyBK$jhstmzrKtVa_iilJ+3WaI>{_EbZx)_4kf0QP**J{rYuoK!26KdD51dk8i>v
zwRe}YCy?oqB%gbE;bCDm@i*RVUA7GKnrT}u5P(_l=Xr~DVMF-K=2KV0CwFC-h8EsG
zY3!V5pY@Y-o?TL$<O+e}rW3k8q`~^64c($k*SKFXi9uxC+}x-=Wyb5M70Z~%F=Luq
z_F2Q}n%-K>mk%VT@*W6(EPT5~F<S^Xxc`fj;?f{%bimmI{Tt(Ds5Kc}HW6*PHt)po
zW)UUFm3W2aRc2?V(#;}2^Kp47>ekl3?Y`X}ZQY)3%x1d;vp$qODQC*=%g)Xg!s~8T
z@az^2DSTV5xKxP7a~d;!)xu0n&hjp!+hpTU>aGP&u`QVf>dphLd(vuFo@+j3y1C`_
z+S<B0D>aw%1Q)EgTqKW>`@2_fiHnTG?Jnl$=d)h@ww&85it=*gnau<9{OBhY+U70m
zl<sn!+i{oPwYu{fHF-nC$Jd<#V;7wBchy`7bRNL+2ssVzv@P?gJ9_wI*EQ<dMP&-(
zS8m)`Eu-p0DDRysGZbB7taLs2(9z*lzW1dJ>+5<RYqpgKJ{M4%epaEZD5@j!G+BE3
zLcJ7E;{l!JX2dF-^T4ChO$tHnv4)J_+#hoO#`NjWTx_!amgIUA`yLh-l+{W+5dSj&
zz`>|YvBitkBYA~w_jR<t@$|$7`1c4+M``w5_A<pLy{He}XhA0M@CyjE#X6o|W4w7_
z_VZ+WZ0K;?#>6>~g7Y7yoXXgNu3oh{r|*Qv9_!_qelu7kAuYYUUz~Wst9*3ekO;n9
zKbb2;*6+NR8|I9jvNw)x6Jr;DUn8$3$t=UeE>8W{+b5T^t}(hZRcxMUj1M*_&+<-4
z&ms7*_wV<juO*w9)jajLCQpm@mt4$9)J9ae(nh9~%p-hxaN7z!jhAU?9Fg0k+<g4l
z{o~66!%wxD6Pu2&naSoBeA!r+9ie&*zb;ML>X#ZdcEiciV)v(J`t4?qxK1M`lY1zA
zX~U5TP9u^h0?|M5TH6e&)`~!183~G-%9z6`lZPL+|EhP0M|h;^mhf)H3~v<^lkFR-
z&62N=y2al<w0PBGw-*QGumae+z3zPi@8w^S!h88&=?S+rq!?}8xoKd#?{Mp{`>xTu
z(oR3vsuwvkDNd3P<7@CNkMQ8y_jSbw+54$&=Tcv$OgE*f*Ij#7aYQ`Ld|QQZ{qE0E
zVdi6BW4HycrZ(A>?YJFcYg^!Q;kd`RN(tfN8hbsfV@s2Sdq#8p=gjo&Znr#mVBfkf
za8)s1{g^xM&5EmQE1K)~mrQ#$r^Ie*E+ffbJib2dS5j4#g>=LF(DpraI(>Snmp3kG
z&6!07=syJwuHsvn#*6jCb)6d~MjabIDXuk>vey$dX!s&x-EDi&V#{+isV4p~3eNw_
zy@bWXVVdd6#eSH^RO7&b{hLlkmL()4cr<A2Cz(x8D2IKX;9q{0B-dhaDdq6j$qw(P
zhU67Pb;?#MN;_}r)1TPwNfWu~dRe~R=jg2m=luMWXJ=>a<J7(8#xMB~PG*IUe`r~!
zo+>qE+fx?Ce*@EYmAsip7wc3|a9L5@(Ku|xEiNuDDYm;`LTqqFdZDMpogT%pvG6ci
zS#AH`d&K6OK{L%eGS*TGeUbQ|s}Bl459n52!K3gKHROa^V0a8hfFIX*hxeg*N=ZqH
zTJE$Gtub|`bQi5C%$_%Z?AMyHibCr8DArlNJIiwYjJEfkBw20mrefKm!Ql_GS0n2j
ze(SK!a^!9(eq+5=zD(iB%qumI0{wye!z$ws^ZSF|zjyN!+(nKMzirLW$Co(Vp07?#
zRj+;87urmu`)Hbmyh(Xl=Q#K<nIiGw)dkBsv$R9H$5cpNBE{>y&u$VX7gfY$Chu?^
z|2#R0zAV|k@|47fA3{EU+<K!R^{V~E<m5K4p32JgsNdn<CbggewXI$=qLD`*$0zL(
zJv-Dqt6CcNa<8RV+2N|kM$TA83zK~vz2uJQXRl12`ysLI;o+4m>XyivrtUqWuk6{A
z7uFp4MMd%_hrT$jTMY+P=DeQY!>ak}s;jGa?&-^kn5q`9X}cLTK4DxM^d`^qcCgzQ
zu9$w6uBjg9GnV{jb))K?207TWkLa7yb=&An8I{vY?7|%@M9=K(uU%9c&n{t4XVSXG
zmG(@%$*a^b*NE_wln+R~MtPW^$Gu83@A(Y2Pc>l44Ar8euv>^%G-_q<SM~;5%G3A7
z(!@&}JSZK}4yuGeAxnj^S%yt|k*B61qc?r@=G%tHS)oHS%2r7&vqSeg+pBtJi(4Jf
zkuS+;Y)BFQS)}$n`hL7pB8bJx^*OHFQ7-iEz96fvvCiRyk@51K?=Xc@y;eRRhuE|F
zw|Q7K@dIg^KYujsynk}7o0eDU%A|Dv`ch`P3T-H;^O~{s&YeDkBabghT#bz1PwUq3
zj-0t8w8Si?Ry|=>tc@n1$G<P5hh!H}ZnWz1OwT?0Ou5cb;#3_Y<rMPH5aGTWTz{Bs
zcvbS6Rlu28)k@Q_5h3FxVH+Jz-BqI8o!+9fyCbPJ@GLpX^1Q;jU+g@%wei}4tf18!
zd^b(9NfJ)7i})k>6nGicx@+joBRaeIMen+sqyMA1I6?T-9Ja1HYGbiajdFc`^f^Zh
z9&_m(8dgW=H0m6_C|PyT6PYI_h?ky>GlpzCud#k*pLOaqefrRXciUCz=({Ex#IzfZ
zD8GG@_@py$QU7o30*xWVHJ6y}2P?z~#$qBTs|))(*KBU8aptQ?e_B#UtWtM%ZRqWE
zUzasBsDE$3f9d;=Ax7E>Go*V;lGtNjFIuu4<+d&fud!2dWp?0gM^7HuSXy5e*0Mv}
zyGQI;!h_9H7vrZtjJAxj@IC$2QFG@Lq-cZXUA46bhEKjczeb4A)J!jEBaM?p?wk<c
z6tKcouRX(Tw0(E~P2rKzvzdmDx{9l6jf~IjEBUJ6_6jeb*q}?gqHoZb+FowVd~wD6
zY9rI4)>*t3IW4_xy-IcLl;Z^Y4x7w-dwF(_d2cR4TYV<aF74+VH~5oGx@U`JWP&xm
zmOjKjc5{qL5$0zuZ{^Qz<CC|LTV~c~o33@4QiYlB_!Lnu8Az8oDT4E<Be6eETzK7e
z(<(;1fO1%-dn)U|#$TfnBbJGU-K*9Osid`MY*;CWdrQxKBp93E64ApuY)_kc(7eAm
zBlqW<jK;m#nfA!pI}>=}CHr~5j_Dq^dcP(#=7#h;pUq8anR1NGCzr?+b2B`9y1;Q<
z@V)W#p`p%-0q;fcgBF<*!cXN#wi;niWW3P*TA1>je`8JCfVYC8{N{vYBT}+Rf^+Zo
zvBpX4v+_zwG3$d~l&Rsg#cU5>Zb|;>97zYa<<1k?if6FnT+`8C%-83LIW1B>Q+{oc
zlY%NH#bryQl-yVKU(b|;pGeHjtF9XPjr&pP&^D}lx=)o{z06MyLO7dTAp*Dir8_oZ
z*JUsAx$s;>wrz7!){A%<mC7#qY-gO4VB+SHbM5m{iHkmmNjp=t1hM-5vQBu7syMx6
z{?+MOVk;^~%!PAgoED$2c9b@FJa_TJK^NC-P0^>Bi?*~K5x<BrPIts4ORr2?uXb)*
zb)&DlT-80?6SaazdzuC-o~O;Z_Kmm<>h9ITY8ZSGem=*m^-gBYG*ug&S|BzX9V`ns
z5Mp2g0uvCJfWQO<CLk~Yfe8pqKwts_6A+kyzy#!Pn}CQ4yU%}%L(z&xWHND#N@mZ%
z-EzC&e_-@>3`cCz#b6L29KwU)d~pQ*_6P<i!Gpna>IfFWNzC8>u`Ypr?}Ud7eZYJd
zxB~$Y009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0TB4R1TYAm
z56_1z$Is$l<Gb)p_$>S({4aPvycgaXzX@-Q*ZjLi0_On%5C8!X009sH0T2KI5C8!X
z009sH0T2KI5C8!X009sH0T2KI5C8!X0D-?lfWVJM*EB$X3$KfC5d?57GL!Xv!<R}U
zFKqB}A${m@bP*l`FE{cOgJ3YL2$E<GK`_Fc2PvXQQRF;;z=K6vF`Q;`F0}GPqoyEI
z5kjN|lbLj40E^0^kxg_=L;ZtDKK{WBmWi$@h3u~t;LoITmS!-~BM1v16*MA)5{$03
zKxR+~B0NaNZYqQ18%(2dmR*?NK_aq<oE=U?mLFjr4gLJT2j7E;qM!f2nco3-AOHd&
z00JNY0w4eaAOHd&00JNY0w4eaAOHd&00JNY0w4eaAOHd&00JNY0{_AS1YtCTzlAoP
zNM&gGvFJ1cg8Z2OzxCaL>j7F8h5PjN!=>zta?t$$V*gA2e{>N5PAhKyqQ9>Qz*z-=
z7sG?_{tH{c&_DnLKmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l
z;6F<MgDkCGT8n7T=l}1)H{%QNC(soD0`cB>7yNqsD*ST%BD~<zuS>`Ov#uMi1_VF=
z1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1VG^5T3{iGKL*XukNG``
z|L+^~N&J7`*v`rI|7}B%d;5H{|L<FW=qM(jgXZ8TGJO2}gBH4fUjTrYAo^_q0RDge
z=KlAE09-f=0c^Li|F#f-$oxV8f9UpYL4ZGZ!vEER04!n<h0Nll^Ec7`Z%Y6OE-V2s
zzj^@V|Npms;lkiS00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)
z1VG@Mz+dG5M;kB*{wDq=B0c~6|9<=v{C)5O0T2KI5C8!X009sH0T2KI5C8!X009sH
z0T2KI5C8!X009sH0T2KI5C8!X_<s{1@baK33(ybru>?L|PQC)P%7s=r$qLXajvylZ
z&r}8I4h#XkTNo`D8nI}>p@kbQJZRxX3m;ne(IS8rL9_^=MHnq2Xc0w=7+S>9B7qjp
zvC!jKpkcnw+4d!dP<{LvS^*5o{0Zh8IUP6${GJp6`BR<)&LHeLeK<GHNiF<?87y+p
z{K&pHa2hRw$V8U^4-K5tS`u04C8HPey*uXuEy+xuAZh@M>d%-T>3rkw0yZ>SFq0KT
z<g|M08?p6`%ys{K2#${(kwFP2Qhqo%N6pTkLHW}O{&;q@jyMqMKRk?s>=e9{MrHc_
zcy%0mXP+Qqz>f`_C&YzFVg7k&oTtcz%HllFb90Crx;6g{aDbiWM~m)o|9vlq!Z(;k
zW0Bb`Z8kB0N<=wOhVLCXmxB(9MP*R5=QBq*29d}?WRiA>&YwGSF6*y5qIBr(`w=;G
z^GEuAzDTZb@R<v-Y9V$l#EFF{fc@5Q#X_`Sh?IpGyAV$=#L|V>wh&(}#JPnijr(@I
n)eF&kA;vDm`BywTS`iK@dYdpbeTM(7fBmhap3%385_kL;SpP!q

delta 849
zcmccD#qvzPKFZUVg_VJUA-A57VfuuonZIimP5HZigC-A9j0uPffEWZWKqv-tkRT8Q
zKqv-AApIW*uJJ<zGIJBtQ}qk-(iuupD@yb;N^)}`tb&}x%sikPkOm+Sh0tLPworj6
zC|wMtd!Y0pD7_y_--Ocdp)?oNK?+bBWH{q=BPK@e`v3nKbU|E@Oj=@DW^z8z0YGhz
zAVCn|0ODMrv-H5u3`s36Q2>UALRw}{DoENBL_n>98K4L98puRnkR%9j0<m*`X<kWc
z5voKz$X@57)Wni}G#PfFgiB%x&=O>WSU{qw#mPmP1tpmvry@%N<rsVt^U_O!!HX&b
ziao!?Tr^Rjv+EfGN|SOji!;z2#s<_8l9*nMY7R3<G_wTcb$5`<fxrhO1_UgB&8s4!
zfMJoTbkB^5L6K1gC@63~;>-g^b%x`y3}OrhtatlEyduKHW;3myxp<O9`n8++^`1P7
z%Tp#y*jdp%$%L!mpjgzI4@EyaFY<bRJl*Nt`f}nqtp{p_x6T|r^7a`wPpw_<0Z0C}
z-!`8Dr-f9%Sp0b5+Mb-1A2&{awDrDuW0`b@<#u+-?6$nhhT9jk;<kROx$|dkx1Ut!
z?D~e-|L4u~&-`99`SQ+XI}*Nc?oDjfnQ>!tWTN`ZT%m3H6%+q?P2&8QXY;u9{86Tx
zlB~L??p#s7?r7R<`d#1hc{9_4{jd1%PuTr4EP{dIX30r02FCl0D}X^Dyp3&|odIt*
nI5Zd|qZmQyr4yJlHm?zF<PnGvF0Oku|Km$1N8^%}T4CV;6ROp~

diff --git a/lib/src/test/small.zim.embedded b/lib/src/test/small.zim.embedded
index a96f0bbfe17277e563bb2890e11f36bae8d6a1ea..95c84b0c333447b8532bfd3266d5b5e83f20e75a 100644
GIT binary patch
literal 66924
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

delta 789
zcmaFU#qvcy+{xA5(=W=?7l>F`85kIH>-iX_PiUI?yJpdpzw0+>@&Lt{fVcpNLEr*}
zVlW2@0zm+TVqgT)|AF8dKUiSmY=txiupp2t3X%i@TPPg`rHi3-50qX6rT0VWn^5{a
zl;(oksQ{%xW-?B<Vq(-*`v0Fn7sLh0q$QSRCg<mYt#<?of&j<#^-PS?^+1*<hzm6l
zrdF>YFCDDe7bFP+oIvcHUz%5vT7)VAvcb71HL)ZgO@bXL;gVRAimIFiB$`^BT$EW*
zl9@kUhnbOE7$^h=K8bnhrHSbv9n&W=Gm6#&&4xPw<idc`q@2v+40I>30i{9`(~D7U
zVg`w3mgE49bB6|y4@e9MSpJ$<MMMF8ovC!sjEO;!Q3fa|a6aP914ea*<FO243<j)s
z`$OuzBErOGGp(Pwc#=f=wVU~#Jd4XyCQR5_(LKq8tKgtm)R_-OKRYk-dVW0J>D~Hr
z;yJAcYK6DX96j>(88=U@UG4!#{<hyXp8}_aRKHmKc;VWfoRuFpPJguZzIkJrbcW@2
zcFF9vyvl~#7qsHGeyX|iXKuHjROjsahS>k-&GXOvUXwQY^3G*D625QlO>EVfabt6$
z`paCQZTb}x|9MT~{Fi6*xb*x{rkj$ix~J}3QNQkJ+HCq=-|~4g(}Vr5`0r2H{WC0r
zf#GJ!Nihb-`;04qK_I-1ZJM0{Z#OtJ7$c(?Ie^~o<k@V<*~}vrAzWPdYW~NUPL9SU
OE49MHUHx2uc>n+aSI9pA

diff --git a/lib/src/test/test.java b/lib/src/test/test.java
index 8a636cb..a7d0b6c 100644
--- a/lib/src/test/test.java
+++ b/lib/src/test/test.java
@@ -49,14 +49,18 @@ public class test {
     private void testArchive(TestArchive archive)
         throws IOException {
         // test the zim file main page title
-        assertEquals("Test ZIM file", archive.getMainEntry().getTitle());
-        // test zim file size
-        assertEquals(4070, archive.getFilesize()); // The file size is in KiB
+        TestEntry mainPage = archive.getMainEntry();
+        assertEquals("mainPage", mainPage.getTitle());
+        assertEquals("Test ZIM file", mainPage.getItem(true).getTitle());
         // test zim file main url
-        assertEquals("A/main.html", archive.getMainEntry().getPath());
+        assertEquals("mainPage", mainPage.getPath());
+        assertEquals("main.html", mainPage.getItem(true).getPath());
+
+        // test zim file size
+        assertEquals(66910, archive.getFilesize()); // The file size is in KiB
         // test zim file content
         byte[] mainData = getFileContent("small_zimfile_data/main.html");
-        byte[] inZimMainData = archive.getEntryByPath("A/main.html").getItem(true).getData().getData();
+        byte[] inZimMainData = archive.getEntryByPath("main.html").getItem(true).getData().getData();
         assert(Arrays.equals(mainData, inZimMainData));
 
         // test zim file icon

From 7315228b06abf65c5a20461836a03d3f6b70cf08 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 21 Jun 2023 11:38:00 +0200
Subject: [PATCH 5/9] Fix typos in search/suggestion getResults.

---
 lib/src/main/cpp/libzim/search.cpp            | 2 +-
 lib/src/main/cpp/libzim/suggestion_search.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/cpp/libzim/search.cpp b/lib/src/main/cpp/libzim/search.cpp
index 763bb2c..5e26433 100644
--- a/lib/src/main/cpp/libzim/search.cpp
+++ b/lib/src/main/cpp/libzim/search.cpp
@@ -37,7 +37,7 @@ DISPOSE
 
 METHOD(jobject, getResults, jint start, jint maxResults) {
   auto results = THIS->getResults(TO_C(start), TO_C(maxResults));
-  auto obj = NEW_OBJECT("ork/kiwix/libzim/SearchIterator");
+  auto obj = NEW_OBJECT("org/kiwix/libzim/SearchIterator");
   SET_HANDLE(zim::SearchIterator, obj, results.begin());
 
   // We have to set the nativeHandleEnd but no macro ease our work here.
diff --git a/lib/src/main/cpp/libzim/suggestion_search.cpp b/lib/src/main/cpp/libzim/suggestion_search.cpp
index 26fa783..27507d8 100644
--- a/lib/src/main/cpp/libzim/suggestion_search.cpp
+++ b/lib/src/main/cpp/libzim/suggestion_search.cpp
@@ -37,7 +37,7 @@ DISPOSE
 
 METHOD(jobject, getResults, jint start, jint maxResults) {
   auto results = THIS->getResults(TO_C(start), TO_C(maxResults));
-  auto obj = NEW_OBJECT("ork/kiwix/libzim/SuggestionIterator");
+  auto obj = NEW_OBJECT("org/kiwix/libzim/SuggestionIterator");
   SET_HANDLE(zim::SuggestionIterator, obj, results.begin());
 
   // We have to set the nativeHandleEnd but no macro ease our work here.

From 1806febcf4f90adea471bf4ebd5edc6fc92315e3 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 21 Jun 2023 11:38:47 +0200
Subject: [PATCH 6/9] Fix iterator `next`.

`next` must return the "next" value.
But here, the next value is the value of the current iterator.
---
 lib/src/main/cpp/libzim/search_iterator.cpp     | 2 +-
 lib/src/main/cpp/libzim/suggestion_iterator.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/cpp/libzim/search_iterator.cpp b/lib/src/main/cpp/libzim/search_iterator.cpp
index 6c04c7d..65e1342 100644
--- a/lib/src/main/cpp/libzim/search_iterator.cpp
+++ b/lib/src/main/cpp/libzim/search_iterator.cpp
@@ -64,8 +64,8 @@ METHOD0(jboolean, hasNext) {
 }
 
 METHOD0(jobject, next) {
-  (*THIS)++;
   zim::Entry entry = **THIS;
+  (*THIS)++;
   return BUILD_WRAPPER("org/kiwix/libzim/Entry", entry);
 }
 
diff --git a/lib/src/main/cpp/libzim/suggestion_iterator.cpp b/lib/src/main/cpp/libzim/suggestion_iterator.cpp
index 5181ae1..2d2c410 100644
--- a/lib/src/main/cpp/libzim/suggestion_iterator.cpp
+++ b/lib/src/main/cpp/libzim/suggestion_iterator.cpp
@@ -49,8 +49,8 @@ METHOD0(jboolean, hasNext) {
 }
 
 METHOD0(jobject, next) {
-  (*THIS)++;
   zim::SuggestionItem item = **THIS;
+  (*THIS)++;
   return BUILD_WRAPPER("org/kiwix/libzim/SuggestionItem", item);
 }
 

From eaf9b3aac98f29820d6383d0ab716cf4ad664eda Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 21 Jun 2023 11:39:17 +0200
Subject: [PATCH 7/9] [test] Get the suggestion result from the first result.

---
 lib/src/test/test.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/test/test.java b/lib/src/test/test.java
index a7d0b6c..7d4b25e 100644
--- a/lib/src/test/test.java
+++ b/lib/src/test/test.java
@@ -199,7 +199,7 @@ public class test {
         TestSuggestionSearch suggestionSearch = suggestionSearcher.suggest("test");
         int matches = (int) suggestionSearch.getEstimatedMatches();
         assertEquals(1, matches);
-        TestSuggestionIterator results = suggestionSearch.getResults(1, matches);
+        TestSuggestionIterator results = suggestionSearch.getResults(0, matches);
         TestSuggestionItem suggestionItem = results.next();
         assertEquals("Test ZIM file", suggestionItem.getTitle());
         suggestionSearcher.dispose();

From 56fd73932e2c4c59d9dd591535f7156de0522417 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 28 Jun 2023 15:15:12 +0200
Subject: [PATCH 8/9] =?UTF-8?q?Run=20CI=C2=A0on=20PR=C2=A0and=20push=20on?=
 =?UTF-8?q?=20main.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/pull_request.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 653568d..885bddf 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -2,8 +2,9 @@ name: Pull requests
 
 on:
   pull_request:
+  push:
     branches:
-      - '**'
+      - main
 
 jobs:
 

From 15f42f07577047f80f585947b13009273f4a869d Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 28 Jun 2023 15:17:15 +0200
Subject: [PATCH 9/9] Make CodeFactor happy.

---
 lib/src/test/org/kiwix/test/libzim/TestQuery.java    | 11 +++++++++--
 lib/src/test/org/kiwix/test/libzim/TestSearcher.java |  5 ++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/src/test/org/kiwix/test/libzim/TestQuery.java b/lib/src/test/org/kiwix/test/libzim/TestQuery.java
index 24b4dcb..5a45f96 100644
--- a/lib/src/test/org/kiwix/test/libzim/TestQuery.java
+++ b/lib/src/test/org/kiwix/test/libzim/TestQuery.java
@@ -29,7 +29,14 @@ public class TestQuery
     inner = new Query(query);
   }
 
-  public TestQuery setQuery(String query) { inner.setQuery(query); return this; }
-  public TestQuery setGeorange(float latitude, float longitute, float distance) { inner.setGeorange(latitude, latitude, distance); return this; }
+  public TestQuery setQuery(String query) {
+    inner.setQuery(query);
+    return this;
+  }
+
+  public TestQuery setGeorange(float latitude, float longitute, float distance) {
+    inner.setGeorange(latitude, latitude, distance);
+    return this;
+  }
 
 }
diff --git a/lib/src/test/org/kiwix/test/libzim/TestSearcher.java b/lib/src/test/org/kiwix/test/libzim/TestSearcher.java
index 4fd7de4..2259f0d 100644
--- a/lib/src/test/org/kiwix/test/libzim/TestSearcher.java
+++ b/lib/src/test/org/kiwix/test/libzim/TestSearcher.java
@@ -39,7 +39,10 @@ public class TestSearcher
     );
   }
 
-  public TestSearcher addArchive(TestArchive archive) { inner.addArchive(archive.inner()); return this; }
+  public TestSearcher addArchive(TestArchive archive) {
+    inner.addArchive(archive.inner());
+    return this;
+  }
   public TestSearch search(TestQuery query) { return new TestSearch(inner.search(query.inner())); }
   public void setVerbose(boolean verbose) { inner.setVerbose(verbose); }