Update of
/var/cvs/applications/vpro-wizards/tests/org/mmbase/applications/vprowizards/spring/cache/template
In directory
james.mmbase.org:/tmp/cvs-serv32624/applications/vpro-wizards/tests/org/mmbase/applications/vprowizards/spring/cache/template
Modified Files:
AbstractTemplateParserTest.java QueryTemplateParserTest.java
SimpleTemplateParserTest.java TemplateTest.java
MultiTemplateParserTest.java
Log Message:
more tests
See also:
http://cvs.mmbase.org/viewcvs/applications/vpro-wizards/tests/org/mmbase/applications/vprowizards/spring/cache/template
Index: AbstractTemplateParserTest.java
===================================================================
RCS file:
/var/cvs/applications/vpro-wizards/tests/org/mmbase/applications/vprowizards/spring/cache/template/AbstractTemplateParserTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AbstractTemplateParserTest.java 6 Dec 2008 17:58:50 -0000 1.1
+++ AbstractTemplateParserTest.java 8 Dec 2008 19:37:08 -0000 1.2
@@ -4,6 +4,8 @@
import java.lang.reflect.Method;
import java.util.List;
+import org.mmbase.datatypes.processors.CreationTimeGuesser;
+
import junit.framework.TestCase;
@@ -13,6 +15,7 @@
protected String nonMatchingTemplate = getNonMatchingTemplate();
protected String nonMatchingTemplateWithNodenr =
getNonMatchingTemplateWithNodenr();
protected String matchingTemplateResult = getMatchingTemplateResult();
+ protected String matchingTemplateWithTemplateRemoved =
getMatchingTemplateWithTemplateRemoved();
protected String nodeType = getNodeType();
protected String nodeNumber= getNodeNumber();
protected List<String> legalPatterns = getLegalPatterns();
@@ -69,15 +72,23 @@
assertEquals(nonMatchingTemplate, templateParser.getTemplate());
}
+ public void test_strip_template_leave_nodenr_withNodenr(){
+ createInstanceAndInsertNodenr(nodeType, nodeNumber, matchingTemplate);
+ templateParser.stripTemplateLeaveNodenr();
+ assertEquals(matchingTemplateWithTemplateRemoved,
templateParser.getTemplate());
+ }
+
protected abstract String getMatchingTemplate();
protected abstract String getMatchingTemplateWithNodenr();
protected abstract String getNonMatchingTemplate();
protected abstract String getNonMatchingTemplateWithNodenr();
protected abstract String getMatchingTemplateResult();
+ protected abstract String getMatchingTemplateWithTemplateRemoved();
protected abstract String getNodeType();
protected abstract String getNodeNumber();
protected abstract void createInstanceAndInsertNodenr(String nodeType,
String nodeNumber, String template);
protected abstract List<String> getLegalPatterns();
protected abstract List<String> getIllegalPatterns();
protected abstract Class<? extends TemplateParser>
getTemplateParserClass();
+
}
Index: QueryTemplateParserTest.java
===================================================================
RCS file:
/var/cvs/applications/vpro-wizards/tests/org/mmbase/applications/vprowizards/spring/cache/template/QueryTemplateParserTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- QueryTemplateParserTest.java 6 Dec 2008 17:58:50 -0000 1.1
+++ QueryTemplateParserTest.java 8 Dec 2008 19:37:08 -0000 1.2
@@ -10,7 +10,7 @@
QueryTemplate qt = new QueryTemplate(template);
QueryTemplateParser queryTemplateParser = new
QueryTemplateParser(nodeType, nodeNumber, template, qt, new
MockTemplateQueryRunner(nodeNumber));
templateParser = queryTemplateParser;
- templateParser.insertNumber();
+ templateParser.insertNodeNumber();
}
@Override
@@ -76,4 +76,9 @@
protected Class<? extends TemplateParser> getTemplateParserClass() {
return QueryTemplateParser.class;
}
+
+ @Override
+ protected String getMatchingTemplateWithTemplateRemoved() {
+ return getNodeNumber();
+ }
}
Index: SimpleTemplateParserTest.java
===================================================================
RCS file:
/var/cvs/applications/vpro-wizards/tests/org/mmbase/applications/vprowizards/spring/cache/template/SimpleTemplateParserTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SimpleTemplateParserTest.java 6 Dec 2008 17:58:50 -0000 1.1
+++ SimpleTemplateParserTest.java 8 Dec 2008 19:37:08 -0000 1.2
@@ -9,7 +9,7 @@
@Override
protected final void createInstanceAndInsertNodenr(String nodeType, String
nodeNumber, String template) {
templateParser = new SimpleTemplateParser (nodeType, nodeNumber,
template);
- templateParser.insertNumber();
+ templateParser.insertNodeNumber();
}
@Override
@@ -72,5 +72,10 @@
return SimpleTemplateParser.class;
}
+ @Override
+ protected String getMatchingTemplateWithTemplateRemoved() {
+ return getNodeNumber();
+ }
+
}
Index: TemplateTest.java
===================================================================
RCS file:
/var/cvs/applications/vpro-wizards/tests/org/mmbase/applications/vprowizards/spring/cache/template/TemplateTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- TemplateTest.java 6 Dec 2008 17:58:50 -0000 1.1
+++ TemplateTest.java 8 Dec 2008 19:37:08 -0000 1.2
@@ -5,14 +5,25 @@
public class TemplateTest extends TestCase {
public void testTemplateWithoutNodenr(){
Template t = new Template("hallo");
- assertFalse(t.hasNodenr());
+ assertFalse(t.hasNodeNumber());
assertEquals("", t.getNodeNumber());
}
public void testTemplateWithNodenr(){
Template t = new Template("hallo:9090");
assertEquals("hallo:9090", t.getTemplate());
- assertTrue(t.hasNodenr());
+ assertTrue(t.hasNodeNumber());
assertEquals("9090", t.getNodeNumber());
}
+
+ public void testRemoveTemplateWithNodenr(){
+ Template t = new Template("hallo:9090");
+ t.removeTemplate();
+ assertEquals("9090", t.getTemplate());
+ }
+ public void testRemoveTemplateWithoutNodenr(){
+ Template t = new Template("hallo");
+ t.removeTemplate();
+ assertEquals("", t.getTemplate());
+ }
}
Index: MultiTemplateParserTest.java
===================================================================
RCS file:
/var/cvs/applications/vpro-wizards/tests/org/mmbase/applications/vprowizards/spring/cache/template/MultiTemplateParserTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MultiTemplateParserTest.java 6 Dec 2008 17:58:50 -0000 1.1
+++ MultiTemplateParserTest.java 8 Dec 2008 19:37:08 -0000 1.2
@@ -9,7 +9,7 @@
protected void createInstanceAndInsertNodenr(String nodeType, String
nodeNumber, String template) {
MockTemplateQueryRunner mockQueryRunner = new
MockTemplateQueryRunner(getNodeNumber());
templateParser = new MultiTemplateParser(nodeType, nodeNumber,
template, mockQueryRunner);
- templateParser.insertNumber();
+ templateParser.insertNodeNumber();
}
@Override
@@ -93,4 +93,9 @@
return MultiTemplateParser.class;
}
+ @Override
+ protected String getMatchingTemplateWithTemplateRemoved() {
+ return "pre100and100post";
+ }
+
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
