You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2008/01/29 20:36:00 UTC
svn commit: r616493 - in /cocoon/whiteboard/micro/core:
cocoon-core/src/test/java/org/apache/cocoon/components/treeprocessor/variables/
cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/template/
cocoon-expressi...
Author: gkossakowski
Date: Tue Jan 29 11:35:57 2008
New Revision: 616493
URL: http://svn.apache.org/viewvc?rev=616493&view=rev
Log:
Split tests from PreparedVariableResolverTestCase into:
* SitemapLanguageExpressionTestCase
* DefaultStringTemplateParserTestCase
Added:
cocoon/whiteboard/micro/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/template/
cocoon/whiteboard/micro/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/template/expression/
cocoon/whiteboard/micro/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/template/expression/DefaultStringTemplateParserTestCase.java
Modified:
cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/java/org/apache/cocoon/components/treeprocessor/variables/SitemapLanguageExpressionTestCase.java
Modified: cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java?rev=616493&r1=616492&r2=616493&view=diff
==============================================================================
--- cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java (original)
+++ cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java Tue Jan 29 11:35:57 2008
@@ -17,13 +17,8 @@
package org.apache.cocoon.components.treeprocessor.variables;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.cocoon.SitemapComponentTestCase;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
-import org.apache.cocoon.environment.mock.MockRequest;
-import org.apache.cocoon.sitemap.PatternException;
/**
* Test case for the nested variant of the PreparedVariableResolver
@@ -44,158 +39,8 @@
context.service(getManager());
//objectModel = getObjectModel();
}
-
- public void testNestedExpressions() throws Exception {
- String expr = "{request-param:{request-param:foo}}";
- MockRequest request = getRequest();
- request.reset();
- request.addParameter("foo", "bar");
- request.addParameter("bar", "123");
-
- Map sitemapElements = new HashMap();
- context.pushMap("sitemap", sitemapElements);
- resolver.setExpression(expr);
- assertEquals("123", resolver.resolve(context, getObjectModel()));
- }
-
- public void testNestedModuleAndSitemapExpressions() throws Exception {
- String expr = "{request-param:f{1}}";
- MockRequest request = getRequest();
- request.reset();
- request.addParameter("foo", "123");
-
- Map sitemapElements = new HashMap();
- sitemapElements.put("1", "oo");
- context.pushMap("sitemap", sitemapElements);
- resolver.setExpression(expr);
- assertEquals("123", resolver.resolve(context, getObjectModel()));
- }
-
- public void testAnchors() throws PatternException {
- String expr = "{#label:name}";
-
- Map sitemapElements = new HashMap();
- sitemapElements.put("name", "123");
- context.pushMap("label", sitemapElements);
- resolver.setExpression(expr);
- assertEquals("123", resolver.resolve(context, getObjectModel()));
- }
-
- public void testSitemapVariables() throws PatternException {
- String expr = "123{1}";
-
- Map sitemapElements = new HashMap();
- sitemapElements.put("1", "abc");
- context.pushMap("label", sitemapElements);
- resolver.setExpression(expr);
- assertEquals("123abc", resolver.resolve(context, getObjectModel()));
- }
-
- public void testSitemapVariablesWithText() throws PatternException {
- String expr = "123{1}/def";
-
- Map sitemapElements = new HashMap();
- sitemapElements.put("1", "abc");
- context.pushMap("label", sitemapElements);
- resolver.setExpression(expr);
- assertEquals("123abc/def", resolver.resolve(context, getObjectModel()));
- }
-
- public void testPrefixedSitemapVariable() throws PatternException {
- String expr = "123{sitemap:1}/def";
-
- Map sitemapElements = new HashMap();
- sitemapElements.put("1", "abc");
- context.pushMap("label", sitemapElements);
- resolver.setExpression(expr);
- assertEquals("123abc/def", resolver.resolve(context, getObjectModel()));
- }
-
- public void testMultilevelSitemapVariables() throws PatternException {
- String expr = "from {../1} to {1}";
-
- Map sitemapElements;
- sitemapElements = new HashMap();
- sitemapElements.put("1", "juliet");
- context.pushMap("label1", sitemapElements);
-
- sitemapElements = new HashMap();
- sitemapElements.put("1", "oscar");
- context.pushMap("label2", sitemapElements);
-
- resolver.setExpression(expr);
- assertEquals("from juliet to oscar", resolver.resolve(context, getObjectModel()));
- }
-
- public void testRootSitemapVariables() throws PatternException {
- String expr = "from {/1} to {1}";
-
- Map sitemapElements;
- sitemapElements = new HashMap();
- sitemapElements.put("1", "juliet");
- context.pushMap("label1", sitemapElements);
-
- sitemapElements = new HashMap();
- sitemapElements.put("1", "oscar");
- context.pushMap("label2", sitemapElements);
-
- resolver.setExpression(expr);
- assertEquals("from juliet to oscar", resolver.resolve(context, getObjectModel()));
- }
- public void testColonInTextContent() throws PatternException {
- String expr = "http://cocoon.apache.org";
-
- Map sitemapElements;
- sitemapElements = new HashMap();
- context.pushMap("label", sitemapElements);
-
- resolver.setExpression(expr);
- assertEquals("http://cocoon.apache.org", resolver.resolve(context, getObjectModel()));
- }
-
- public void testColonBeginningTextContent() throws PatternException {
- String expr = ":colon-starts-this";
-
- Map sitemapElements;
- sitemapElements = new HashMap();
- context.pushMap("label", sitemapElements);
-
- resolver.setExpression(expr);
- assertEquals(":colon-starts-this", resolver.resolve(context, getObjectModel()));
- }
-
- public void testEmbeddedColon() throws PatternException {
- String expr = "{1}:{1}";
-
- Map sitemapElements;
- sitemapElements = new HashMap();
- sitemapElements.put("1", "abc");
- context.pushMap("label", sitemapElements);
-
- resolver.setExpression(expr);
- assertEquals("abc:abc", resolver.resolve(context, getObjectModel()));
- }
-
- public void testEscapedBraces() throws PatternException {
- String expr = "This is a \\{brace\\}";
-
- Map sitemapElements;
- sitemapElements = new HashMap();
- context.pushMap("label", sitemapElements);
-
- resolver.setExpression(expr);
- assertEquals("This is a {brace}", resolver.resolve(context, getObjectModel()));
- }
-
- public void testModuleWithoutOption() throws PatternException {
- String expr = "{baselink:}";
-
- Map sitemapElements = new HashMap();
- context.pushMap("sitemap", sitemapElements);
- resolver.setExpression(expr);
- assertEquals("", resolver.resolve(context, getObjectModel()));
- }
+ public void testDummy() { }
/* (non-Javadoc)
* @see org.apache.cocoon.CocoonTestCase#addSourceFactories()
Added: cocoon/whiteboard/micro/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/template/expression/DefaultStringTemplateParserTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/template/expression/DefaultStringTemplateParserTestCase.java?rev=616493&view=auto
==============================================================================
--- cocoon/whiteboard/micro/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/template/expression/DefaultStringTemplateParserTestCase.java (added)
+++ cocoon/whiteboard/micro/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/template/expression/DefaultStringTemplateParserTestCase.java Tue Jan 29 11:35:57 2008
@@ -0,0 +1,107 @@
+/*
+ * 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.cocoon.template.expression;
+
+import junit.framework.TestCase;
+
+public class DefaultStringTemplateParserTestCase extends TestCase {
+ //TODO: Make tests for DefaultStringTemplateParser testing nested expressions, mixed content, etc.
+
+ public void testDummy() { }
+
+ //TODO: Below are good candidates for tests moved from PreparedVariableResolver
+ /*public void testNestedExpressions() throws Exception {
+ String expr = "{request-param:{request-param:foo}}";
+ MockRequest request = getRequest();
+ request.reset();
+ request.addParameter("foo", "bar");
+ request.addParameter("bar", "123");
+
+ Map sitemapElements = new HashMap();
+ context.pushMap("sitemap", sitemapElements);
+ resolver.setExpression(expr);
+ assertEquals("123", resolver.resolve(context, getObjectModel()));
+ }
+
+ public void testNestedModuleAndSitemapExpressions() throws Exception {
+ String expr = "{request-param:f{1}}";
+ MockRequest request = getRequest();
+ request.reset();
+ request.addParameter("foo", "123");
+
+ Map sitemapElements = new HashMap();
+ sitemapElements.put("1", "oo");
+ context.pushMap("sitemap", sitemapElements);
+ resolver.setExpression(expr);
+ assertEquals("123", resolver.resolve(context, getObjectModel()));
+ }
+
+ public void testColonInTextContent() throws PatternException {
+ String expr = "http://cocoon.apache.org";
+
+ Map sitemapElements;
+ sitemapElements = new HashMap();
+ context.pushMap("label", sitemapElements);
+
+ resolver.setExpression(expr);
+ assertEquals("http://cocoon.apache.org", resolver.resolve(context, getObjectModel()));
+ }
+
+ public void testColonBeginningTextContent() throws PatternException {
+ String expr = ":colon-starts-this";
+
+ Map sitemapElements;
+ sitemapElements = new HashMap();
+ context.pushMap("label", sitemapElements);
+
+ resolver.setExpression(expr);
+ assertEquals(":colon-starts-this", resolver.resolve(context, getObjectModel()));
+ }
+
+ public void testEmbeddedColon() throws PatternException {
+ String expr = "{1}:{1}";
+
+ Map sitemapElements;
+ sitemapElements = new HashMap();
+ sitemapElements.put("1", "abc");
+ context.pushMap("label", sitemapElements);
+
+ resolver.setExpression(expr);
+ assertEquals("abc:abc", resolver.resolve(context, getObjectModel()));
+ }
+
+ public void testEscapedBraces() throws PatternException {
+ String expr = "This is a \\{brace\\}";
+
+ Map sitemapElements;
+ sitemapElements = new HashMap();
+ context.pushMap("label", sitemapElements);
+
+ resolver.setExpression(expr);
+ assertEquals("This is a {brace}", resolver.resolve(context, getObjectModel()));
+ }
+
+ public void testModuleWithoutOption() throws PatternException {
+ String expr = "{baselink:}";
+
+ Map sitemapElements = new HashMap();
+ context.pushMap("sitemap", sitemapElements);
+ resolver.setExpression(expr);
+ assertEquals("", resolver.resolve(context, getObjectModel()));
+ }*/
+
+}
Modified: cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/java/org/apache/cocoon/components/treeprocessor/variables/SitemapLanguageExpressionTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/java/org/apache/cocoon/components/treeprocessor/variables/SitemapLanguageExpressionTestCase.java?rev=616493&r1=616492&r2=616493&view=diff
==============================================================================
--- cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/java/org/apache/cocoon/components/treeprocessor/variables/SitemapLanguageExpressionTestCase.java (original)
+++ cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/java/org/apache/cocoon/components/treeprocessor/variables/SitemapLanguageExpressionTestCase.java Tue Jan 29 11:35:57 2008
@@ -16,22 +16,41 @@
*/
package org.apache.cocoon.components.treeprocessor.variables;
+import java.util.HashMap;
+import java.util.Map;
+
import junit.framework.TestCase;
import org.apache.cocoon.el.Expression;
import org.apache.cocoon.el.ExpressionCompiler;
+import org.apache.cocoon.el.impl.DefaultExpressionFactory;
import org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl;
import org.apache.cocoon.el.objectmodel.ObjectModel;
+import org.apache.cocoon.el.parsing.StringTemplateParser;
+import org.apache.cocoon.sitemap.PatternException;
+import org.apache.cocoon.template.expression.DefaultStringTemplateParser;
+import org.apache.cocoon.template.expression.Substitutions;
public class SitemapLanguageExpressionTestCase extends TestCase {
private ObjectModel objectModel;
private ExpressionCompiler compiler;
+ /**
+ * This parser is used to test more sophisticated expressions mixed with text content.
+ */
+ private StringTemplateParser parser;
protected void setUp() throws Exception {
super.setUp();
objectModel = new ObjectModelImpl();
compiler = new SitemapLanguageCompiler();
+ DefaultExpressionFactory expressionFactory = new DefaultExpressionFactory();
+ Map<String, ExpressionCompiler> expressionCompilers = new HashMap<String, ExpressionCompiler>();
+ expressionCompilers.put("default", new SitemapLanguageCompiler());
+ expressionFactory.setExpressionCompilers(expressionCompilers);
+ DefaultStringTemplateParser parser = new DefaultStringTemplateParser();
+ parser.setExpressionFactory(expressionFactory);
+ this.parser = parser;
}
public void testBasicVariable() throws Exception {
@@ -59,4 +78,79 @@
objectModel.cleanupLocalContext();
}
+
+ public void testRootPath() throws Exception {
+ objectModel.markLocalContext();
+ objectModel.putAt("sitemap/1", "xyz");
+ Expression expr = compiler.compile("map", "/1");
+
+ objectModel.markLocalContext();
+ assertEquals("xyz", expr.evaluate(objectModel));
+ objectModel.putAt("sitemap/2", "abc");
+ assertEquals("xyz", expr.evaluate(objectModel));
+ objectModel.cleanupLocalContext();
+
+ assertEquals("xyz", expr.evaluate(objectModel));
+ objectModel.cleanupLocalContext();
+ }
+
+ public void testAnchors() throws Exception {
+ Expression expr = compiler.compile("map", "#label:name");
+
+ objectModel.markLocalContext();
+
+ objectModel.putAt("sitemap/$named$/label/name", "123");
+ assertEquals("123", expr.evaluate(objectModel));
+
+ objectModel.cleanupLocalContext();
+ }
+
+ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Tests with mixed content ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ public void testVariableWithText() throws Exception {
+ String expr = "123{1}/def";
+
+ objectModel.markLocalContext();
+
+ objectModel.putAt("sitemap/1", "abc");
+ Substitutions subst = new Substitutions(parser, null, expr);
+ assertEquals("123abc/def", subst.toString(null, objectModel));
+
+ objectModel.cleanupLocalContext();
+ }
+
+ public void testMultilevelSitemapVariables() throws Exception {
+ String expr = "from {../1} to {1}";
+
+ objectModel.markLocalContext();
+ objectModel.putAt("sitemap/1", "juliet");
+
+ objectModel.markLocalContext();
+ objectModel.putAt("sitemap/1", "oscar");
+
+ Substitutions subst = new Substitutions(parser, null, expr);
+ assertEquals("from juliet to oscar", subst.toString(null, objectModel));
+
+ objectModel.cleanupLocalContext();
+
+ objectModel.cleanupLocalContext();
+ }
+
+ public void testRootSitemapVariables() throws Exception {
+ String expr = "from {/1} to {1}";
+
+ objectModel.markLocalContext();
+ objectModel.putAt("sitemap/1", "juliet");
+
+ objectModel.markLocalContext();
+ objectModel.putAt("sitemap/1", "oscar");
+
+ Substitutions subst = new Substitutions(parser, null, expr);
+ assertEquals("from juliet to oscar", subst.toString(null, objectModel));
+
+ objectModel.cleanupLocalContext();
+
+ objectModel.cleanupLocalContext();
+ }
+
}