svn commit: r557475 - in /tapestry/tapestry-test/trunk: pom.xml src/java/org/apache/tapestry/BaseComponentTestCase.java src/java/org/apache/tapestry/JettyRunner.java

[jkuhnert]

Author: jkuhnert
Date: Wed Jul 18 20:36:21 2007
New Revision: 557475

URL: http://svn.apache.org/viewvc?view=rev&rev=557475
Log:
Updated dependencies - made BrowserEvent training handle new COMPONENT_ID value.

Modified:
    tapestry/tapestry-test/trunk/pom.xml
    
tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/BaseComponentTestCase.java
    tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/JettyRunner.java

Modified: tapestry/tapestry-test/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry-test/trunk/pom.xml?view=diff&rev=557475&r1=557474&r2=557475
==============================================================================
--- tapestry/tapestry-test/trunk/pom.xml (original)
+++ tapestry/tapestry-test/trunk/pom.xml Wed Jul 18 20:36:21 2007
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>2.2</version>
+            <version>2.3</version>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>5.1</version>
+            <version>5.5</version>
             <classifier>jdk15</classifier>
             <scope>provided</scope>
             <exclusions>
@@ -116,12 +116,24 @@
             <artifactId>selenium-java-client-driver</artifactId>
             <version>0.9.2-SNAPSHOT</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>jetty</groupId>
+                    <artifactId>org.mortbay.jetty</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.openqa.selenium.server</groupId>
             <artifactId>selenium-server</artifactId>
             <version>0.9.2-SNAPSHOT</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>jetty</groupId>
+                    <artifactId>org.mortbay.jetty</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
@@ -149,7 +161,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.3</version>
                 <configuration>
                     <suiteXmlFiles>
                         <suiteXmlFile>src/test/conf/testng.xml</suiteXmlFile>

Modified: 
tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/BaseComponentTestCase.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/BaseComponentTestCase.java?view=diff&rev=557475&r1=557474&r2=557475
==============================================================================
--- 
tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/BaseComponentTestCase.java
 (original)
+++ 
tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/BaseComponentTestCase.java
 Wed Jul 18 20:36:21 2007
@@ -85,17 +85,6 @@
         assertTrue(t.getMessage().contains(msg));
     }
     
-    protected Object newInstance(Class componentClass)
-    {
-        return newInstance(componentClass, null);
-    }
-
-    protected Object newInstance(Class componentClass, String propertyName, 
Object propertyValue)
-    {
-        return getCreator().newInstance(componentClass, new Object[]
-        { propertyName, propertyValue });
-    }
-
     protected IRequestCycle newCycle()
     {
         return newMock(IRequestCycle.class);
@@ -499,12 +488,11 @@
         expect(cycle.getParameter(BrowserEvent.PAGE_Y)).andReturn("1243");
         expect(cycle.getParameter(BrowserEvent.LAYER_X)).andReturn(null);
         expect(cycle.getParameter(BrowserEvent.LAYER_Y)).andReturn(null);
+        
expect(cycle.getParameter(BrowserEvent.COMPONENT_ID)).andReturn("element");
+
+        expect(cycle.getParameter(BrowserEvent.TARGET + "." + 
BrowserEvent.TARGET_ATTR_ID)).andReturn("element1");
         
-        expect(cycle.getParameter(BrowserEvent.TARGET + "." + 
BrowserEvent.TARGET_ATTR_ID))
-        .andReturn("element1");
-        
-        expect(cycle.getParameter(BrowserEvent.METHOD_ARGUMENTS))
-                       .andReturn("[1,2]");
+        
expect(cycle.getParameter(BrowserEvent.METHOD_ARGUMENTS)).andReturn("[1,2]");
     }
     
     /**

Modified: 
tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/JettyRunner.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/JettyRunner.java?view=diff&rev=557475&r1=557474&r2=557475
==============================================================================
--- tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/JettyRunner.java 
(original)
+++ tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/JettyRunner.java 
Wed Jul 18 20:36:21 2007
@@ -89,8 +89,7 @@
             BlockingChannelConnector connector = new 
BlockingChannelConnector();
             connector.setPort(_port);
 
-            _jetty.setConnectors(new Connector[]
-            { connector });
+            _jetty.setConnectors(new Connector[] { connector });
 
             WebAppContext context = new WebAppContext();