This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
The following commit(s) were added to refs/heads/master by this push:
new 2f41963 Parameterize tokenizer tests
2f41963 is described below
commit 2f419633363d5fd96bb917fb3ec1d7a2106f4bd0
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Thu Nov 19 01:16:47 2026 +0100
Parameterize tokenizer tests
---
maven-jxr/pom.xml | 5 ++
.../maven/jxr/util/SimpleWordTokenizerTest.java | 84 +++++-----------------
2 files changed, 22 insertions(+), 67 deletions(-)
diff --git a/maven-jxr/pom.xml b/maven-jxr/pom.xml
index 9b35eab..503a71f 100644
--- a/maven-jxr/pom.xml
+++ b/maven-jxr/pom.xml
@@ -51,6 +51,11 @@ under the License.
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
diff --git
a/maven-jxr/src/test/java/org/apache/maven/jxr/util/SimpleWordTokenizerTest.java
b/maven-jxr/src/test/java/org/apache/maven/jxr/util/SimpleWordTokenizerTest.java
index 083545e..bffd141 100644
---
a/maven-jxr/src/test/java/org/apache/maven/jxr/util/SimpleWordTokenizerTest.java
+++
b/maven-jxr/src/test/java/org/apache/maven/jxr/util/SimpleWordTokenizerTest.java
@@ -19,78 +19,28 @@
package org.apache.maven.jxr.util;
import java.util.List;
+import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
import static org.junit.jupiter.api.Assertions.assertEquals;
class SimpleWordTokenizerTest {
- @Test
- void compact() {
- List<StringEntry> entries = SimpleWordTokenizer.tokenize("public void
withApp1(App app)");
- assertEquals(5, entries.size());
-
- assertEquals("public", entries.get(0).toString());
- assertEquals(0, entries.get(0).getIndex());
-
- assertEquals("void", entries.get(1).toString());
- assertEquals(7, entries.get(1).getIndex());
-
- assertEquals("withApp1", entries.get(2).toString());
- assertEquals(12, entries.get(2).getIndex());
-
- assertEquals("App", entries.get(3).toString());
- assertEquals(21, entries.get(3).getIndex());
-
- assertEquals("app", entries.get(4).toString());
- assertEquals(25, entries.get(4).getIndex());
+ static Stream<Arguments> tokenShapes() {
+ return Stream.of(
+ Arguments.of("public void withApp1(App app)", 21, 25),
+ Arguments.of("public void withApp2 ( App app)", 23, 27),
+ Arguments.of("public void withApp3 (App app)", 22, 26),
+ Arguments.of("public void withApp4( App app)", 22, 26));
}
- @Test
- void spacesAroundParenOpen() {
- List<StringEntry> entries = SimpleWordTokenizer.tokenize("public void
withApp2 ( App app)");
- assertEquals(5, entries.size());
-
- assertEquals("public", entries.get(0).toString());
- assertEquals(0, entries.get(0).getIndex());
-
- assertEquals("void", entries.get(1).toString());
- assertEquals(7, entries.get(1).getIndex());
-
- assertEquals("withApp2", entries.get(2).toString());
- assertEquals(12, entries.get(2).getIndex());
-
- assertEquals("App", entries.get(3).toString());
- assertEquals(23, entries.get(3).getIndex());
-
- assertEquals("app", entries.get(4).toString());
- assertEquals(27, entries.get(4).getIndex());
- }
-
- @Test
- void spaceBeforeParenOpen() {
- List<StringEntry> entries = SimpleWordTokenizer.tokenize("public void
withApp3 (App app)");
- assertEquals(5, entries.size());
-
- assertEquals("public", entries.get(0).toString());
- assertEquals(0, entries.get(0).getIndex());
-
- assertEquals("void", entries.get(1).toString());
- assertEquals(7, entries.get(1).getIndex());
-
- assertEquals("withApp3", entries.get(2).toString());
- assertEquals(12, entries.get(2).getIndex());
-
- assertEquals("App", entries.get(3).toString());
- assertEquals(22, entries.get(3).getIndex());
-
- assertEquals("app", entries.get(4).toString());
- assertEquals(26, entries.get(4).getIndex());
- }
-
- @Test
- void spaceAfterParenOpen() {
- List<StringEntry> entries = SimpleWordTokenizer.tokenize("public void
withApp4( App app)");
+ @ParameterizedTest
+ @MethodSource("tokenShapes")
+ void tokenShape(String source, int appIndex, int appArgumentIndex) {
+ List<StringEntry> entries = SimpleWordTokenizer.tokenize(source);
assertEquals(5, entries.size());
assertEquals("public", entries.get(0).toString());
@@ -99,14 +49,14 @@ class SimpleWordTokenizerTest {
assertEquals("void", entries.get(1).toString());
assertEquals(7, entries.get(1).getIndex());
- assertEquals("withApp4", entries.get(2).toString());
+ assertEquals(source.substring(12, 20), entries.get(2).toString());
assertEquals(12, entries.get(2).getIndex());
assertEquals("App", entries.get(3).toString());
- assertEquals(22, entries.get(3).getIndex());
+ assertEquals(appIndex, entries.get(3).getIndex());
assertEquals("app", entries.get(4).toString());
- assertEquals(26, entries.get(4).getIndex());
+ assertEquals(appArgumentIndex, entries.get(4).getIndex());
}
@Test