You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2009/12/18 19:16:02 UTC
svn commit: r892333 - in /tapestry/tapestry5/trunk:
tapestry-core/src/test/conf/
tapestry-core/src/test/java/org/apache/tapestry5/
tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/
tapestry-core/src/test/java/org/apache/tapestry5/int...
Author: hlship
Date: Fri Dec 18 18:16:00 2009
New Revision: 892333
URL: http://svn.apache.org/viewvc?rev=892333&view=rev
Log:
Work around a TestNG bug by moving test cases to a sub-package of org.apache.tapestry5.
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/ContentTypeTest.java (contents, props changed)
- copied, changed from r892332, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/ContentTypeTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/FieldComponent.java (contents, props changed)
- copied, changed from r892332, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/FieldComponent.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/MarkupUtilsTest.java (contents, props changed)
- copied, changed from r892332, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/MarkupUtilsTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/Stooge.java (contents, props changed)
- copied, changed from r892332, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/Stooge.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/ValidationTrackerImplTest.java (contents, props changed)
- copied, changed from r892332, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/ValidationTrackerImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/VersionUtilsTest.java (contents, props changed)
- copied, changed from r892332, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/VersionUtilsTest.java
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/ContentTypeTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/FieldComponent.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/MarkupUtilsTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/Stooge.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/ValidationTrackerImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/VersionUtilsTest.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactoryTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/util/EnumSelectModelTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/util/StringToEnumCoercionTest.java
tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumLauncher.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?rev=892333&r1=892332&r2=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml Fri Dec 18 18:16:00 2009
@@ -24,7 +24,7 @@
</test>
<test name="Public APIs" enabled="true">
<packages>
- <package name="org.apache.tapestry5"/>
+ <package name="org.apache.tapestry5.root"/>
<package name="org.apache.tapestry5.dom"/>
<package name="org.apache.tapestry5.json"/>
<package name="org.apache.tapestry5.runtime"/>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java?rev=892333&r1=892332&r2=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java Fri Dec 18 18:16:00 2009
@@ -14,13 +14,23 @@
package org.apache.tapestry5.integration.reload;
-import javassist.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtMethod;
+import javassist.NotFoundException;
+
import org.apache.tapestry5.internal.TapestryInternalUtils;
import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
import org.testng.annotations.Test;
-import java.io.*;
-
/**
* Integration tests designed to test Tapestry's ability to dynamically reload component classes,
* templates and message
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactoryTest.java?rev=892333&r1=892332&r2=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactoryTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactoryTest.java Fri Dec 18 18:16:00 2009
@@ -16,13 +16,13 @@
import org.apache.tapestry5.Binding;
import org.apache.tapestry5.ComponentResources;
-import org.apache.tapestry5.FieldComponent;
import org.apache.tapestry5.FieldValidator;
import org.apache.tapestry5.internal.services.StringInterner;
import org.apache.tapestry5.internal.services.StringInternerImpl;
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.apache.tapestry5.ioc.Location;
import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.root.FieldComponent;
import org.apache.tapestry5.runtime.Component;
import org.apache.tapestry5.services.BindingFactory;
import org.apache.tapestry5.services.FieldValidatorSource;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImplTest.java?rev=892333&r1=892332&r2=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImplTest.java Fri Dec 18 18:16:00 2009
@@ -18,6 +18,7 @@
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.apache.tapestry5.ioc.MessageFormatter;
import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.root.FieldComponent;
import org.apache.tapestry5.services.FieldTranslatorSource;
import org.apache.tapestry5.services.FormSupport;
import org.apache.tapestry5.services.TranslatorSource;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java?rev=892333&r1=892332&r2=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java Fri Dec 18 18:16:00 2009
@@ -34,6 +34,7 @@
import org.apache.tapestry5.model.ComponentModel;
import org.apache.tapestry5.model.EmbeddedComponentModel;
import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.root.FieldComponent;
import org.apache.tapestry5.runtime.Component;
import org.apache.tapestry5.runtime.RenderCommand;
import org.apache.tapestry5.runtime.RenderQueue;
Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/ContentTypeTest.java (from r892332, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/ContentTypeTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/ContentTypeTest.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/ContentTypeTest.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/ContentTypeTest.java&r1=892332&r2=892333&rev=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/ContentTypeTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/ContentTypeTest.java Fri Dec 18 18:16:00 2009
@@ -12,8 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry5;
+package org.apache.tapestry5.root;
+import org.apache.tapestry5.ContentType;
import org.testng.Assert;
import org.testng.annotations.Test;
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/ContentTypeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/FieldComponent.java (from r892332, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/FieldComponent.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/FieldComponent.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/FieldComponent.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/FieldComponent.java&r1=892332&r2=892333&rev=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/FieldComponent.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/FieldComponent.java Fri Dec 18 18:16:00 2009
@@ -12,8 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry5;
+package org.apache.tapestry5.root;
+import org.apache.tapestry5.Field;
import org.apache.tapestry5.runtime.Component;
/**
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/FieldComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/MarkupUtilsTest.java (from r892332, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/MarkupUtilsTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/MarkupUtilsTest.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/MarkupUtilsTest.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/MarkupUtilsTest.java&r1=892332&r2=892333&rev=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/MarkupUtilsTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/MarkupUtilsTest.java Fri Dec 18 18:16:00 2009
@@ -12,8 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry5;
+package org.apache.tapestry5.root;
+import org.apache.tapestry5.MarkupUtils;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/MarkupUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/Stooge.java (from r892332, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/Stooge.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/Stooge.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/Stooge.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/Stooge.java&r1=892332&r2=892333&rev=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/Stooge.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/Stooge.java Fri Dec 18 18:16:00 2009
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry5;
+package org.apache.tapestry5.root;
public enum Stooge
{
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/Stooge.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/ValidationTrackerImplTest.java (from r892332, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/ValidationTrackerImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/ValidationTrackerImplTest.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/ValidationTrackerImplTest.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/ValidationTrackerImplTest.java&r1=892332&r2=892333&rev=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/ValidationTrackerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/ValidationTrackerImplTest.java Fri Dec 18 18:16:00 2009
@@ -12,8 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry5;
+package org.apache.tapestry5.root;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.ValidationTracker;
+import org.apache.tapestry5.ValidationTrackerImpl;
import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/ValidationTrackerImplTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/VersionUtilsTest.java (from r892332, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/VersionUtilsTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/VersionUtilsTest.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/VersionUtilsTest.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/VersionUtilsTest.java&r1=892332&r2=892333&rev=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/VersionUtilsTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/VersionUtilsTest.java Fri Dec 18 18:16:00 2009
@@ -1,5 +1,6 @@
-package org.apache.tapestry5;
+package org.apache.tapestry5.root;
+import org.apache.tapestry5.VersionUtils;
import org.testng.Assert;
import org.testng.annotations.Test;
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/root/VersionUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/util/EnumSelectModelTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/util/EnumSelectModelTest.java?rev=892333&r1=892332&r2=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/util/EnumSelectModelTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/util/EnumSelectModelTest.java Fri Dec 18 18:16:00 2009
@@ -16,8 +16,8 @@
import org.apache.tapestry5.OptionModel;
import org.apache.tapestry5.SelectModel;
-import org.apache.tapestry5.Stooge;
import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.root.Stooge;
import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/util/StringToEnumCoercionTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/util/StringToEnumCoercionTest.java?rev=892333&r1=892332&r2=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/util/StringToEnumCoercionTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/util/StringToEnumCoercionTest.java Fri Dec 18 18:16:00 2009
@@ -15,7 +15,8 @@
package org.apache.tapestry5.util;
import junit.framework.AssertionFailedError;
-import org.apache.tapestry5.Stooge;
+
+import org.apache.tapestry5.root.Stooge;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -52,7 +53,7 @@
{
assertEquals(
ex.getMessage(),
- "Input \'shemp\' does not identify a value from enumerated type org.apache.tapestry5.Stooge. Available values: CURLY_JOE, LARRY, MOE.");
+ "Input \'shemp\' does not identify a value from enumerated type org.apache.tapestry5.root.Stooge. Available values: CURLY_JOE, LARRY, MOE.");
}
}
}
Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumLauncher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumLauncher.java?rev=892333&r1=892332&r2=892333&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumLauncher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumLauncher.java Fri Dec 18 18:16:00 2009
@@ -97,7 +97,7 @@
* <tr>
* <td>port</td>
* <td>tapestry.port</td>
- * <td>9999</td>
+ * <td>9090</td>
* <td>Port number for web server to listen to</td>
* </tr>
* <tr>
@@ -131,7 +131,7 @@
@Optional("")
String contextPath,
- @Optional("9999")
+ @Optional("9090")
int port,
@Optional("*firefox")