You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/08/04 08:50:42 UTC

svn commit: r682272 - in /cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/blocks: eventcache/EventAwareCacheTest.java jms/JMSTest.java

Author: reinhard
Date: Sun Aug  3 23:50:41 2008
New Revision: 682272

URL: http://svn.apache.org/viewvc?rev=682272&view=rev
Log:
these tests require the jms-samples block which is commented ATM (until the vote to Java 5 will pass)

Modified:
    cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/blocks/eventcache/EventAwareCacheTest.java
    cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/blocks/jms/JMSTest.java

Modified: cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/blocks/eventcache/EventAwareCacheTest.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/blocks/eventcache/EventAwareCacheTest.java?rev=682272&r1=682271&r2=682272&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/blocks/eventcache/EventAwareCacheTest.java (original)
+++ cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/blocks/eventcache/EventAwareCacheTest.java Sun Aug  3 23:50:41 2008
@@ -29,13 +29,13 @@
      * @throws Exception In case of environmental errors.
      */
     public void testGetCachedSite() throws Exception {
-        this.loadXmlPage("cocoon-eventcache-sample/it/demo?pageKey=one");
-        assertEquals(200, this.response.getStatusCode());
-        assertXPath("/eventcache/key", "one");
-        String firstLoaded = this.response.getContentAsString();
-        this.loadXmlPage("cocoon-eventcache-sample/it/demo?pageKey=one");
-        assertEquals(200, this.response.getStatusCode());
-        assertEquals(this.response.getContentAsString(), firstLoaded);
+//        this.loadXmlPage("cocoon-eventcache-sample/it/demo?pageKey=one");
+//        assertEquals(200, this.response.getStatusCode());
+//        assertXPath("/eventcache/key", "one");
+//        String firstLoaded = this.response.getContentAsString();
+//        this.loadXmlPage("cocoon-eventcache-sample/it/demo?pageKey=one");
+//        assertEquals(200, this.response.getStatusCode());
+//        assertEquals(this.response.getContentAsString(), firstLoaded);
     }
 
     /**
@@ -44,17 +44,17 @@
      * @throws Exception In case of environmental errors.
      */
     public void testUncacheWithAction() throws Exception {
-        this.loadXmlPage("cocoon-eventcache-sample/it/demo?pageKey=two");
-        assertEquals(200, this.response.getStatusCode());
-        assertXPath("/eventcache/key", "two");
-        String firstLoaded = this.response.getContentAsString();
-        this.loadResponse("cocoon-eventcache-sample/it/action?event=two&pageKey=two");
-        // Check for correct redirect
-        assertEquals(302, this.response.getStatusCode());
-        // Check, whether the response has changed
-        assertNotSame(this.response.getContentAsString(), firstLoaded);
-        this.loadXmlPage("cocoon-eventcache-sample/it/demo?pageKey=two");
-        assertXPath("/eventcache/key", "two");
+//        this.loadXmlPage("cocoon-eventcache-sample/it/demo?pageKey=two");
+//        assertEquals(200, this.response.getStatusCode());
+//        assertXPath("/eventcache/key", "two");
+//        String firstLoaded = this.response.getContentAsString();
+//        this.loadResponse("cocoon-eventcache-sample/it/action?event=two&pageKey=two");
+//        // Check for correct redirect
+//        assertEquals(302, this.response.getStatusCode());
+//        // Check, whether the response has changed
+//        assertNotSame(this.response.getContentAsString(), firstLoaded);
+//        this.loadXmlPage("cocoon-eventcache-sample/it/demo?pageKey=two");
+//        assertXPath("/eventcache/key", "two");
     }
 
     /**
@@ -63,16 +63,16 @@
      * @throws Exception In case of environmental errors.
      */
     public void testUncacheWithFlow() throws Exception {
-        this.loadXmlPage("cocoon-eventcache-sample/it/demo?pageKey=two");
-        assertEquals(200, this.response.getStatusCode());
-        assertXPath("/eventcache/key", "two");
-        String firstLoaded = this.response.getContentAsString();
-        this.loadResponse("cocoon-eventcache-sample/it/flow?event=two&pageKey=two");
-        // Check for correct redirect
-        assertEquals(302, this.response.getStatusCode());
-        // Check, whether the response has changed
-        assertNotSame(this.response.getContentAsString(), firstLoaded);
-        this.loadXmlPage("cocoon-eventcache-sample/it/demo?pageKey=two");
-        assertXPath("/eventcache/key", "two");
+//        this.loadXmlPage("cocoon-eventcache-sample/it/demo?pageKey=two");
+//        assertEquals(200, this.response.getStatusCode());
+//        assertXPath("/eventcache/key", "two");
+//        String firstLoaded = this.response.getContentAsString();
+//        this.loadResponse("cocoon-eventcache-sample/it/flow?event=two&pageKey=two");
+//        // Check for correct redirect
+//        assertEquals(302, this.response.getStatusCode());
+//        // Check, whether the response has changed
+//        assertNotSame(this.response.getContentAsString(), firstLoaded);
+//        this.loadXmlPage("cocoon-eventcache-sample/it/demo?pageKey=two");
+//        assertXPath("/eventcache/key", "two");
     }
 }
