[MMBASE CVS] applications/vpro-wizards/tests/org/mmbase/applications/vprowizards/spring/cache FlushNameTemplateBeanIntegrationTest.java

[Ernst Bunders]

Update of 
/var/cvs/applications/vpro-wizards/tests/org/mmbase/applications/vprowizards/spring/cache
In directory 
james.mmbase.org:/tmp/cvs-serv29732/tests/org/mmbase/applications/vprowizards/spring/cache

Modified Files:
        FlushNameTemplateBeanIntegrationTest.java 
Log Message:
renamed a method


See also: 
http://cvs.mmbase.org/viewcvs/applications/vpro-wizards/tests/org/mmbase/applications/vprowizards/spring/cache


Index: FlushNameTemplateBeanIntegrationTest.java
===================================================================
RCS file: 
/var/cvs/applications/vpro-wizards/tests/org/mmbase/applications/vprowizards/spring/cache/FlushNameTemplateBeanIntegrationTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- FlushNameTemplateBeanIntegrationTest.java   12 Jan 2009 11:15:29 -0000      
1.2
+++ FlushNameTemplateBeanIntegrationTest.java   12 Jan 2009 14:29:01 -0000      
1.3
@@ -38,7 +38,7 @@
         Cloud cloud = createMock(Cloud.class);
         bean.setCloud(cloud);
         try {
-            bean.processAndGetTemplate();
+            bean.getTemplate();
         } catch (Exception e) {
             fail("illegal state exception should not occur but is: 
"+e.getMessage());
         }
@@ -47,41 +47,41 @@
     public void 
test_simple_template_with_matching_nodetype_without_nodenumber_has_number_inserted()
 {
         bean = createConfiguredBean();
         bean.setTemplate("een:[user]");
-        assertEquals("een:[user:100]", bean.processAndGetTemplate());
+        assertEquals("een:[user:100]", bean.getTemplate());
     }
     
     public void test_simple_template_without_matching_nodetype_is_ignored() {
         bean = createConfiguredBean();
         bean.setTemplate("een:[person]");
-        assertEquals("een:[person]", bean.processAndGetTemplate());
+        assertEquals("een:[person]", bean.getTemplate());
     }
 
     public void 
test_simple_template_if_nodetype_dousnt_match_template_must_be_cleaned_of_nodenrs()
 {
         bean = createConfiguredBean();
         bean.setTemplate("een:[disco:600]");
-        assertEquals("een:[disco]", bean.processAndGetTemplate());
+        assertEquals("een:[disco]", bean.getTemplate());
     }
     
     public void 
test_multi_template_nodenr_should_be_inserted_where_nodetype_matches(){
         bean = createConfiguredBean();
         bean.setTemplate("een:[disco], twee:[user]");
-        assertEquals("een:[disco], twee:[user:100]", 
bean.processAndGetTemplate());
+        assertEquals("een:[disco], twee:[user:100]", bean.getTemplate());
         
         bean = createConfiguredBean();
         bean.setTemplate("een:[user], twee:[user]");
-        assertEquals("een:[user:100], twee:[user:100]", 
bean.processAndGetTemplate());
+        assertEquals("een:[user:100], twee:[user:100]", bean.getTemplate());
         
         bean = createConfiguredBean();
         bean.setCloud(createMockCloudForQueryTemplates("test", "nogwat", 100, 
50));
         bean.setTemplate("een:[user.test.nogwat], twee:[nogwat.user.test]");
-        assertEquals("een:[user.test.nogwat:50], twee:[nogwat.user.test]", 
bean.processAndGetTemplate());
+        assertEquals("een:[user.test.nogwat:50], twee:[nogwat.user.test]", 
bean.getTemplate());
         verifyMockObjects();
     }
     
     public void 
test_multi_template_nodenumbers_should_be_stripped_for_all_subtemplates(){
         bean = createConfiguredBean();
         bean.setTemplate("een:[disco:5], twee:[user:5]");
-        assertEquals("een:[disco], twee:[user:100]", 
bean.processAndGetTemplate() );
+        assertEquals("een:[disco], twee:[user:100]", bean.getTemplate() );
     }
     
     public void test_malfomed_templates_are_ignored(){
@@ -104,7 +104,7 @@
         bean.setCloud(createMockCloudForQueryTemplates("posrel", "thing", 100, 
50));
         bean.setNodeType("thing");
         bean.setTemplate("een:[disco.posrel.thing:300]");
-        assertEquals("node type dousn't match.", "een:[disco.posrel.thing]", 
bean.processAndGetTemplate());
+        assertEquals("node type dousn't match.", "een:[disco.posrel.thing]", 
bean.getTemplate());
         try {
             verifyMockObjects();
             fail("The nodetype dous not match the template, so the query is 
not executed.");
@@ -144,7 +144,7 @@
     private void testIgnoredPattern(String pattern){
         bean = createConfiguredBean();
         bean.setTemplate(pattern);
-        assertEquals(pattern + " should be ignored",pattern, 
bean.processAndGetTemplate());
+        assertEquals(pattern + " should be ignored",pattern, 
bean.getTemplate());
     }
                                                     
     
@@ -153,7 +153,7 @@
 
     private void tryForIllegalStateOnProcessAndGet() {
         try {
-            bean.processAndGetTemplate();
+            bean.getTemplate();
             fail("illegal state exception should be thrown");
         } catch (IllegalStateException e) {/* ignore */
         }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs