Work around a TestNG bug by moving test cases to a sub-package of org.apache.tapestry5.

git-svn-id: https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk@892333 13f79535-47bb-0310-9956-ffa450edef68

Author: Howard Lewis Ship

tapestry-core/src/test/conf/testng.xml

@@ -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"/>

tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java

@@ -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

tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactoryTest.java

@@ -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;

tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldTranslatorSourceImplTest.java

@@ -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;

tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java

@@ -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;

tapestry-core/src/test/java/org/apache/tapestry5/ContentTypeTest.java renamed to tapestry-core/src/test/java/org/apache/tapestry5/root/ContentTypeTest.java

@@ -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;
 

tapestry-core/src/test/java/org/apache/tapestry5/FieldComponent.java renamed to tapestry-core/src/test/java/org/apache/tapestry5/root/FieldComponent.java

@@ -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;
 
 /**

tapestry-core/src/test/java/org/apache/tapestry5/MarkupUtilsTest.java renamed to tapestry-core/src/test/java/org/apache/tapestry5/root/MarkupUtilsTest.java

@@ -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;

tapestry-core/src/test/java/org/apache/tapestry5/Stooge.java renamed to tapestry-core/src/test/java/org/apache/tapestry5/root/Stooge.java

@@ -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
 {

tapestry-core/src/test/java/org/apache/tapestry5/ValidationTrackerImplTest.java renamed to tapestry-core/src/test/java/org/apache/tapestry5/root/ValidationTrackerImplTest.java

@@ -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;
 

tapestry-core/src/test/java/org/apache/tapestry5/VersionUtilsTest.java renamed to tapestry-core/src/test/java/org/apache/tapestry5/root/VersionUtilsTest.java

@@ -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;
 

tapestry-core/src/test/java/org/apache/tapestry5/util/EnumSelectModelTest.java

@@ -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;
 

tapestry-core/src/test/java/org/apache/tapestry5/util/StringToEnumCoercionTest.java

@@ -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 @@ public void value_not_found()
         {
             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.");
         }
     }
 }

tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumLauncher.java

@@ -97,7 +97,7 @@ public class SeleniumLauncher
      * <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 @@ public synchronized void startup(
     @Optional("")
     String contextPath,
 
-    @Optional("9999")
+    @Optional("9090")
     int port,
 
     @Optional("*firefox")