Return-Path: Delivered-To: apmail-forrest-svn-archive@www.apache.org Received: (qmail 60294 invoked from network); 20 Nov 2006 00:26:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Nov 2006 00:26:37 -0000 Received: (qmail 53567 invoked by uid 500); 20 Nov 2006 00:26:47 -0000 Delivered-To: apmail-forrest-svn-archive@forrest.apache.org Received: (qmail 53502 invoked by uid 500); 20 Nov 2006 00:26:47 -0000 Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Forrest Developers List" List-Id: Delivered-To: mailing list svn@forrest.apache.org Received: (qmail 53491 invoked by uid 99); 20 Nov 2006 00:26:47 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Nov 2006 16:26:47 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Nov 2006 16:26:37 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id D6D8E1A9846; Sun, 19 Nov 2006 16:26:03 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r476993 - /forrest/trunk/whiteboard/forrest2/src/test/org/apache/forrest/test/core/TestController.java Date: Mon, 20 Nov 2006 00:26:03 -0000 To: svn@forrest.apache.org From: rgardler@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061120002603.D6D8E1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rgardler Date: Sun Nov 19 16:26:01 2006 New Revision: 476993 URL: http://svn.apache.org/viewvc?view=rev&rev=476993 Log: Fix type in interal and source requests and fix tests Modified: forrest/trunk/whiteboard/forrest2/src/test/org/apache/forrest/test/core/TestController.java Modified: forrest/trunk/whiteboard/forrest2/src/test/org/apache/forrest/test/core/TestController.java URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/src/test/org/apache/forrest/test/core/TestController.java?view=diff&rev=476993&r1=476992&r2=476993 ============================================================================== --- forrest/trunk/whiteboard/forrest2/src/test/org/apache/forrest/test/core/TestController.java (original) +++ forrest/trunk/whiteboard/forrest2/src/test/org/apache/forrest/test/core/TestController.java Sun Nov 19 16:26:01 2006 @@ -45,10 +45,13 @@ public static final String BASE_REQUEST_URI = "http://localhost:8888/xhtml/"; public static final String SOURCE_REQUEST_URI = BASE_REQUEST_URI - + "testPage.forestSource"; + + "testPage.forrestSource"; public static final String INTERNAL_REQUEST_URI = BASE_REQUEST_URI - + "testPage.forestInternal"; + + "testPage.forrestInternal"; + + public static final String VARIABLE_SUBSTITUTION_REQUEST_URI = BASE_REQUEST_URI + + "variable/sample_simple.forrestSource"; public static final String XHTML_REQUEST_URI = BASE_REQUEST_URI + "testPage.html"; @@ -131,7 +134,7 @@ .getOutputDocument(new URI(SOURCE_REQUEST_URI)); assertNotNull(output); assertTrue("Content is not as expected", output.getContentAsString() - .contains("xmlns:html=\"http://www.w3.org/2002/06/xhtml2\"")); + .contains("http://www.w3.org/2002/06/xhtml2")); } public void testForrestInternalRequest() throws ProcessingException, @@ -140,7 +143,7 @@ .getOutputDocument(new URI(INTERNAL_REQUEST_URI)); assertNotNull(output); assertTrue("Content is not as expected", output.getContentAsString() - .contains("Forrest Generated (Internal) Document")); + .contains("http://www.w3.org/2002/06/xhtml2")); } }