Browse Source

switch from assertEquals to assertThat to avoid autoboxing/unboxing bugs when testing equality for Integers

vivshaw 9 years ago
parent
commit
919164028e
1 changed files with 21 additions and 20 deletions
  1. 21
    20
      exercises/circular-buffer/src/test/java/CircularBufferTest.java

+ 21
- 20
exercises/circular-buffer/src/test/java/CircularBufferTest.java View File

1
-import static org.junit.Assert.assertEquals;
1
+import static org.junit.Assert.assertThat;
2
+import static org.hamcrest.CoreMatchers.is;
2
 
3
 
3
 import org.junit.Ignore;
4
 import org.junit.Ignore;
4
 import org.junit.Rule;
5
 import org.junit.Rule;
25
         CircularBuffer<Integer> buffer = new CircularBuffer<>(1);
26
         CircularBuffer<Integer> buffer = new CircularBuffer<>(1);
26
 
27
 
27
         buffer.write(1);
28
         buffer.write(1);
28
-        assertEquals((int) buffer.read(), 1);
29
+        assertThat(buffer.read(), is(1));
29
     }
30
     }
30
 
31
 
31
     @Ignore("Remove to run test")
32
     @Ignore("Remove to run test")
34
         CircularBuffer<Integer> buffer = new CircularBuffer<>(1);
35
         CircularBuffer<Integer> buffer = new CircularBuffer<>(1);
35
 
36
 
36
         buffer.write(1);
37
         buffer.write(1);
37
-        assertEquals((int) buffer.read(), 1);
38
+        assertThat(buffer.read(), is(1));
38
 
39
 
39
         expectedException.expect(BufferIOException.class);
40
         expectedException.expect(BufferIOException.class);
40
         expectedException.expectMessage("Tried to read from empty buffer");
41
         expectedException.expectMessage("Tried to read from empty buffer");
48
 
49
 
49
         buffer.write(1);
50
         buffer.write(1);
50
         buffer.write(2);
51
         buffer.write(2);
51
-        assertEquals((int) buffer.read(), 1);
52
-        assertEquals((int) buffer.read(), 2);
52
+        assertThat(buffer.read(), is(1));
53
+        assertThat(buffer.read(), is(2));
53
     }
54
     }
54
 
55
 
55
     @Ignore("Remove to run test")
56
     @Ignore("Remove to run test")
69
         CircularBuffer<Integer> buffer = new CircularBuffer<>(1);
70
         CircularBuffer<Integer> buffer = new CircularBuffer<>(1);
70
 
71
 
71
         buffer.write(1);
72
         buffer.write(1);
72
-        assertEquals((int) buffer.read(), 1);
73
+        assertThat(buffer.read(), is(1));
73
         buffer.write(2);
74
         buffer.write(2);
74
-        assertEquals((int) buffer.read(), 2);
75
+        assertThat(buffer.read(), is(2));
75
     }
76
     }
76
 
77
 
77
     @Ignore("Remove to run test")
78
     @Ignore("Remove to run test")
81
 
82
 
82
         buffer.write(1);
83
         buffer.write(1);
83
         buffer.write(2);
84
         buffer.write(2);
84
-        assertEquals((int) buffer.read(), 1);
85
+        assertThat(buffer.read(), is(1));
85
         buffer.write(3);
86
         buffer.write(3);
86
-        assertEquals((int) buffer.read(), 2);
87
-        assertEquals((int) buffer.read(), 3);
87
+        assertThat(buffer.read(), is(2));
88
+        assertThat(buffer.read(), is(3));
88
     }
89
     }
89
 
90
 
90
     @Ignore("Remove to run test")
91
     @Ignore("Remove to run test")
107
         buffer.write(1);
108
         buffer.write(1);
108
         buffer.clear();
109
         buffer.clear();
109
         buffer.write(2);
110
         buffer.write(2);
110
-        assertEquals((int) buffer.read(), 2);
111
+        assertThat(buffer.read(), is(2));
111
     }
112
     }
112
 
113
 
113
     @Ignore("Remove to run test")
114
     @Ignore("Remove to run test")
117
 
118
 
118
         buffer.clear();
119
         buffer.clear();
119
         buffer.write(1);
120
         buffer.write(1);
120
-        assertEquals((int) buffer.read(), 1);
121
+        assertThat(buffer.read(), is(1));
121
     }
122
     }
122
 
123
 
123
     @Ignore("Remove to run test")
124
     @Ignore("Remove to run test")
127
 
128
 
128
         buffer.write(1);
129
         buffer.write(1);
129
         buffer.overwrite(2);
130
         buffer.overwrite(2);
130
-        assertEquals((int) buffer.read(), 1);
131
-        assertEquals((int) buffer.read(), 2);
131
+        assertThat(buffer.read(), is(1));
132
+        assertThat(buffer.read(), is(2));
132
     }
133
     }
133
 
134
 
134
     @Ignore("Remove to run test")
135
     @Ignore("Remove to run test")
139
         buffer.write(1);
140
         buffer.write(1);
140
         buffer.write(2);
141
         buffer.write(2);
141
         buffer.overwrite(3);
142
         buffer.overwrite(3);
142
-        assertEquals((int) buffer.read(), 2);
143
-        assertEquals((int) buffer.read(), 3);
143
+        assertThat(buffer.read(), is(2));
144
+        assertThat(buffer.read(), is(3));
144
     }
145
     }
145
 
146
 
146
     @Ignore("Remove to run test")
147
     @Ignore("Remove to run test")
151
         buffer.write(1);
152
         buffer.write(1);
152
         buffer.write(2);
153
         buffer.write(2);
153
         buffer.write(3);
154
         buffer.write(3);
154
-        assertEquals((int) buffer.read(), 1);
155
+        assertThat(buffer.read(), is(1));
155
         buffer.write(4);
156
         buffer.write(4);
156
         buffer.overwrite(5);
157
         buffer.overwrite(5);
157
-        assertEquals((int) buffer.read(), 3);
158
-        assertEquals((int) buffer.read(), 4);
159
-        assertEquals((int) buffer.read(), 5);
158
+        assertThat(buffer.read(), is(3));
159
+        assertThat(buffer.read(), is(4));
160
+        assertThat(buffer.read(), is(5));
160
     }
161
     }
161
 }
162
 }
162
 
163