Skip to content

Commit ce6369c

Browse files
FridaTveitmatthewmorgan
FridaTveit
authored and
matthewmorgan
committed
Issue exercism#196: Replaced assertj assertions with junit and hamcrest assertions in linked-list. Removed assertj from linked-list gradle build file. (exercism#212)
1 parent 83002e9 commit ce6369c

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎exercises/linked-list/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ repositories {
88

99
dependencies {
1010
testCompile "junit:junit:4.12"
11-
testCompile "org.assertj:assertj-core:3.2.0"
1211
}
1312
test {
1413
testLogging {

‎exercises/linked-list/src/test/java/DequeTest.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import org.junit.Before;
2-
import org.junit.Test;
32
import org.junit.Ignore;
3+
import org.junit.Test;
44

5-
import static org.assertj.core.api.Assertions.assertThat;
5+
import static org.hamcrest.CoreMatchers.*;
6+
import static org.junit.Assert.*;
67

78
public class DequeTest {
89
private Deque<Integer> subject;
@@ -17,51 +18,51 @@ public void setUp() {
1718
public void testPushPop() {
1819
subject.push(10);
1920
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));
2223
}
2324

2425
@Ignore
2526
@Test
2627
public void testPushShift() {
2728
subject.push(10);
2829
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));
3132
}
3233

3334
@Ignore
3435
@Test
3536
public void testUnshiftShift() {
3637
subject.unshift(10);
3738
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));
4041
}
4142

4243
@Ignore
4344
@Test
4445
public void testUnshiftPop() {
4546
subject.unshift(10);
4647
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));
4950
}
5051

5152
@Ignore
5253
@Test
5354
public void testExample() {
5455
subject.push(10);
5556
subject.push(20);
56-
assertThat(subject.pop()).isEqualTo(20);
57+
assertThat(subject.pop(), is(20));
5758

5859
subject.push(30);
59-
assertThat(subject.shift()).isEqualTo(10);
60+
assertThat(subject.shift(), is(10));
6061

6162
subject.unshift(40);
6263
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));
6667
}
6768
}

0 commit comments

Comments
 (0)