Author: simonetripodi
Date: Tue Feb 15 16:48:40 2011
New Revision: 1070960
URL: http://svn.apache.org/viewvc?rev=1070960&view=rev
Log:
first checkin of IncludeTestCase, an adapted version of the proper one on /trunk
old test continue to pass, it was needed adding the PrefixedRulesBinder to
maintain the pattern specified in the XML document
Added:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/PrefixedRulesBinder.java
(with props)
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTestCase.java
(with props)
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/IncludeRule.java
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/IncludeRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/IncludeRule.java?rev=1070960&r1=1070959&r2=1070960&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/IncludeRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/IncludeRule.java
Tue Feb 15 16:48:40 2011
@@ -55,7 +55,8 @@ final class IncludeRule extends Rule {
if (!this.memoryRulesBinder.getIncludedFiles().add(fileName)) {
throw new DigesterLoadingException("Circular file inclusion
detected for file: " + fileName);
}
- this.memoryRulesBinder.install(new FromXmlRulesModule(fileName));
+ // this.memoryRulesBinder.install(new
FromXmlRulesModule(fileName));
+ this.install(new FromXmlRulesModule(fileName));
}
// The class attribute gives the name of a class that implements
@@ -73,7 +74,7 @@ final class IncludeRule extends Rule {
RulesModule rulesSource = (RulesModule) cls.newInstance();
- this.targetRulesBinder.install(rulesSource);
+ this.install(rulesSource);
} catch (Exception e) {
this.targetRulesBinder.addError("Impossible to include
programmatic rules from class '%s': %s",
className,
@@ -82,4 +83,10 @@ final class IncludeRule extends Rule {
}
}
+ private void install(RulesModule rulesModule) {
+ // that's an hack, shall not be taken in consideration!!! :)
+ rulesModule.configure(
+ new PrefixedRulesBinder(this.targetRulesBinder,
this.memoryRulesBinder.getPatternStack().toString()));
+ }
+
}
Added:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/PrefixedRulesBinder.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/PrefixedRulesBinder.java?rev=1070960&view=auto
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/PrefixedRulesBinder.java
(added)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/PrefixedRulesBinder.java
Tue Feb 15 16:48:40 2011
@@ -0,0 +1,57 @@
+package org.apache.commons.digester3.xmlrules.metaparser;
+
+import org.apache.commons.digester3.RulesBinder;
+import org.apache.commons.digester3.RulesModule;
+import org.apache.commons.digester3.rulesbinder.ConverterBuilder;
+import org.apache.commons.digester3.rulesbinder.LinkedRuleBuilder;
+
+final class PrefixedRulesBinder implements RulesBinder {
+
+ private final RulesBinder wrappedRulesBinder;
+
+ private final String prefix;
+
+ public PrefixedRulesBinder(RulesBinder wrappedRulesBinder, String prefix) {
+ this.wrappedRulesBinder = wrappedRulesBinder;
+ this.prefix = prefix;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void addError(String messagePattern, Object... arguments) {
+ this.wrappedRulesBinder.addError(messagePattern, arguments);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void addError(Throwable t) {
+ this.wrappedRulesBinder.addError(t);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void install(RulesModule rulesModule) {
+ this.wrappedRulesBinder.install(rulesModule);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public LinkedRuleBuilder forPattern(String pattern) {
+ if (this.prefix != null && this.prefix.length() > 0) {
+ pattern = this.prefix + '/' + pattern;
+ }
+ return this.wrappedRulesBinder.forPattern(pattern);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public <T> ConverterBuilder<T> convert(Class<T> type) {
+ return this.wrappedRulesBinder.convert(type);
+ }
+
+}
Propchange:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/PrefixedRulesBinder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/PrefixedRulesBinder.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/PrefixedRulesBinder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTestCase.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTestCase.java?rev=1070960&view=auto
==============================================================================
---
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTestCase.java
(added)
+++
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTestCase.java
Tue Feb 15 16:48:40 2011
@@ -0,0 +1,73 @@
+/* $Id$
+ *
+ * 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.commons.digester3.xmlrules;
+
+import static org.junit.Assert.*;
+
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.digester3.AbstractRulesModule;
+import org.apache.commons.digester3.AbstractTestCase;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.Rule;
+import org.junit.Test;
+
+/**
+ *
+ */
+public final class IncludeTestCase extends AbstractTestCase {
+
+ public static class TestDigesterRulesModule extends AbstractRulesModule {
+
+ @Override
+ protected void configure() {
+ forPattern("bar").addRule(new Rule() {
+
+ @Override
+ public void body(String namespace, String name, String text)
throws Exception {
+ ((ArrayList<String>) this.getDigester().peek()).add(text);
+ }
+
+ });
+ }
+
+ }
+
+ @Test
+ public void testBasicInclude() throws Exception {
+ String rulesXml = "<?xml version='1.0'?>"
+ + "<digester-rules>"
+ + " <pattern value='root/foo'>"
+ + " <include
class='org.apache.commons.digester3.xmlrules.IncludeTestCase$TestDigesterRulesModule'/>"
+ + " </pattern>"
+ + "</digester-rules>";
+
+ String xml = "<?xml version='1.0'
?><root><foo><bar>short</bar></foo></root>";
+
+ List<String> list = new ArrayList<String>();
+ Digester digester = newBasicDigester(new FromXmlRulesModule(new
StringReader(rulesXml)));
+ digester.push(list);
+ digester.parse(new StringReader(xml));
+
+ assertEquals("Number of entries", 1, list.size());
+ assertEquals("Entry value", "short", list.get(0));
+ }
+
+}
Propchange:
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTestCase.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
