[jboss-cvs] JBoss Messaging SVN: r4805 - in trunk: tests/src/org/jboss/messaging/tests/unit/core/management and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: trustin
Date: 2008-08-18 00:39:29 -0400 (Mon, 18 Aug 2008)
New Revision: 4805

Modified:
   trunk/.classpath
   trunk/build-thirdparty.xml
   trunk/tests/src/org/jboss/messaging/tests/unit/core/management/MessageInfoTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/JMSMessageInfoTest.java
Log:
* Added Netty 3.0.0.CR1 to the classpath
* Fixed compilation errors in JDK 1.6



Modified: trunk/.classpath
===================================================================
--- trunk/.classpath	2008-08-14 21:55:49 UTC (rev 4804)
+++ trunk/.classpath	2008-08-18 04:39:29 UTC (rev 4805)
@@ -63,5 +63,6 @@
 	<classpathentry kind="lib" path="thirdparty/cglib/lib/cglib.jar"/>
 	<classpathentry kind="lib" path="tests/tmpfiles"/>
 	<classpathentry kind="lib" path="thirdparty/apache-mina/lib/mina-core-2.0.0-M3-20080730.120633-1.jar" sourcepath="thirdparty/apache-mina/lib/mina-core-2.0.0-M3-20080730.120633-1-sources.jar"/>
+	<classpathentry kind="lib" path="thirdparty/netty/lib/netty-3.0.0.CR1.jar" sourcepath="thirdparty/netty/lib/netty-3.0.0.CR1-sources.jar"/>
 	<classpathentry kind="output" path="eclipse-output"/>
 </classpath>

Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml	2008-08-14 21:55:49 UTC (rev 4804)
+++ trunk/build-thirdparty.xml	2008-08-18 04:39:29 UTC (rev 4805)
@@ -98,6 +98,7 @@
       <componentref name="jboss/jbosssx-client" version="2.0.1.GA"/>
       <componentref name="jboss/jboss-javaee" version="5.0.0.Beta3"/>
       <componentref name="jboss/jboss-common-logging-spi" version="2.0.4.GA"/>
+      <componentref name="netty" version="3.0.0.CR1"/>
       <componentref name="apache-mina" version="2.0.0-M3-20080730.120633-1"/>
       <componentref name="slf4j/log4j" version="1.4.3"/>
       <componentref name="jpa-api" version="1.0.0.GA"/>

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/MessageInfoTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/MessageInfoTest.java	2008-08-14 21:55:49 UTC (rev 4804)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/MessageInfoTest.java	2008-08-18 04:39:29 UTC (rev 4805)
@@ -22,11 +22,7 @@
 
 package org.jboss.messaging.tests.unit.core.management;
 
-import static org.jboss.messaging.tests.util.RandomUtil.randomBoolean;
-import static org.jboss.messaging.tests.util.RandomUtil.randomByte;
-import static org.jboss.messaging.tests.util.RandomUtil.randomInt;
-import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
+import static org.jboss.messaging.tests.util.RandomUtil.*;
 
 import java.util.Collection;
 
@@ -39,9 +35,9 @@
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
+ *
  * @version <tt>$Revision$</tt>
- * 
+ *
  */
 public class MessageInfoTest extends TestCase
 {
@@ -64,15 +60,16 @@
       assertEquals(expected.getPriority(), actual.get("priority"));
       assertEquals(expected.isExpired(), actual.get("expired"));
       assertEquals(expected.getExpiration(), actual.get("expiration"));
-      
+
       TabularData propsDatas = (TabularData) actual.get("properties");
-      Collection<CompositeData> props = propsDatas.values();
+      Collection<CompositeData> props =
+         (Collection<CompositeData>) propsDatas.values();
       assertEquals(expected.getProperties().size(), props.size());
       for (CompositeData prop : props)
       {
          String actualKey = (String) prop.get("key");
          String actualValue = (String) prop.get("value");
-         
+
          assertTrue(expected.getProperties().containsKey(actualKey));
          assertEquals(expected.getProperties().get(actualKey), actualValue);
       }

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/JMSMessageInfoTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/JMSMessageInfoTest.java	2008-08-14 21:55:49 UTC (rev 4804)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/JMSMessageInfoTest.java	2008-08-18 04:39:29 UTC (rev 4805)
@@ -22,16 +22,8 @@
 
 package org.jboss.messaging.tests.unit.jms.server.management;
 
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.jboss.messaging.tests.util.RandomUtil.randomBoolean;
-import static org.jboss.messaging.tests.util.RandomUtil.randomByte;
-import static org.jboss.messaging.tests.util.RandomUtil.randomInt;
-import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
-import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
+import static org.easymock.EasyMock.*;
+import static org.jboss.messaging.tests.util.RandomUtil.*;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -48,9 +40,9 @@
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
+ *
  * @version <tt>$Revision$</tt>
- * 
+ *
  */
 public class JMSMessageInfoTest extends TestCase
 {
@@ -76,7 +68,8 @@
       assertEquals(expected.getExpiration(), actual.get("expiration"));
 
       TabularData propsDatas = (TabularData) actual.get("properties");
-      Collection<CompositeData> props = propsDatas.values();
+      Collection<CompositeData> props =
+         (Collection<CompositeData>) propsDatas.values();
       assertEquals(expected.getProperties().size(), props.size());
       for (CompositeData prop : props)
       {
@@ -132,7 +125,7 @@
       TabularData data = JMSMessageInfo.toTabularData(new JMSMessageInfo[0]);
       assertEquals(0, data.size());
    }
-   
+
    public void testFromServerMessage() throws Exception
    {
       ServerMessage message = createMock(ServerMessage.class);
@@ -148,12 +141,12 @@
       propNames.add(new SimpleString("foo"));
       expect(message.getPropertyNames()).andStubReturn(propNames);
       expect(message.getProperty(new SimpleString("foo"))).andStubReturn(randomSimpleString());
-      
+
       replay(message);
       JMSMessageInfo info = JMSMessageInfo.fromServerMessage(message );
-      
+
       verify(message);
-      
+
    }