Use hamcrest assertions.

Author: fmeunier

src/test/java/xyz/meunier/wav2pzx/blocks/PZXPulseBlockTest.java

@@ -25,16 +25,17 @@
  */
 package xyz.meunier.wav2pzx.blocks;
 
-import java.util.Arrays;
-import java.util.Collection;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-
 import xyz.meunier.wav2pzx.PulseList;
-import xyz.meunier.wav2pzx.blocks.PZXPulseBlock;
 
-import static org.junit.Assert.*;
+import java.util.Arrays;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertThat;
 
 /**
  *
@@ -45,9 +46,6 @@ public class PZXPulseBlockTest {
     private static final PulseList PULSES = new PulseList(Arrays.asList(200L, 200L, 300L), 1, 1);
 	private PZXPulseBlock pulseBlock;
 
-    public PZXPulseBlockTest() {
-    }
-    
     @Before
     public void setUp() {
         this.pulseBlock = new PZXPulseBlock(PULSES);
@@ -63,18 +61,14 @@ public void tearDown() {
      */
     @Test
     public void testGetPulses() {
-        System.out.println("getPulses");
-        Collection<Long> expResult = Arrays.asList(200L, 200L, 300L);
-        Collection<Long> result = pulseBlock.getPulses();
-        assertEquals(expResult, result);
+        assertThat(pulseBlock.getPulses(), equalTo(Arrays.asList(200L, 200L, 300L)));
     }
 
     /**
      * Test of getPZXBlockDiskRepresentation method, of class PZXPulseBlock.
      */
     @Test
     public void testGetPZXBlockDiskRepresentation() {
-        System.out.println("getPZXBlockDiskRepresentation");
         byte[] expResult = {(byte)80, (byte)85, (byte)76, (byte)83, /* PULS */
                             (byte)0x08, (byte)0x00, (byte)0x00, (byte)0x00, /* Length: 8 bytes */
                             (byte)0x00, (byte)0x00, /* Initial pulse high */
@@ -90,7 +84,6 @@ public void testGetPZXBlockDiskRepresentation() {
 	 */
     @Test
     public void testGetPZXBlockDiskRepresentation_PulseList() {
-        System.out.println("getPZXBlockDiskRepresentation");
         byte[] expResult = {(byte)80, (byte)85, (byte)76, (byte)83, /* PULS */
                             (byte)0x08, (byte)0x00, (byte)0x00, (byte)0x00, /* Length: 8 bytes */
                             (byte)0x00, (byte)0x00, /* Initial pulse high */
@@ -106,32 +99,24 @@ public void testGetPZXBlockDiskRepresentation_PulseList() {
      */
     @Test
     public void testGetSummary() {
-        System.out.println("getSummary");
-        String expResult = "PZXPulseBlock: first pulse level: 1 pulse count: 3";
-        String result = pulseBlock.getSummary();
-        assertEquals(expResult, result);
+        assertThat(pulseBlock.getSummary(), is("PZXPulseBlock: first pulse level: 1 pulse count: 3"));
     }
 
     /**
      * Test of toString method, of class PZXPulseBlock.
      */
     @Test
     public void testToString() {
-        System.out.println("toString");
-        String expResult = "PZXPulseBlock [pulseList=PulseList [pulseLengths.size()=3, firstPulseLevel=1, resolution=1]]";
-        String result = pulseBlock.toString();
-        assertEquals(expResult, result);
+        assertThat(pulseBlock.toString(),
+                   is("PZXPulseBlock [pulseList=PulseList [pulseLengths.size()=3, firstPulseLevel=1, resolution=1]]"));
     }
 
     /**
      * Test of getFirstPulseLevel method, of class PZXPulseBlock.
      */
     @Test
     public void testGetFirstPulseLevel() {
-        System.out.println("getFirstPulseLevel");
-        int expResult = 1;
-        int result = pulseBlock.getFirstPulseLevel();
-        assertEquals(expResult, result);
+        assertThat(pulseBlock.getFirstPulseLevel(), is(1));
     }
 
 }