From bc88cb45294aefa16ef48611f7bf1195547aa8ba Mon Sep 17 00:00:00 2001 From: sonalgaud12 Date: Thu, 27 Mar 2025 13:56:44 +0530 Subject: [PATCH 1/9] Added UrlUtilsTest --- .../org/opendatakit/test/UrlUtilsTest.java | 119 ++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java diff --git a/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java b/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java new file mode 100644 index 0000000..8654f2d --- /dev/null +++ b/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java @@ -0,0 +1,119 @@ +package org.opendatakit.test; + +import org.junit.Test; +import org.opendatakit.webkitserver.utilities.UrlUtils; + +import static org.junit.Assert.*; + +public class UrlUtilsTest { + + @Test + public void testNoHashOrParameters() { + String fileName = "this/test/file/path/.html"; + assertRetrieveFileNameHelper(fileName, fileName); + } + + @Test + public void testEmptyString() { + assertRetrieveFileNameHelper("", ""); + } + + @Test + public void testOnlyHash() { + String segment = "test/file#foo"; + assertRetrieveFileNameHelper("test/file", segment); + } + + @Test + public void testOnlyQueryParams() { + String segment = "pretty/little/liar?foo&bar=3"; + assertRetrieveFileNameHelper("pretty/little/liar", segment); + } + + @Test + public void testHashAndQueryParams() { + String segment = "test/test/test.html#foo?bar=3&baz=55"; + assertRetrieveFileNameHelper("test/test/test.html", segment); + } + + @Test + public void testGetIndexOfParamsNoParams() { + String segment = "test/test/test.html"; + assertGetIndexHelper(segment, -1); + } + + @Test + public void testGetIndexOfParamsHash() { + String segment = "test/test.html#foo"; + int expected = 14; + assertGetIndexHelper(segment, expected); + } + + @Test + public void testGetIndexOfQueryHash() { + String segment = "this/is/a/file/that/i/like.html?foo=bar"; + int expected = 31; + assertGetIndexHelper(segment, expected); + } + + @Test + public void testGetIndexOfBoth() { + String segment = "foo/bar.html#foo?bar=baz"; + int expected = 12; + assertGetIndexHelper(segment, expected); + } + + @Test + public void testGetParamsNone() { + String segment = "this/test/file/path/.html"; + assertGetParamsHelper(segment, ""); + } + + @Test + public void testGetParamsHash() { + String segment = "test/file#foo"; + assertGetParamsHelper(segment, "#foo"); + } + + @Test + public void testGetParamsQuery() { + String segment = "pretty/little/liar?foo&bar=3"; + assertGetParamsHelper(segment, "?foo&bar=3"); + } + + @Test + public void testGetParamsBoth() { + String segment = "test/test/test.html#foo?bar=3&baz=55"; + assertGetParamsHelper(segment, "#foo?bar=3&baz=55"); + } + + /** + * Take start, retrieve the file name, and assert that the result is equal to + * expected. + * @param expected + * @param start + */ + protected void assertRetrieveFileNameHelper(String expected, String start) { + String result = UrlUtils.getPathFromUriFragment(start); + assertEquals(expected, result); + } + + /** + * Since getIndexOfParameters is package-private, we'll use reflection to access it + */ + protected void assertGetIndexHelper(String segment, int expected) { + try { + java.lang.reflect.Method method = UrlUtils.class.getDeclaredMethod("getIndexOfParameters", String.class); + method.setAccessible(true); + int actual = (int) method.invoke(null, segment); + assertEquals(expected, actual); + } catch (Exception e) { + fail("Could not access getIndexOfParameters method: " + e.getMessage()); + } + } + + protected void assertGetParamsHelper(String segment, String expected) { + String actual = UrlUtils.getParametersFromUriFragment(segment); + assertEquals(expected, actual); + } +} \ No newline at end of file From 73e8c85dc0813eeda51a1d253d54fff3ddc35d48 Mon Sep 17 00:00:00 2001 From: sonalgaud12 Date: Thu, 27 Mar 2025 23:53:25 +0530 Subject: [PATCH 2/9] suggestions applied --- .../org/opendatakit/test/UrlUtilsTest.java | 68 +++++++++++-------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java b/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java index 8654f2d..1308348 100644 --- a/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java +++ b/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java @@ -7,91 +7,92 @@ public class UrlUtilsTest { + private static final String EMPTY_STRING = ""; + private static final String URL_SEGMENT1 = "test/"; + private static final String FILE_PATH_PREFIX = "this/test/file/path/"; + private static final String HTML_EXTENSION = ".html"; + private static final String QUERY_PARAM_PREFIX = "?"; + private static final String HASH_PREFIX = "#"; + + private static final String FILE_PATH_WITH_HTML = FILE_PATH_PREFIX + HTML_EXTENSION; + private static final String FILE_WITH_HASH = URL_SEGMENT1 + "file" + HASH_PREFIX + "foo"; + private static final String FILE_WITH_QUERY_PARAMS = "pretty/little/liar" + QUERY_PARAM_PREFIX + "foo&bar=3"; + private static final String FILE_WITH_HASH_AND_QUERY = URL_SEGMENT1 + "test/test" + HTML_EXTENSION + HASH_PREFIX + "foo" + QUERY_PARAM_PREFIX + "bar=3&baz=55"; + private static final String FILE_WITHOUT_PARAMS = URL_SEGMENT1 + "test/test" + HTML_EXTENSION; + private static final String FILE_WITH_HASH_ONLY = URL_SEGMENT1 + "test" + HTML_EXTENSION + HASH_PREFIX + "foo"; + private static final String FILE_WITH_QUERY = "this/is/a/file/that/i/like" + HTML_EXTENSION + QUERY_PARAM_PREFIX + "foo=bar"; + private static final String FILE_WITH_BOTH = "foo/bar" + HTML_EXTENSION + HASH_PREFIX + "foo" + QUERY_PARAM_PREFIX + "bar=baz"; + @Test public void testNoHashOrParameters() { - String fileName = "this/test/file/path/.html"; - assertRetrieveFileNameHelper(fileName, fileName); + assertRetrieveFileNameHelper(FILE_PATH_WITH_HTML, FILE_PATH_WITH_HTML); } @Test public void testEmptyString() { - assertRetrieveFileNameHelper("", ""); + assertRetrieveFileNameHelper(EMPTY_STRING, EMPTY_STRING); } @Test public void testOnlyHash() { - String segment = "test/file#foo"; - assertRetrieveFileNameHelper("test/file", segment); + assertRetrieveFileNameHelper(URL_SEGMENT1 + "file", FILE_WITH_HASH); } @Test public void testOnlyQueryParams() { - String segment = "pretty/little/liar?foo&bar=3"; - assertRetrieveFileNameHelper("pretty/little/liar", segment); + assertRetrieveFileNameHelper("pretty/little/liar", FILE_WITH_QUERY_PARAMS); } @Test public void testHashAndQueryParams() { - String segment = "test/test/test.html#foo?bar=3&baz=55"; - assertRetrieveFileNameHelper("test/test/test.html", segment); + assertRetrieveFileNameHelper(URL_SEGMENT1 + "test/test" + HTML_EXTENSION, FILE_WITH_HASH_AND_QUERY); } @Test public void testGetIndexOfParamsNoParams() { - String segment = "test/test/test.html"; - assertGetIndexHelper(segment, -1); + assertGetIndexHelper(FILE_WITHOUT_PARAMS, -1); } @Test public void testGetIndexOfParamsHash() { - String segment = "test/test.html#foo"; - int expected = 14; - assertGetIndexHelper(segment, expected); + assertGetIndexHelper(FILE_WITH_HASH_ONLY, 14); } @Test public void testGetIndexOfQueryHash() { - String segment = "this/is/a/file/that/i/like.html?foo=bar"; - int expected = 31; - assertGetIndexHelper(segment, expected); + assertGetIndexHelper(FILE_WITH_QUERY, 31); } @Test public void testGetIndexOfBoth() { - String segment = "foo/bar.html#foo?bar=baz"; - int expected = 12; - assertGetIndexHelper(segment, expected); + assertGetIndexHelper(FILE_WITH_BOTH, 12); } @Test public void testGetParamsNone() { - String segment = "this/test/file/path/.html"; - assertGetParamsHelper(segment, ""); + assertGetParamsHelper(FILE_PATH_WITH_HTML, EMPTY_STRING); } @Test public void testGetParamsHash() { - String segment = "test/file#foo"; - assertGetParamsHelper(segment, "#foo"); + assertGetParamsHelper(FILE_WITH_HASH, HASH_PREFIX + "foo"); } @Test public void testGetParamsQuery() { - String segment = "pretty/little/liar?foo&bar=3"; - assertGetParamsHelper(segment, "?foo&bar=3"); + assertGetParamsHelper(FILE_WITH_QUERY_PARAMS, QUERY_PARAM_PREFIX + "foo&bar=3"); } @Test public void testGetParamsBoth() { - String segment = "test/test/test.html#foo?bar=3&baz=55"; - assertGetParamsHelper(segment, "#foo?bar=3&baz=55"); + assertGetParamsHelper(FILE_WITH_HASH_AND_QUERY, HASH_PREFIX + "foo" + QUERY_PARAM_PREFIX + "bar=3&baz=55"); } /** * Take start, retrieve the file name, and assert that the result is equal to * expected. - * @param expected - * @param start + * @param expected Expected file path + * @param start Input URL segment */ protected void assertRetrieveFileNameHelper(String expected, String start) { String result = UrlUtils.getPathFromUriFragment(start); @@ -100,6 +101,8 @@ protected void assertRetrieveFileNameHelper(String expected, String start) { /** * Since getIndexOfParameters is package-private, we'll use reflection to access it + * @param segment URL segment to test + * @param expected Expected index of parameters */ protected void assertGetIndexHelper(String segment, int expected) { try { @@ -112,6 +115,11 @@ protected void assertGetIndexHelper(String segment, int expected) { } } + /** + * Assert the parameters extracted from the URL segment + * @param segment URL segment to test + * @param expected Expected parameters string + */ protected void assertGetParamsHelper(String segment, String expected) { String actual = UrlUtils.getParametersFromUriFragment(segment); assertEquals(expected, actual); From 5bf50e82bc93d5f2a3f9dbd41048888b712e858f Mon Sep 17 00:00:00 2001 From: sonalgaud12 Date: Tue, 8 Apr 2025 17:18:08 +0530 Subject: [PATCH 3/9] Updated as per feedback --- .../org/opendatakit/test/UrlUtilsTest.java | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java b/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java index 1308348..d338195 100644 --- a/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java +++ b/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java @@ -13,15 +13,31 @@ public class UrlUtilsTest { private static final String HTML_EXTENSION = ".html"; private static final String QUERY_PARAM_PREFIX = "?"; private static final String HASH_PREFIX = "#"; - + + // File paths private static final String FILE_PATH_WITH_HTML = FILE_PATH_PREFIX + HTML_EXTENSION; - private static final String FILE_WITH_HASH = URL_SEGMENT1 + "file" + HASH_PREFIX + "foo"; - private static final String FILE_WITH_QUERY_PARAMS = "pretty/little/liar" + QUERY_PARAM_PREFIX + "foo&bar=3"; - private static final String FILE_WITH_HASH_AND_QUERY = URL_SEGMENT1 + "test/test" + HTML_EXTENSION + HASH_PREFIX + "foo" + QUERY_PARAM_PREFIX + "bar=3&baz=55"; + + // Query and hash parameter values + private static final String HASH_VALUE_FOO = "foo"; + private static final String QUERY_VALUE_FOO_AND_BAR = "foo&bar=3"; + private static final String QUERY_VALUE_BAR_AND_BAZ = "bar=3&baz=55"; + private static final String QUERY_VALUE_FOO_BAR = "foo=bar"; + private static final String QUERY_VALUE_BAR_BAZ = "bar=baz"; + + // Complete URL fragments with parameters + private static final String FILE_WITH_HASH = URL_SEGMENT1 + "file" + HASH_PREFIX + HASH_VALUE_FOO; + private static final String FILE_WITH_QUERY_PARAMS = "pretty/little/liar" + QUERY_PARAM_PREFIX + QUERY_VALUE_FOO_AND_BAR; + private static final String FILE_WITH_HASH_AND_QUERY = URL_SEGMENT1 + "test/test" + HTML_EXTENSION + + HASH_PREFIX + HASH_VALUE_FOO + + QUERY_PARAM_PREFIX + QUERY_VALUE_BAR_AND_BAZ; private static final String FILE_WITHOUT_PARAMS = URL_SEGMENT1 + "test/test" + HTML_EXTENSION; - private static final String FILE_WITH_HASH_ONLY = URL_SEGMENT1 + "test" + HTML_EXTENSION + HASH_PREFIX + "foo"; - private static final String FILE_WITH_QUERY = "this/is/a/file/that/i/like" + HTML_EXTENSION + QUERY_PARAM_PREFIX + "foo=bar"; - private static final String FILE_WITH_BOTH = "foo/bar" + HTML_EXTENSION + HASH_PREFIX + "foo" + QUERY_PARAM_PREFIX + "bar=baz"; + private static final String FILE_WITH_HASH_ONLY = URL_SEGMENT1 + "test" + HTML_EXTENSION + + HASH_PREFIX + HASH_VALUE_FOO; + private static final String FILE_WITH_QUERY = "this/is/a/file/that/i/like" + HTML_EXTENSION + + QUERY_PARAM_PREFIX + QUERY_VALUE_FOO_BAR; + private static final String FILE_WITH_BOTH = "foo/bar" + HTML_EXTENSION + + HASH_PREFIX + HASH_VALUE_FOO + + QUERY_PARAM_PREFIX + QUERY_VALUE_BAR_BAZ; @Test public void testNoHashOrParameters() { @@ -75,17 +91,17 @@ public void testGetParamsNone() { @Test public void testGetParamsHash() { - assertGetParamsHelper(FILE_WITH_HASH, HASH_PREFIX + "foo"); + assertGetParamsHelper(FILE_WITH_HASH, HASH_PREFIX + HASH_VALUE_FOO); } @Test public void testGetParamsQuery() { - assertGetParamsHelper(FILE_WITH_QUERY_PARAMS, QUERY_PARAM_PREFIX + "foo&bar=3"); + assertGetParamsHelper(FILE_WITH_QUERY_PARAMS, QUERY_PARAM_PREFIX + QUERY_VALUE_FOO_AND_BAR); } @Test public void testGetParamsBoth() { - assertGetParamsHelper(FILE_WITH_HASH_AND_QUERY, HASH_PREFIX + "foo" + QUERY_PARAM_PREFIX + "bar=3&baz=55"); + assertGetParamsHelper(FILE_WITH_HASH_AND_QUERY, HASH_PREFIX + HASH_VALUE_FOO + QUERY_PARAM_PREFIX + QUERY_VALUE_BAR_AND_BAZ); } /** From fcaccb8dfdc62d9fe1da528b96eb77c2de0722fe Mon Sep 17 00:00:00 2001 From: sonalgaud12 Date: Tue, 8 Apr 2025 17:22:20 +0530 Subject: [PATCH 4/9] minor change --- .../src/test/java/org/opendatakit/test/UrlUtilsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java b/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java index d338195..e377e50 100644 --- a/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java +++ b/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java @@ -140,4 +140,4 @@ protected void assertGetParamsHelper(String segment, String expected) { String actual = UrlUtils.getParametersFromUriFragment(segment); assertEquals(expected, actual); } -} \ No newline at end of file +} From 45a71596e7b13265a40920031368e58809a23caf Mon Sep 17 00:00:00 2001 From: sonalgaud12 Date: Tue, 8 Apr 2025 22:12:34 +0530 Subject: [PATCH 5/9] update --- .../{ => webkitserver/utilities}/UrlUtilsTest.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) rename androidcommon_lib/src/test/java/org/opendatakit/test/{ => webkitserver/utilities}/UrlUtilsTest.java (91%) diff --git a/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java b/androidcommon_lib/src/test/java/org/opendatakit/test/webkitserver/utilities/UrlUtilsTest.java similarity index 91% rename from androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java rename to androidcommon_lib/src/test/java/org/opendatakit/test/webkitserver/utilities/UrlUtilsTest.java index e377e50..61ee389 100644 --- a/androidcommon_lib/src/test/java/org/opendatakit/test/UrlUtilsTest.java +++ b/androidcommon_lib/src/test/java/org/opendatakit/test/webkitserver/utilities/UrlUtilsTest.java @@ -1,4 +1,4 @@ -package org.opendatakit.test; +package org.opendatakit.test.webkitserver.utilities; import org.junit.Test; import org.opendatakit.webkitserver.utilities.UrlUtils; @@ -13,6 +13,7 @@ public class UrlUtilsTest { private static final String HTML_EXTENSION = ".html"; private static final String QUERY_PARAM_PREFIX = "?"; private static final String HASH_PREFIX = "#"; + private static final String TEST_PATH = "test/test"; // File paths private static final String FILE_PATH_WITH_HTML = FILE_PATH_PREFIX + HTML_EXTENSION; @@ -24,13 +25,16 @@ public class UrlUtilsTest { private static final String QUERY_VALUE_FOO_BAR = "foo=bar"; private static final String QUERY_VALUE_BAR_BAZ = "bar=baz"; + // Common path components + private static final String TEST_HTML_PATH = URL_SEGMENT1 + TEST_PATH + HTML_EXTENSION; + // Complete URL fragments with parameters private static final String FILE_WITH_HASH = URL_SEGMENT1 + "file" + HASH_PREFIX + HASH_VALUE_FOO; private static final String FILE_WITH_QUERY_PARAMS = "pretty/little/liar" + QUERY_PARAM_PREFIX + QUERY_VALUE_FOO_AND_BAR; - private static final String FILE_WITH_HASH_AND_QUERY = URL_SEGMENT1 + "test/test" + HTML_EXTENSION + + private static final String FILE_WITH_HASH_AND_QUERY = TEST_HTML_PATH + HASH_PREFIX + HASH_VALUE_FOO + QUERY_PARAM_PREFIX + QUERY_VALUE_BAR_AND_BAZ; - private static final String FILE_WITHOUT_PARAMS = URL_SEGMENT1 + "test/test" + HTML_EXTENSION; + private static final String FILE_WITHOUT_PARAMS = TEST_HTML_PATH; private static final String FILE_WITH_HASH_ONLY = URL_SEGMENT1 + "test" + HTML_EXTENSION + HASH_PREFIX + HASH_VALUE_FOO; private static final String FILE_WITH_QUERY = "this/is/a/file/that/i/like" + HTML_EXTENSION + @@ -61,7 +65,7 @@ public void testOnlyQueryParams() { @Test public void testHashAndQueryParams() { - assertRetrieveFileNameHelper(URL_SEGMENT1 + "test/test" + HTML_EXTENSION, FILE_WITH_HASH_AND_QUERY); + assertRetrieveFileNameHelper(TEST_HTML_PATH, FILE_WITH_HASH_AND_QUERY); } @Test @@ -140,4 +144,4 @@ protected void assertGetParamsHelper(String segment, String expected) { String actual = UrlUtils.getParametersFromUriFragment(segment); assertEquals(expected, actual); } -} +} \ No newline at end of file From 0885ac934329086d99bd0fc4b0b91c9b8b2d778e Mon Sep 17 00:00:00 2001 From: Sonal Gaud <82362774+sonalgaud12@users.noreply.github.com> Date: Thu, 10 Apr 2025 11:37:32 +0530 Subject: [PATCH 6/9] Update --- .../opendatakit/test/webkitserver/utilities/UrlUtilsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/androidcommon_lib/src/test/java/org/opendatakit/test/webkitserver/utilities/UrlUtilsTest.java b/androidcommon_lib/src/test/java/org/opendatakit/test/webkitserver/utilities/UrlUtilsTest.java index 61ee389..83df861 100644 --- a/androidcommon_lib/src/test/java/org/opendatakit/test/webkitserver/utilities/UrlUtilsTest.java +++ b/androidcommon_lib/src/test/java/org/opendatakit/test/webkitserver/utilities/UrlUtilsTest.java @@ -144,4 +144,4 @@ protected void assertGetParamsHelper(String segment, String expected) { String actual = UrlUtils.getParametersFromUriFragment(segment); assertEquals(expected, actual); } -} \ No newline at end of file +} From 91b3acf3618176f2c374a3eb80149bd8b79d570c Mon Sep 17 00:00:00 2001 From: sonalgaud12 Date: Wed, 16 Apr 2025 12:02:19 +0530 Subject: [PATCH 7/9] fix: align test package structure with implementation code --- .../java/org/opendatakit/test/BasicTest.java | 12 ------------ .../webkitserver/utilities/UrlUtilsTest.java | 17 ++++++----------- 2 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 androidcommon_lib/src/test/java/org/opendatakit/test/BasicTest.java rename androidcommon_lib/src/test/java/org/opendatakit/{test => }/webkitserver/utilities/UrlUtilsTest.java (88%) diff --git a/androidcommon_lib/src/test/java/org/opendatakit/test/BasicTest.java b/androidcommon_lib/src/test/java/org/opendatakit/test/BasicTest.java deleted file mode 100644 index 9bf39e5..0000000 --- a/androidcommon_lib/src/test/java/org/opendatakit/test/BasicTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.opendatakit.test; - -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -public class BasicTest { - @Test - public void basicTest() { - assertTrue(true); - } -} diff --git a/androidcommon_lib/src/test/java/org/opendatakit/test/webkitserver/utilities/UrlUtilsTest.java b/androidcommon_lib/src/test/java/org/opendatakit/webkitserver/utilities/UrlUtilsTest.java similarity index 88% rename from androidcommon_lib/src/test/java/org/opendatakit/test/webkitserver/utilities/UrlUtilsTest.java rename to androidcommon_lib/src/test/java/org/opendatakit/webkitserver/utilities/UrlUtilsTest.java index 83df861..df81c0e 100644 --- a/androidcommon_lib/src/test/java/org/opendatakit/test/webkitserver/utilities/UrlUtilsTest.java +++ b/androidcommon_lib/src/test/java/org/opendatakit/webkitserver/utilities/UrlUtilsTest.java @@ -1,7 +1,6 @@ -package org.opendatakit.test.webkitserver.utilities; +package org.opendatakit.webkitserver.utilities; import org.junit.Test; -import org.opendatakit.webkitserver.utilities.UrlUtils; import static org.junit.Assert.*; @@ -120,19 +119,13 @@ protected void assertRetrieveFileNameHelper(String expected, String start) { } /** - * Since getIndexOfParameters is package-private, we'll use reflection to access it + * Test the package-private getIndexOfParameters method directly * @param segment URL segment to test * @param expected Expected index of parameters */ protected void assertGetIndexHelper(String segment, int expected) { - try { - java.lang.reflect.Method method = UrlUtils.class.getDeclaredMethod("getIndexOfParameters", String.class); - method.setAccessible(true); - int actual = (int) method.invoke(null, segment); - assertEquals(expected, actual); - } catch (Exception e) { - fail("Could not access getIndexOfParameters method: " + e.getMessage()); - } + int actual = UrlUtils.getIndexOfParameters(segment); + assertEquals(expected, actual); } /** @@ -144,4 +137,6 @@ protected void assertGetParamsHelper(String segment, String expected) { String actual = UrlUtils.getParametersFromUriFragment(segment); assertEquals(expected, actual); } + } + From 136463850d2680d9c9495cde63f525ff7d9fdd8a Mon Sep 17 00:00:00 2001 From: sonalgaud12 Date: Sat, 24 May 2025 14:23:35 +0530 Subject: [PATCH 8/9] recovered basictest --- .../webkitserver/utilities/BasicTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 androidcommon_lib/src/test/java/org/opendatakit/webkitserver/utilities/BasicTest.java diff --git a/androidcommon_lib/src/test/java/org/opendatakit/webkitserver/utilities/BasicTest.java b/androidcommon_lib/src/test/java/org/opendatakit/webkitserver/utilities/BasicTest.java new file mode 100644 index 0000000..517e933 --- /dev/null +++ b/androidcommon_lib/src/test/java/org/opendatakit/webkitserver/utilities/BasicTest.java @@ -0,0 +1,12 @@ +package org.opendatakit.webkitserver.utilities; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class BasicTest { + @Test + public void basicTest() { + assertTrue(true); + } +} \ No newline at end of file From c208c7019986afe4af38deeee9688bd11060ca4a Mon Sep 17 00:00:00 2001 From: sonalgaud12 Date: Sat, 24 May 2025 14:24:54 +0530 Subject: [PATCH 9/9] line added --- .../java/org/opendatakit/webkitserver/utilities/BasicTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/androidcommon_lib/src/test/java/org/opendatakit/webkitserver/utilities/BasicTest.java b/androidcommon_lib/src/test/java/org/opendatakit/webkitserver/utilities/BasicTest.java index 517e933..9e15e1d 100644 --- a/androidcommon_lib/src/test/java/org/opendatakit/webkitserver/utilities/BasicTest.java +++ b/androidcommon_lib/src/test/java/org/opendatakit/webkitserver/utilities/BasicTest.java @@ -9,4 +9,4 @@ public class BasicTest { public void basicTest() { assertTrue(true); } -} \ No newline at end of file +}