Menu
▾
▴
openutils-svn
|
From: <fg...@us...> - 2008-05-07 12:56:01
|
Revision: 821
http://openutils.svn.sourceforge.net/openutils/?rev=821&view=rev
Author: fgiust
Date: 2008-05-07 05:56:00 -0700 (Wed, 07 May 2008)
Log Message:
-----------
test are fixed now
Modified Paths:
--------------
trunk/openutils-mgnlspring/pom.xml
trunk/openutils-mgnlspring/src/test/java/it/openutils/mgnlspring/ContentBridgeTagTest.java
Added Paths:
-----------
trunk/openutils-mgnlspring/src/test/resources/
trunk/openutils-mgnlspring/src/test/resources/log4j.dtd
trunk/openutils-mgnlspring/src/test/resources/log4j.xml
Property Changed:
----------------
trunk/openutils-mgnlspring/
Property changes on: trunk/openutils-mgnlspring
___________________________________________________________________
Name: svn:ignore
- target
.checkstyle
.classpath
.project
.settings
+ target
.checkstyle
.classpath
.project
.settings
test-output
temp-testng-customsuite.xml
Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml 2008-05-07 12:40:14 UTC (rev 820)
+++ trunk/openutils-mgnlspring/pom.xml 2008-05-07 12:56:00 UTC (rev 821)
@@ -112,6 +112,26 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<repositories>
<repository>
Modified: trunk/openutils-mgnlspring/src/test/java/it/openutils/mgnlspring/ContentBridgeTagTest.java
===================================================================
--- trunk/openutils-mgnlspring/src/test/java/it/openutils/mgnlspring/ContentBridgeTagTest.java 2008-05-07 12:40:14 UTC (rev 820)
+++ trunk/openutils-mgnlspring/src/test/java/it/openutils/mgnlspring/ContentBridgeTagTest.java 2008-05-07 12:56:00 UTC (rev 821)
@@ -1,43 +1,54 @@
-/*
- * Copyright 2007 Fabrizio Giustina.
+/**
+ * Copyright Openmind http://www.openmindonline.it
*
- * Licensed 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
package it.openutils.mgnlspring;
import info.magnolia.context.MgnlContext;
-import info.magnolia.context.SystemContextImpl;
-import it.openutils.mgnlspring.ContentBridgeTag;
-import it.openutils.mgnlspring.RewriteVarsThreadLocal;
-import it.openutils.mgnlspring.UrlFunctions;
+import info.magnolia.context.WebContextImpl;
+import org.springframework.mock.web.MockHttpServletRequest;
import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
* @author fgiust
- * @version $Id$
+ * @version $Id:ContentBridgeTagTest.java 344 2007-06-30 15:31:28Z fgiust $
*/
public class ContentBridgeTagTest
{
private ContentBridgeTag tag = new ContentBridgeTag();
+ @BeforeClass
+ public void setUp()
+ {
+ MockHttpServletRequest mockServletRequest = new MockHttpServletRequest();
+ mockServletRequest.setContextPath("context");
+ WebContextImpl webContext = new WebContextImpl();
+ webContext.init(mockServletRequest, null, null);
+ MgnlContext.setInstance(webContext);
+
+ }
+
@Test
public void testRewriteSimple()
{
- MgnlContext.setInstance(new SystemContextImpl());
String action = tag.makeUrl("", "/test/it.html", "/spring/myaction.do", "/spring/start.do");
Assert.assertEquals(action, "/spring/myaction.do"); // <!-- include this
@@ -52,7 +63,6 @@
@Test
public void testRewriteNoPath()
{
- MgnlContext.setInstance(new SystemContextImpl());
String action = tag.makeUrl("", "/test/it.html", "myaction.do", "/spring/start.do");
Assert.assertEquals(action, "/spring/myaction.do"); // <!-- include this
@@ -67,7 +77,6 @@
@Test
public void testRewriteParams()
{
- MgnlContext.setInstance(new SystemContextImpl());
String action = tag.makeUrl("", "/test/it.html", "myaction.do", "/spring/start.do");
Assert.assertEquals(action, "/spring/myaction.do"); // <!-- include this
@@ -82,7 +91,6 @@
@Test
public void testRewriteActionParams()
{
- MgnlContext.setInstance(new SystemContextImpl());
String action = tag.makeUrl("", "/mac/it/index.html", "iscrizioneEvento.do?idEvento=2", "/spring/start.do");
Assert.assertEquals(action, "/spring/iscrizioneEvento.do?idEvento=2"); // <!-- include this
Added: trunk/openutils-mgnlspring/src/test/resources/log4j.dtd
===================================================================
--- trunk/openutils-mgnlspring/src/test/resources/log4j.dtd (rev 0)
+++ trunk/openutils-mgnlspring/src/test/resources/log4j.dtd 2008-05-07 12:56:00 UTC (rev 821)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Authors: Chris Taylor, Ceki Gulcu. -->
+
+<!-- Version: 1.2 -->
+
+<!-- A configuration element consists of optional renderer
+elements,appender elements, categories and an optional root
+element. -->
+
+<!ELEMENT log4j:configuration (renderer*, appender*,(category|logger)*,root?,
+ categoryFactory?)>
+
+<!-- The "threshold" attribute takes a level value such that all -->
+<!-- logging statements with a level equal or below this value are -->
+<!-- disabled. -->
+
+<!-- Setting the "debug" enable the printing of internal log4j logging -->
+<!-- statements. -->
+
+<!-- By default, debug attribute is "null", meaning that we not do touch -->
+<!-- internal log4j logging settings. The "null" value for the threshold -->
+<!-- attribute can be misleading. The threshold field of a repository -->
+<!-- cannot be set to null. The "null" value for the threshold attribute -->
+<!-- simply means don't touch the threshold field, the threshold field -->
+<!-- keeps its old value. -->
+
+<!ATTLIST log4j:configuration
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ threshold (all|debug|info|warn|error|fatal|off|null) "null"
+ debug (true|false|null) "null"
+>
+
+<!-- renderer elements allow the user to customize the conversion of -->
+<!-- message objects to String. -->
+
+<!ELEMENT renderer EMPTY>
+<!ATTLIST renderer
+ renderedClass CDATA #REQUIRED
+ renderingClass CDATA #REQUIRED
+>
+
+<!-- Appenders must have a name and a class. -->
+<!-- Appenders may contain an error handler, a layout, optional parameters -->
+<!-- and filters. They may also reference (or include) other appenders. -->
+<!ELEMENT appender (errorHandler?, param*, layout?, filter*, appender-ref*)>
+<!ATTLIST appender
+ name ID #REQUIRED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT layout (param*)>
+<!ATTLIST layout
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT filter (param*)>
+<!ATTLIST filter
+ class CDATA #REQUIRED
+>
+
+<!-- ErrorHandlers can be of any class. They can admit any number of -->
+<!-- parameters. -->
+
+<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)>
+<!ATTLIST errorHandler
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT root-ref EMPTY>
+
+<!ELEMENT logger-ref EMPTY>
+<!ATTLIST logger-ref
+ ref IDREF #REQUIRED
+>
+
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
+
+
+<!-- The priority class is org.apache.log4j.Level by default -->
+<!ELEMENT priority (param*)>
+<!ATTLIST priority
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+<!-- The level class is org.apache.log4j.Level by default -->
+<!ELEMENT level (param*)>
+<!ATTLIST level
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named category. -->
+<!ELEMENT category (param*,(priority|level)?,appender-ref*)>
+<!ATTLIST category
+ class CDATA #IMPLIED
+ name CDATA #REQUIRED
+ additivity (true|false) "true"
+>
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named logger. -->
+<!ELEMENT logger (level?,appender-ref*)>
+<!ATTLIST logger
+ name ID #REQUIRED
+ additivity (true|false) "true"
+>
+
+
+<!ELEMENT categoryFactory (param*)>
+<!ATTLIST categoryFactory
+ class CDATA #REQUIRED>
+
+<!ELEMENT appender-ref EMPTY>
+<!ATTLIST appender-ref
+ ref IDREF #REQUIRED
+>
+
+<!-- If no priority element is specified, then the configurator MUST not -->
+<!-- touch the priority of root. -->
+<!-- The root category always exists and cannot be subclassed. -->
+<!ELEMENT root (param*, (priority|level)?, appender-ref*)>
+
+
+<!-- ==================================================================== -->
+<!-- A logging event -->
+<!-- ==================================================================== -->
+<!ELEMENT log4j:eventSet (log4j:event*)>
+<!ATTLIST log4j:eventSet
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ version (1.1|1.2) "1.2"
+ includesLocationInfo (true|false) "true"
+>
+
+
+
+<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?,
+ log4j:locationInfo?) >
+
+<!-- The timestamp format is application dependent. -->
+<!ATTLIST log4j:event
+ logger CDATA #REQUIRED
+ level CDATA #REQUIRED
+ thread CDATA #REQUIRED
+ timestamp CDATA #REQUIRED
+>
+
+<!ELEMENT log4j:message (#PCDATA)>
+<!ELEMENT log4j:NDC (#PCDATA)>
+
+<!ELEMENT log4j:throwable (#PCDATA)>
+
+<!ELEMENT log4j:locationInfo EMPTY>
+<!ATTLIST log4j:locationInfo
+ class CDATA #REQUIRED
+ method CDATA #REQUIRED
+ file CDATA #REQUIRED
+ line CDATA #REQUIRED
+>
Property changes on: trunk/openutils-mgnlspring/src/test/resources/log4j.dtd
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/openutils-mgnlspring/src/test/resources/log4j.xml
===================================================================
--- trunk/openutils-mgnlspring/src/test/resources/log4j.xml (rev 0)
+++ trunk/openutils-mgnlspring/src/test/resources/log4j.xml 2008-05-07 12:56:00 UTC (rev 821)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration>
+ <!-- log4j test configuration -->
+ <appender name="test-appender" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-5p %c.%M(%C{1}.java:%L) %m%n" />
+ </layout>
+ </appender>
+ <category name="org">
+ <priority value="WARN" />
+ </category>
+ <category name="com">
+ <priority value="WARN" />
+ </category>
+ <category name="net">
+ <priority value="WARN" />
+ </category>
+ <category name="info">
+ <priority value="WARN" />
+ </category>
+ <category name="it">
+ <priority value="WARN" />
+ </category>
+ <root>
+ <priority value="debug" />
+ <appender-ref ref="test-appender" />
+ </root>
+</log4j:configuration>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlspring/src/test/resources/log4j.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X