Procházet zdrojové kódy

Issue #196: Replaced assertj assertions with junit and hamcrest assertions in linked-list. Removed assertj from linked-list gradle build file. (#212)

FridaTveit před 9 roky
rodič
revize
ce6369c428

+ 0
- 1
exercises/linked-list/build.gradle Zobrazit soubor

8
 
8
 
9
 dependencies {
9
 dependencies {
10
   testCompile "junit:junit:4.12"
10
   testCompile "junit:junit:4.12"
11
-  testCompile "org.assertj:assertj-core:3.2.0"
12
 }
11
 }
13
 test {
12
 test {
14
   testLogging {
13
   testLogging {

+ 16
- 15
exercises/linked-list/src/test/java/DequeTest.java Zobrazit soubor

1
 import org.junit.Before;
1
 import org.junit.Before;
2
-import org.junit.Test;
3
 import org.junit.Ignore;
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
 public class DequeTest {
8
 public class DequeTest {
8
     private Deque<Integer> subject;
9
     private Deque<Integer> subject;
17
     public void testPushPop() {
18
     public void testPushPop() {
18
         subject.push(10);
19
         subject.push(10);
19
         subject.push(20);
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
     @Ignore
25
     @Ignore
26
     public void testPushShift() {
27
     public void testPushShift() {
27
         subject.push(10);
28
         subject.push(10);
28
         subject.push(20);
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
     @Ignore
34
     @Ignore
35
     public void testUnshiftShift() {
36
     public void testUnshiftShift() {
36
         subject.unshift(10);
37
         subject.unshift(10);
37
         subject.unshift(20);
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
     @Ignore
43
     @Ignore
44
     public void testUnshiftPop() {
45
     public void testUnshiftPop() {
45
         subject.unshift(10);
46
         subject.unshift(10);
46
         subject.unshift(20);
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
     @Ignore
52
     @Ignore
53
     public void testExample() {
54
     public void testExample() {
54
         subject.push(10);
55
         subject.push(10);
55
         subject.push(20);
56
         subject.push(20);
56
-        assertThat(subject.pop()).isEqualTo(20);
57
+        assertThat(subject.pop(), is(20));
57
 
58
 
58
         subject.push(30);
59
         subject.push(30);
59
-        assertThat(subject.shift()).isEqualTo(10);
60
+        assertThat(subject.shift(), is(10));
60
 
61
 
61
         subject.unshift(40);
62
         subject.unshift(40);
62
         subject.push(50);
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
 }