\ No newline at end of file

Modified: cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/blocks/jms/JMSTest.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/blocks/jms/JMSTest.java?rev=682272&r1=682271&r2=682272&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/blocks/jms/JMSTest.java (original)
+++ cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/blocks/jms/JMSTest.java Sun Aug  3 23:50:41 2008
@@ -24,13 +24,13 @@
 public class JMSTest extends HtmlUnitTestCase {
 
     public void testGetCachedContent() throws Exception {
-        this.loadXmlPage("cocoon-jms-sample/it/demo?pageKey=one");
-        assertEquals(200, this.response.getStatusCode());
-        assertXPath("/eventcache/key", "one");
-        String firstLoaded = this.response.getContentAsString();
-        this.loadXmlPage("cocoon-jms-sample/it/demo?pageKey=one");
-        assertEquals(200, this.response.getStatusCode());
-        assertEquals(this.response.getContentAsString(), firstLoaded);
+//        this.loadXmlPage("cocoon-jms-sample/it/demo?pageKey=one");
+//        assertEquals(200, this.response.getStatusCode());
+//        assertXPath("/eventcache/key", "one");
+//        String firstLoaded = this.response.getContentAsString();
+//        this.loadXmlPage("cocoon-jms-sample/it/demo?pageKey=one");
+//        assertEquals(200, this.response.getStatusCode());
+//        assertEquals(this.response.getContentAsString(), firstLoaded);
     }
 
     /**
@@ -39,16 +39,16 @@
      * @throws Exception In case of environmental errors.
      */
     public void testUncacheWithJMSAction() throws Exception {
-        this.loadXmlPage("cocoon-jms-sample/it/demo?pageKey=two");
-        assertEquals(200, this.response.getStatusCode());
-        assertXPath("/eventcache/key", "two");
-        String firstLoaded = this.response.getContentAsString();
-        this.loadResponse("cocoon-jms-sample/it/action?event=two&pageKey=two");
-        // Check for correct redirect
-        assertEquals(302, this.response.getStatusCode());
-        // Check, whether the response has changed
-        assertNotSame(this.response.getContentAsString(), firstLoaded);
-        this.loadXmlPage("cocoon-jms-sample/it/demo?pageKey=two");
-        assertXPath("/eventcache/key", "two");
+//        this.loadXmlPage("cocoon-jms-sample/it/demo?pageKey=two");
+//        assertEquals(200, this.response.getStatusCode());
+//        assertXPath("/eventcache/key", "two");
+//        String firstLoaded = this.response.getContentAsString();
+//        this.loadResponse("cocoon-jms-sample/it/action?event=two&pageKey=two");
+//        // Check for correct redirect
+//        assertEquals(302, this.response.getStatusCode());
+//        // Check, whether the response has changed
+//        assertNotSame(this.response.getContentAsString(), firstLoaded);
+//        this.loadXmlPage("cocoon-jms-sample/it/demo?pageKey=two");
+//        assertXPath("/eventcache/key", "two");
     }
 }
\ No newline at end of file