This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 21f74d2370 Add unit tests for ExpressionTokenizer
21f74d2370 is described below
commit 21f74d237029b5be8f7a73ca05bebb8f68cc8f69
Author: lihongyi <[email protected]>
AuthorDate: Sun Aug 2 11:58:52 2026 +0800
Add unit tests for ExpressionTokenizer
---
.../catalina/ssi/TestExpressionTokenizer.java | 160 +++++++++++++++++++++
1 file changed, 160 insertions(+)
diff --git a/test/org/apache/catalina/ssi/TestExpressionTokenizer.java b/test/org/apache/catalina/ssi/TestExpressionTokenizer.java
new file mode 100644
index 0000000000..eafa517b49
--- /dev/null
+++ b/test/org/apache/catalina/ssi/TestExpressionTokenizer.java
@@ -0,0 +1,160 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.ssi;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Unit tests for {@link ExpressionTokenizer}. Tests all token types and
+ * boundary conditions of the tokenizer that are not exercised by the
+ * end-to-end tests in {@link TestExpressionParseTree}.
+ */
+@RunWith(Parameterized.class)
+public class TestExpressionTokenizer {
+
+ private final String expression;
+ private final int[] expectedTokens;
+ private final String[] expectedValues;
+
+
+ @Parameters(name = "{index}: [{0}]")
+ public static Collection<Object[]> parameters() {
+ List<Object[]> parameterSets = new ArrayList<>();
+
+ // Single operators. Note that TOKEN_END is not part of the expected
+ // sequence: hasMoreTokens() returns false once the last real token
+ // has been consumed and TOKEN_END is only returned by nextToken()
+ // once hasMoreTokens() is false (matching the usage in
+ // ExpressionParseTree).
+ parameterSets.add(new Object[] { "(",
+ new int[] { ExpressionTokenizer.TOKEN_LBRACE }, new String[] { null } });
+ parameterSets.add(new Object[] { ")",
+ new int[] { ExpressionTokenizer.TOKEN_RBRACE }, new String[] { null } });
+ parameterSets.add(new Object[] { "=",
+ new int[] { ExpressionTokenizer.TOKEN_EQ }, new String[] { null } });
+ parameterSets.add(new Object[] { "!=",
+ new int[] { ExpressionTokenizer.TOKEN_NOT_EQ }, new String[] { null } });
+ parameterSets.add(new Object[] { "!",
+ new int[] { ExpressionTokenizer.TOKEN_NOT }, new String[] { null } });
+ parameterSets.add(new Object[] { "||",
+ new int[] { ExpressionTokenizer.TOKEN_OR }, new String[] { null } });
+ parameterSets.add(new Object[] { "&&",
+ new int[] { ExpressionTokenizer.TOKEN_AND }, new String[] { null } });
+ parameterSets.add(new Object[] { ">",
+ new int[] { ExpressionTokenizer.TOKEN_GT }, new String[] { null } });
+ parameterSets.add(new Object[] { ">=",
+ new int[] { ExpressionTokenizer.TOKEN_GE }, new String[] { null } });
+ parameterSets.add(new Object[] { "<",
+ new int[] { ExpressionTokenizer.TOKEN_LT }, new String[] { null } });
+ parameterSets.add(new Object[] { "<=",
+ new int[] { ExpressionTokenizer.TOKEN_LE }, new String[] { null } });
+
+ // String values
+ parameterSets.add(new Object[] { "foo",
+ new int[] { ExpressionTokenizer.TOKEN_STRING }, new String[] { "foo" } });
+ parameterSets.add(new Object[] { "foo bar",
+ new int[] { ExpressionTokenizer.TOKEN_STRING, ExpressionTokenizer.TOKEN_STRING },
+ new String[] { "foo", "bar" } });
+ parameterSets.add(new Object[] { "a = a",
+ new int[] { ExpressionTokenizer.TOKEN_STRING, ExpressionTokenizer.TOKEN_EQ,
+ ExpressionTokenizer.TOKEN_STRING },
+ new String[] { "a", null, "a" } });
+
+ // Quoted strings (single and double quotes)
+ parameterSets.add(new Object[] { "\"foo\"",
+ new int[] { ExpressionTokenizer.TOKEN_STRING }, new String[] { "foo" } });
+ parameterSets.add(new Object[] { "'foo'",
+ new int[] { ExpressionTokenizer.TOKEN_STRING }, new String[] { "foo" } });
+ parameterSets.add(new Object[] { "\"foo bar\"",
+ new int[] { ExpressionTokenizer.TOKEN_STRING }, new String[] { "foo bar" } });
+ // Escaped quote inside a quoted string
+ parameterSets.add(new Object[] { "\"foo\\\"bar\"",
+ new int[] { ExpressionTokenizer.TOKEN_STRING }, new String[] { "foo\\\"bar" } });
+
+ // Regular expression strings
+ parameterSets.add(new Object[] { "/a/",
+ new int[] { ExpressionTokenizer.TOKEN_STRING }, new String[] { "/a/" } });
+ parameterSets.add(new Object[] { "/a=b/",
+ new int[] { ExpressionTokenizer.TOKEN_STRING }, new String[] { "/a=b/" } });
+ // Escaped slash inside a regular expression
+ parameterSets.add(new Object[] { "/a\\/b/",
+ new int[] { ExpressionTokenizer.TOKEN_STRING }, new String[] { "/a\\/b/" } });
+
+ // Operators mixed with strings
+ parameterSets.add(new Object[] { "a && b",
+ new int[] { ExpressionTokenizer.TOKEN_STRING, ExpressionTokenizer.TOKEN_AND,
+ ExpressionTokenizer.TOKEN_STRING },
+ new String[] { "a", null, "b" } });
+ parameterSets.add(new Object[] { "a || b",
+ new int[] { ExpressionTokenizer.TOKEN_STRING, ExpressionTokenizer.TOKEN_OR,
+ ExpressionTokenizer.TOKEN_STRING },
+ new String[] { "a", null, "b" } });
+ parameterSets.add(new Object[] { "!a",
+ new int[] { ExpressionTokenizer.TOKEN_NOT, ExpressionTokenizer.TOKEN_STRING },
+ new String[] { null, "a" } });
+ parameterSets.add(new Object[] { "a >= b",
+ new int[] { ExpressionTokenizer.TOKEN_STRING, ExpressionTokenizer.TOKEN_GE,
+ ExpressionTokenizer.TOKEN_STRING },
+ new String[] { "a", null, "b" } });
+ parameterSets.add(new Object[] { "a <= b",
+ new int[] { ExpressionTokenizer.TOKEN_STRING, ExpressionTokenizer.TOKEN_LE,
+ ExpressionTokenizer.TOKEN_STRING },
+ new String[] { "a", null, "b" } });
+ parameterSets.add(new Object[] { "(a)",
+ new int[] { ExpressionTokenizer.TOKEN_LBRACE, ExpressionTokenizer.TOKEN_STRING,
+ ExpressionTokenizer.TOKEN_RBRACE },
+ new String[] { null, "a", null } });
+
+ // Edge cases: empty and whitespace-only expressions yield no tokens
+ parameterSets.add(new Object[] { "", new int[] {}, new String[] {} });
+ parameterSets.add(new Object[] { " ", new int[] {}, new String[] {} });
+ parameterSets.add(new Object[] { "\t\n", new int[] {}, new String[] {} });
+
+ return parameterSets;
+ }
+
+
+ public TestExpressionTokenizer(String expression, int[] expectedTokens, String[] expectedValues) {
+ this.expression = expression;
+ this.expectedTokens = expectedTokens;
+ this.expectedValues = expectedValues;
+ }
+
+
+ @Test
+ public void testTokens() {
+ ExpressionTokenizer tokenizer = new ExpressionTokenizer(expression);
+ for (int i = 0; i < expectedTokens.length; i++) {
+ Assert.assertTrue("Expected more tokens at position " + i + " for expression '" + expression + "'",
+ tokenizer.hasMoreTokens());
+ Assert.assertEquals("Unexpected token type at position " + i + " for expression '" + expression + "'",
+ expectedTokens[i], tokenizer.nextToken());
+ Assert.assertEquals("Unexpected token value at position " + i + " for expression '" + expression + "'",
+ expectedValues[i], tokenizer.getTokenValue());
+ }
+ Assert.assertFalse("Expected no more tokens for expression '" + expression + "'",
+ tokenizer.hasMoreTokens());
+ }
+}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.