Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1672] trunk/openutils-testing4web
|
From: <fg...@us...> - 2010-01-18 17:09:07
|
Revision: 1672
http://openutils.svn.sourceforge.net/openutils/?rev=1672&view=rev
Author: fgiust
Date: 2010-01-18 17:08:51 +0000 (Mon, 18 Jan 2010)
Log Message:
-----------
ready for a first release
Modified Paths:
--------------
trunk/openutils-testing4web/pom.xml
trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspEmbeddedTest.java
trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspTestngEmbeddedTest.java
trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleEL.java
Added Paths:
-----------
trunk/openutils-testing4web/src/main/assembly/
trunk/openutils-testing4web/src/main/assembly/assembly-bundle.xml
trunk/openutils-testing4web/src/main/bundle/
trunk/openutils-testing4web/src/main/bundle/LICENSE.txt
trunk/openutils-testing4web/src/main/bundle/README.txt
trunk/openutils-testing4web/src/main/etc/
trunk/openutils-testing4web/src/main/etc/header.txt
trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspJunitEmbeddedTest.java
trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleJunitServletUnitTest.java
trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleTestNgServletUnitTest.java
trunk/openutils-testing4web/src/test/resources/jsps/withtaglib.txt
Removed Paths:
-------------
trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleServletUnitTest.java
Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml 2010-01-18 16:23:33 UTC (rev 1671)
+++ trunk/openutils-testing4web/pom.xml 2010-01-18 17:08:51 UTC (rev 1672)
@@ -7,9 +7,67 @@
<version>1.1</version>
</parent>
<artifactId>openutils-testing4web</artifactId>
- <name>openutils web test utils</name>
+ <name>Openutils web test utils</name>
<version>1.1-SNAPSHOT</version>
- <description>openutils test utils for webapps</description>
+ <inceptionYear>2008</inceptionYear>
+ <description>A simple infrastructure to build unit tests using ServletUnit, with all the needed Maven dependencies
+ already set up</description>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <url>http://www.openmindlab.com/lab/products/testing4web.html</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.openmindlab.com/browse/TESTINGWEB</url>
+ </issueManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/assembly-bundle.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.mycila.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <version>1.5.0</version>
+ <configuration>
+ <header>src/main/etc/header.txt</header>
+ <includes>
+ <include>src/**/*.java</include>
+ </includes>
+ <properties>
+ <year>${project.inceptionYear}-2010</year>
+ <name>${project.name}</name>
+ <description>${project.description}</description>
+ <url>${project.url}</url>
+ </properties>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>httpunit</groupId>
@@ -45,7 +103,7 @@
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler-jdt</artifactId>
- <version>5.5.12</version>
+ <version>${tomcat.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -55,8 +113,8 @@
</dependency>
<dependency>
<groupId>tomcat</groupId>
- <artifactId>naming-resources</artifactId>
- <version>5.5.15</version>
+ <artifactId>jasper-runtime</artifactId>
+ <version>${tomcat.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -66,8 +124,8 @@
</dependency>
<dependency>
<groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>5.5.12</version>
+ <artifactId>jasper-compiler</artifactId>
+ <version>${tomcat.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -77,8 +135,8 @@
</dependency>
<dependency>
<groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>5.5.12</version>
+ <artifactId>naming-resources</artifactId>
+ <version>${tomcat.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -89,7 +147,7 @@
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-factory</artifactId>
- <version>5.5.15</version>
+ <version>${tomcat.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -157,10 +215,23 @@
<version>1.5.6</version>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.5.6</version>
<scope>test</scope>
</dependency>
</dependencies>
+ <properties>
+ <tomcat.version>5.5.23</tomcat.version>
+ </properties>
</project>
\ No newline at end of file
Added: trunk/openutils-testing4web/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-testing4web/src/main/assembly/assembly-bundle.xml (rev 0)
+++ trunk/openutils-testing4web/src/main/assembly/assembly-bundle.xml 2010-01-18 17:08:51 UTC (rev 1672)
@@ -0,0 +1,34 @@
+<assembly>
+ <id>bundle</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <filtered>true</filtered>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>crlf</lineEnding>
+ <directory>${basedir}/src/main/bundle</directory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>/sources/</outputDirectory>
+ <includes>
+ <include>src/**/*</include>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>net.sourceforge.openutils:*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/openutils-testing4web/src/main/assembly/assembly-bundle.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-testing4web/src/main/bundle/LICENSE.txt
===================================================================
--- trunk/openutils-testing4web/src/main/bundle/LICENSE.txt (rev 0)
+++ trunk/openutils-testing4web/src/main/bundle/LICENSE.txt 2010-01-18 17:08:51 UTC (rev 1672)
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ 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.
Property changes on: trunk/openutils-testing4web/src/main/bundle/LICENSE.txt
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-testing4web/src/main/bundle/README.txt
===================================================================
--- trunk/openutils-testing4web/src/main/bundle/README.txt (rev 0)
+++ trunk/openutils-testing4web/src/main/bundle/README.txt 2010-01-18 17:08:51 UTC (rev 1672)
@@ -0,0 +1,53 @@
+===========================================================
+
+${pom.name} ${pom.version}
+by ${pom.organization.name}
+
+===========================================================
+
+${pom.description}
+
+More information about this project can be found at:
+${pom.url}
+
+Change log and known issues can be found at:
+${pom.issueManagement.url}
+
+Source is available from the subversion repository at:
+${pom.scm.url}
+
+=========================================
+ USAGE
+=========================================
+
+The preferred way to add ${pom.name} to your project is using maven.
+You can declare the following dependency in your pom.xml:
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>${pom.artifactId}</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+Alternatively, you can add the ${pom.artifactId} plus the required dependencies
+manually to the classpath of your application.
+
+
+=========================================
+ LICENSE
+=========================================
+
+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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+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.
+
Property changes on: trunk/openutils-testing4web/src/main/bundle/README.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-testing4web/src/main/etc/header.txt
===================================================================
--- trunk/openutils-testing4web/src/main/etc/header.txt (rev 0)
+++ trunk/openutils-testing4web/src/main/etc/header.txt 2010-01-18 17:08:51 UTC (rev 1672)
@@ -0,0 +1,15 @@
+
+${name} (${url})
+Copyright(C) ${year}, Openmind S.r.l. 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ 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.
\ No newline at end of file
Property changes on: trunk/openutils-testing4web/src/main/etc/header.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspEmbeddedTest.java
===================================================================
--- trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspEmbeddedTest.java 2010-01-18 16:23:33 UTC (rev 1671)
+++ trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspEmbeddedTest.java 2010-01-18 17:08:51 UTC (rev 1672)
@@ -1,19 +1,44 @@
+/**
+ *
+ * Openutils web test utils (http://www.openmindlab.com/lab/products/testing4web.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
package net.sourceforge.openutils.testing4web;
import java.io.File;
+import java.io.InputStream;
import java.net.URL;
import java.net.URLDecoder;
import java.util.Hashtable;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.meterware.httpunit.GetMethodWebRequest;
import com.meterware.httpunit.HttpUnitOptions;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
import com.meterware.servletunit.ServletRunner;
/**
- * Base TestCase class for jsp tests.
+ * Base TestCase class for jsp/web tests. Developers should not use this class directly, but extends the junit or Testng
+ * implementation, according to their preferences.
* @author fgiust
*/
public abstract class BaseJspEmbeddedTest
@@ -72,4 +97,28 @@
runner.shutDown();
}
+ protected void checkGetWithExpectedTxt(String jspname) throws Exception
+ {
+ WebRequest request = new GetMethodWebRequest(getJspUrl(jspname));
+
+ WebResponse response = runner.getResponse(request);
+
+ if (log.isDebugEnabled())
+ {
+ log.debug("RESPONSE: " + response.getText());
+ }
+
+ String responseText = response.getText();
+
+ String expectedFileName = StringUtils.substringBeforeLast(jspname, ".") + ".txt";
+
+ InputStream stream = getClass().getResourceAsStream("/jsps/" + expectedFileName);
+ String expected = IOUtils.toString(stream);
+ IOUtils.closeQuietly(stream);
+
+ assertEquals(responseText, expected);
+ }
+
+ protected abstract void assertEquals(String expected, String actual);
+
}
\ No newline at end of file
Added: trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspJunitEmbeddedTest.java
===================================================================
--- trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspJunitEmbeddedTest.java (rev 0)
+++ trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspJunitEmbeddedTest.java 2010-01-18 17:08:51 UTC (rev 1672)
@@ -0,0 +1,62 @@
+/**
+ *
+ * Openutils web test utils (http://www.openmindlab.com/lab/products/testing4web.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
+package net.sourceforge.openutils.testing4web;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public abstract class BaseJspJunitEmbeddedTest extends BaseJspEmbeddedTest
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @Before
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @After
+ public void tearDown() throws Exception
+ {
+ super.tearDown();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void assertEquals(String expected, String actual)
+ {
+ Assert.assertEquals(expected, actual);
+ }
+
+}
Property changes on: trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspJunitEmbeddedTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspTestngEmbeddedTest.java
===================================================================
--- trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspTestngEmbeddedTest.java 2010-01-18 16:23:33 UTC (rev 1671)
+++ trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/BaseJspTestngEmbeddedTest.java 2010-01-18 17:08:51 UTC (rev 1672)
@@ -1,5 +1,24 @@
+/**
+ *
+ * Openutils web test utils (http://www.openmindlab.com/lab/products/testing4web.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
package net.sourceforge.openutils.testing4web;
+import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -31,4 +50,13 @@
super.tearDown();
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void assertEquals(String expected, String actual)
+ {
+ Assert.assertEquals(actual, expected);
+ }
+
}
Modified: trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleEL.java
===================================================================
--- trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleEL.java 2010-01-18 16:23:33 UTC (rev 1671)
+++ trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleEL.java 2010-01-18 17:08:51 UTC (rev 1672)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Openutils web test utils (http://www.openmindlab.com/lab/products/testing4web.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
package net.sourceforge.openutils.testing4web;
/**
Added: trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleJunitServletUnitTest.java
===================================================================
--- trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleJunitServletUnitTest.java (rev 0)
+++ trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleJunitServletUnitTest.java 2010-01-18 17:08:51 UTC (rev 1672)
@@ -0,0 +1,62 @@
+/**
+ *
+ * Openutils web test utils (http://www.openmindlab.com/lab/products/testing4web.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
+package net.sourceforge.openutils.testing4web;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class SampleJunitServletUnitTest extends BaseJspJunitEmbeddedTest
+{
+
+ @Test
+ public void simpleTest() throws Exception
+ {
+ WebRequest request = new GetMethodWebRequest(getJspUrl("simple.jsp"));
+ WebResponse response = runner.getResponse(request);
+
+ String responseText = response.getText();
+ Assert.assertEquals(responseText, "jsp output");
+ }
+
+ @Test
+ public void withtaglibTest() throws Exception
+ {
+ WebRequest request = new GetMethodWebRequest(getJspUrl("withtaglib.jsp"));
+ WebResponse response = runner.getResponse(request);
+
+ String responseText = response.getText();
+ Assert.assertEquals(responseText, "EL working");
+ }
+
+ @Test
+ public void txtTest() throws Exception
+ {
+ checkGetWithExpectedTxt("withtaglib.jsp");
+ }
+}
Property changes on: trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleJunitServletUnitTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Deleted: trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleServletUnitTest.java
===================================================================
--- trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleServletUnitTest.java 2010-01-18 16:23:33 UTC (rev 1671)
+++ trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleServletUnitTest.java 2010-01-18 17:08:51 UTC (rev 1672)
@@ -1,37 +0,0 @@
-package net.sourceforge.openutils.testing4web;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import com.meterware.httpunit.GetMethodWebRequest;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-public class SampleServletUnitTest extends BaseJspTestngEmbeddedTest
-{
-
- @Test
- public void simpleTest() throws Exception
- {
- WebRequest request = new GetMethodWebRequest(getJspUrl("simple.jsp"));
- WebResponse response = runner.getResponse(request);
-
- String responseText = response.getText();
- Assert.assertEquals(responseText, "jsp output");
- }
-
- @Test
- public void withtaglibTest() throws Exception
- {
- WebRequest request = new GetMethodWebRequest(getJspUrl("withtaglib.jsp"));
- WebResponse response = runner.getResponse(request);
-
- String responseText = response.getText();
- Assert.assertEquals(responseText, "EL working");
- }
-}
Copied: trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleTestNgServletUnitTest.java (from rev 1663, trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleServletUnitTest.java)
===================================================================
--- trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleTestNgServletUnitTest.java (rev 0)
+++ trunk/openutils-testing4web/src/test/java/net/sourceforge/openutils/testing4web/SampleTestNgServletUnitTest.java 2010-01-18 17:08:51 UTC (rev 1672)
@@ -0,0 +1,61 @@
+/**
+ *
+ * Openutils web test utils (http://www.openmindlab.com/lab/products/testing4web.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
+package net.sourceforge.openutils.testing4web;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class SampleTestNgServletUnitTest extends BaseJspTestngEmbeddedTest
+{
+
+ @Test
+ public void simpleTest() throws Exception
+ {
+ WebRequest request = new GetMethodWebRequest(getJspUrl("simple.jsp"));
+ WebResponse response = runner.getResponse(request);
+
+ String responseText = response.getText();
+ Assert.assertEquals(responseText, "jsp output");
+ }
+
+ @Test
+ public void withtaglibTest() throws Exception
+ {
+ WebRequest request = new GetMethodWebRequest(getJspUrl("withtaglib.jsp"));
+ WebResponse response = runner.getResponse(request);
+
+ String responseText = response.getText();
+ Assert.assertEquals(responseText, "EL working");
+ }
+
+ @Test
+ public void txtTest() throws Exception
+ {
+ checkGetWithExpectedTxt("withtaglib.jsp");
+ }
+}
Added: trunk/openutils-testing4web/src/test/resources/jsps/withtaglib.txt
===================================================================
--- trunk/openutils-testing4web/src/test/resources/jsps/withtaglib.txt (rev 0)
+++ trunk/openutils-testing4web/src/test/resources/jsps/withtaglib.txt 2010-01-18 17:08:51 UTC (rev 1672)
@@ -0,0 +1 @@
+EL working
\ No newline at end of file
Property changes on: trunk/openutils-testing4web/src/test/resources/jsps/withtaglib.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
