|
|
@@ -1,8 +1,9 @@
|
|
1
|
1
|
import org.junit.Before;
|
|
2
|
|
-import org.junit.Test;
|
|
3
|
2
|
import org.junit.Ignore;
|
|
|
3
|
+import org.junit.Test;
|
|
4
|
4
|
|
|
5
|
|
-import static org.assertj.core.api.Assertions.assertThat;
|
|
|
5
|
+import static org.hamcrest.CoreMatchers.*;
|
|
|
6
|
+import static org.junit.Assert.*;
|
|
6
|
7
|
|
|
7
|
8
|
public class DequeTest {
|
|
8
|
9
|
private Deque<Integer> subject;
|
|
|
@@ -17,8 +18,8 @@ public class DequeTest {
|
|
17
|
18
|
public void testPushPop() {
|
|
18
|
19
|
subject.push(10);
|
|
19
|
20
|
subject.push(20);
|
|
20
|
|
- assertThat(subject.pop()).isEqualTo(20);
|
|
21
|
|
- assertThat(subject.pop()).isEqualTo(10);
|
|
|
21
|
+ assertThat(subject.pop(), is(20));
|
|
|
22
|
+ assertThat(subject.pop(), is(10));
|
|
22
|
23
|
}
|
|
23
|
24
|
|
|
24
|
25
|
@Ignore
|
|
|
@@ -26,8 +27,8 @@ public class DequeTest {
|
|
26
|
27
|
public void testPushShift() {
|
|
27
|
28
|
subject.push(10);
|
|
28
|
29
|
subject.push(20);
|
|
29
|
|
- assertThat(subject.shift()).isEqualTo(10);
|
|
30
|
|
- assertThat(subject.shift()).isEqualTo(20);
|
|
|
30
|
+ assertThat(subject.shift(), is(10));
|
|
|
31
|
+ assertThat(subject.shift(), is(20));
|
|
31
|
32
|
}
|
|
32
|
33
|
|
|
33
|
34
|
@Ignore
|
|
|
@@ -35,8 +36,8 @@ public class DequeTest {
|
|
35
|
36
|
public void testUnshiftShift() {
|
|
36
|
37
|
subject.unshift(10);
|
|
37
|
38
|
subject.unshift(20);
|
|
38
|
|
- assertThat(subject.shift()).isEqualTo(20);
|
|
39
|
|
- assertThat(subject.shift()).isEqualTo(10);
|
|
|
39
|
+ assertThat(subject.shift(), is(20));
|
|
|
40
|
+ assertThat(subject.shift(), is(10));
|
|
40
|
41
|
}
|
|
41
|
42
|
|
|
42
|
43
|
@Ignore
|
|
|
@@ -44,8 +45,8 @@ public class DequeTest {
|
|
44
|
45
|
public void testUnshiftPop() {
|
|
45
|
46
|
subject.unshift(10);
|
|
46
|
47
|
subject.unshift(20);
|
|
47
|
|
- assertThat(subject.pop()).isEqualTo(10);
|
|
48
|
|
- assertThat(subject.pop()).isEqualTo(20);
|
|
|
48
|
+ assertThat(subject.pop(), is(10));
|
|
|
49
|
+ assertThat(subject.pop(), is(20));
|
|
49
|
50
|
}
|
|
50
|
51
|
|
|
51
|
52
|
@Ignore
|
|
|
@@ -53,15 +54,15 @@ public class DequeTest {
|
|
53
|
54
|
public void testExample() {
|
|
54
|
55
|
subject.push(10);
|
|
55
|
56
|
subject.push(20);
|
|
56
|
|
- assertThat(subject.pop()).isEqualTo(20);
|
|
|
57
|
+ assertThat(subject.pop(), is(20));
|
|
57
|
58
|
|
|
58
|
59
|
subject.push(30);
|
|
59
|
|
- assertThat(subject.shift()).isEqualTo(10);
|
|
|
60
|
+ assertThat(subject.shift(), is(10));
|
|
60
|
61
|
|
|
61
|
62
|
subject.unshift(40);
|
|
62
|
63
|
subject.push(50);
|
|
63
|
|
- assertThat(subject.shift()).isEqualTo(40);
|
|
64
|
|
- assertThat(subject.pop()).isEqualTo(50);
|
|
65
|
|
- assertThat(subject.shift()).isEqualTo(30);
|
|
|
64
|
+ assertThat(subject.shift(), is(40));
|
|
|
65
|
+ assertThat(subject.pop(), is(50));
|
|
|
66
|
+ assertThat(subject.shift(), is(30));
|
|
66
|
67
|
}
|
|
67
|
68
|
}
|