[jboss-cvs] JBoss Messaging SVN: r4490 - in trunk/tests/src/org/jboss/messaging/tests/unit/core: util and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2008-06-16 19:31:20 -0400 (Mon, 16 Jun 2008)
New Revision: 4490

Modified:
   trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/util/TypedPropertiesTest.java
Log:
The test on MessageTest is not necessary any more, after the creation of TypedPropertiesTest

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageTest.java	2008-06-16 23:23:34 UTC (rev 4489)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageTest.java	2008-06-16 23:31:20 UTC (rev 4490)
@@ -37,7 +37,6 @@
 import org.jboss.messaging.tests.util.UnitTestCase;
 import org.jboss.messaging.util.ByteBufferWrapper;
 import org.jboss.messaging.util.SimpleString;
-import org.jboss.messaging.util.TypedProperties;
 
 /**
  * 
@@ -253,29 +252,6 @@
       assertEquals(1, messageDurable.getDurableRefCount());                 
    }
 
-   public void testEncodingMessageProperties()
-   {
-
-      TypedProperties properties = new TypedProperties();
-      properties.putStringProperty(new SimpleString("str"), new SimpleString("Str2"));
-      properties.putStringProperty(new SimpleString("str2"), new SimpleString("Str2"));
-      properties.putBooleanProperty(new SimpleString("str3"), true );
-      properties.putByteProperty(new SimpleString("str4"), (byte)1);
-      properties.putBytesProperty(new SimpleString("str5"), new byte[]{1,2,3,4,5});
-      properties.putShortProperty(new SimpleString("str6"),(short)1);
-      properties.putIntProperty(new SimpleString("str7"), (int)1);
-      properties.putLongProperty(new SimpleString("str8"), (long)1);
-      properties.putFloatProperty(new SimpleString("str9"),(float) 1);
-      properties.putDoubleProperty(new SimpleString("str10"), (double) 1);
-      properties.putCharProperty(new SimpleString("str11"), 'a');
-      
-      checkSizes(properties, new TypedProperties());
-      
-      properties.removeProperty(new SimpleString("str"));
-      checkSizes(properties, new TypedProperties());
-      
-   }
-
    public void testEncodingMessage() throws Exception
    {
       byte[] bytes = new byte[]{(byte)1, (byte)2, (byte)3};

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/util/TypedPropertiesTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/util/TypedPropertiesTest.java	2008-06-16 23:23:34 UTC (rev 4489)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/util/TypedPropertiesTest.java	2008-06-16 23:31:20 UTC (rev 4490)
@@ -231,6 +231,8 @@
       props.putCharProperty(randomSimpleString(), randomChar());
       props.putStringProperty(randomSimpleString(), randomSimpleString());
       props.putStringProperty(randomSimpleString(), null);
+      SimpleString keyToRemove = randomSimpleString();
+      props.putStringProperty(keyToRemove, randomSimpleString());
 
       MessagingBuffer buffer = new IoBufferWrapper(1024);
       props.encode(buffer);
@@ -243,6 +245,14 @@
       decodedProps.decode(buffer);
 
       assertEqualsTypeProperties(props, decodedProps);
+      
+      buffer.flip();
+      
+      // After removing a property, you should still be able to encode the Property
+      props.removeProperty(keyToRemove);
+      props.encode(buffer);
+      
+      assertEquals(props.getEncodeSize(), buffer.position());
    }
    
    public void testEncodeDecodeEmpty() throws Exception
@@ -251,6 +261,8 @@
 
       MessagingBuffer buffer = new IoBufferWrapper(1024);
       emptyProps.encode(buffer);
+      
+      assertEquals(props.getEncodeSize(), buffer.position());
 
       buffer.flip();