Author: hlship
Date: Sun May 27 19:22:15 2007
New Revision: 542081
URL: http://svn.apache.org/viewvc?view=rev&rev=542081
Log:
Move a few tests to a more appropriate package.
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterContextTest.java
- copied, changed from r541920,
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/test/pagelevel/PageTesterContextTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterSessionTest.java
- copied, changed from r541920,
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/test/pagelevel/PageTesterSessionTest.java
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/test/pagelevel/PageTesterContextTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/test/pagelevel/PageTesterSessionTest.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/CodeEqTest.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml?view=diff&rev=542081&r1=542080&r2=542081
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml Sun May 27
19:22:15 2007
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<suite name="Tapestry Core" parallel="tests" thread-count="10"
annotations="1.5" verbose="2">
+<suite name="Tapestry Core" annotations="1.5" verbose="10">
<parameter name="tapestry.integration-webapp" value="src/test/app1"/>
<test name="Integration Tests">
<packages>
@@ -26,9 +26,7 @@
<packages>
<package name="org.apache.tapestry"/>
<package name="org.apache.tapestry.integration.pagelevel"/>
- <package name="org.apache.tapestry.test.pagelevel"/>
<package name="org.apache.tapestry.corelib.components"/>
- <package name="org.apache.tapestry"/>
<package name="org.apache.tapestry.dom"/>
<package name="org.apache.tapestry.services"/>
<package name="org.apache.tapestry.util"/>
@@ -48,6 +46,7 @@
<package name="org.apache.tapestry.internal.util"/>
<package name="org.apache.tapestry.internal.bindings"/>
<package name="org.apache.tapestry.internal.model"/>
+ <package name="org.apache.tapestry.internal.test"/>
</packages>
</test>
</suite>
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/CodeEqTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/CodeEqTest.java?view=diff&rev=542081&r1=542080&r2=542081
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/CodeEqTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/CodeEqTest.java
Sun May 27 19:22:15 2007
@@ -12,61 +12,58 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.test;
-
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-/**
- *
- */
-public class CodeEqTest extends Assert
-{
- @Test(dataProvider = "stripValues")
- public void strip(String input, String expected)
- {
- assertEquals(CodeEq.strip(input), expected);
- }
-
- @DataProvider(name = "stripValues")
- public Object[][] stripValues()
- {
- return new Object[][]
- {
- { "foo", "foo" },
- { " foo\n", "foo" },
- { " foo \nbar\n\n \tbaz", "foo bar baz" },
- { "{\n bar();\n baz();\n if (gnip())\n {\n gnop();\n
}\n}\n",
- "{bar(); baz(); if (gnip()){gnop();}}" } };
- }
-
- @Test
- public void to_string()
- {
- CodeEq eq = new CodeEq("{ foo(); bar(); baz(); }");
-
- StringBuffer buffer = new StringBuffer();
-
- eq.appendTo(buffer);
-
- assertEquals(buffer.toString(), "codeEq({foo(); bar(); baz();})");
- }
-
- @Test(dataProvider = "matchValues")
- public void matches(String pattern, String parameter, boolean matches)
- {
- CodeEq ceq = new CodeEq(pattern);
-
- assertEquals(ceq.matches(parameter), matches);
- }
-
- @DataProvider(name = "matchValues")
- public Object[][] matchValues()
- {
- return new Object[][]
- {
- { "{ foo(); }", "{\n foo();\n}", true },
- { " foo();", "foo ();", false }, };
- }
-}
+package org.apache.tapestry.internal.test;
+
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class CodeEqTest extends Assert
+{
+ @Test(dataProvider = "stripValues")
+ public void strip(String input, String expected)
+ {
+ assertEquals(CodeEq.strip(input), expected);
+ }
+
+ @DataProvider(name = "stripValues")
+ public Object[][] stripValues()
+ {
+ return new Object[][]
+ {
+ { "foo", "foo" },
+ { " foo\n", "foo" },
+ { " foo \nbar\n\n \tbaz", "foo bar baz" },
+ { "{\n bar();\n baz();\n if (gnip())\n {\n gnop();\n
}\n}\n",
+ "{bar(); baz(); if (gnip()){gnop();}}" } };
+ }
+
+ @Test
+ public void to_string()
+ {
+ CodeEq eq = new CodeEq("{ foo(); bar(); baz(); }");
+
+ StringBuffer buffer = new StringBuffer();
+
+ eq.appendTo(buffer);
+
+ assertEquals(buffer.toString(), "codeEq({foo(); bar(); baz();})");
+ }
+
+ @Test(dataProvider = "matchValues")
+ public void matches(String pattern, String parameter, boolean matches)
+ {
+ CodeEq ceq = new CodeEq(pattern);
+
+ assertEquals(ceq.matches(parameter), matches);
+ }
+
+ @DataProvider(name = "matchValues")
+ public Object[][] matchValues()
+ {
+ return new Object[][]
+ {
+ { "{ foo(); }", "{\n foo();\n}", true },
+ { " foo();", "foo ();", false }, };
+ }
+}
Copied:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterContextTest.java
(from r541920,
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/test/pagelevel/PageTesterContextTest.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterContextTest.java?view=diff&rev=542081&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/test/pagelevel/PageTesterContextTest.java&r1=541920&p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterContextTest.java&r2=542081
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/test/pagelevel/PageTesterContextTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterContextTest.java
Sun May 27 19:22:15 2007
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.test.pagelevel;
+package org.apache.tapestry.internal.test;
import java.io.IOException;
import java.io.InputStream;
Copied:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterSessionTest.java
(from r541920,
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/test/pagelevel/PageTesterSessionTest.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterSessionTest.java?view=diff&rev=542081&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/test/pagelevel/PageTesterSessionTest.java&r1=541920&p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterSessionTest.java&r2=542081
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/test/pagelevel/PageTesterSessionTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/test/PageTesterSessionTest.java
Sun May 27 19:22:15 2007
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.test.pagelevel;
+package org.apache.tapestry.internal.test;
import java.util.Arrays;
import java.util.Collections;
