[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r574 - in /projects/zb4osgi/trunk/zigbee.zcl.library/src: main/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ test/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/

[scm-notify at zb4osgi.aaloa.org]

Author: stefano.lenzi
Date: Tue Oct 30 07:21:43 2012
New Revision: 574

Log:
Added test unit for ResetAlarmCommand
Using ByteArrayOutputSerializer instead of DefaultSerializer ( fixes #167 )

Added:
    projects/zb4osgi/trunk/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/
    projects/zb4osgi/trunk/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommandTest.java   (with props)
Modified:
    projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommand.java

Modified: projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommand.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommand.java (original)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommand.java Tue Oct 30 07:21:43 2012
@@ -22,10 +22,9 @@
 
 package it.cnr.isti.zigbee.zcl.library.impl.general.alarms;
 
-import it.cnr.isti.zigbee.zcl.library.api.core.ZBSerializer;
 import it.cnr.isti.zigbee.zcl.library.api.general.Alarms;
 import it.cnr.isti.zigbee.zcl.library.impl.core.AbstractCommand;
-import it.cnr.isti.zigbee.zcl.library.impl.core.DefaultSerializer;
+import it.cnr.isti.zigbee.zcl.library.impl.core.ByteArrayOutputStreamSerializer;
 /**
  * 
  * @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
@@ -46,10 +45,10 @@
 	
 	public byte[] getPayload(){	
 		if( payload == null){			
-			payload = new byte[2];
-			ZBSerializer serializer = new DefaultSerializer(payload,0);
+			ByteArrayOutputStreamSerializer serializer = new ByteArrayOutputStreamSerializer();
 			serializer.append_byte(clusterId);		
 			serializer.append_short(attributeId);		
+			payload = serializer.getPayload();
 		}
 		return payload;
 	}    

Added: projects/zb4osgi/trunk/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommandTest.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommandTest.java (added)
+++ projects/zb4osgi/trunk/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommandTest.java Tue Oct 30 07:21:43 2012
@@ -1,0 +1,18 @@
+package it.cnr.isti.zigbee.zcl.library.impl.general.alarms;
+
+import static org.junit.Assert.assertArrayEquals;
+
+import org.junit.Test;
+
+public class ResetAlarmCommandTest {
+
+	@Test
+	public void testGetPayload() {
+		ResetAlarmCommand command = new ResetAlarmCommand( (byte)0x10, (short) 0x2030);
+		assertArrayEquals(new byte[]{
+				0x10, 0x30, 0x20
+		}, command.getPayload()
+		);
+	}
+
+}

Propchange: projects/zb4osgi/trunk/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommandTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: projects/zb4osgi/trunk/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommandTest.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: projects/zb4osgi/trunk/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommandTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: projects/zb4osgi/trunk/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/alarms/ResetAlarmCommandTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain