8000 refactor 56 · erlieStar/Leetcode@6bcd6f5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6bcd6f5

Browse files
fishercoder1534fishercoder1534
committed
refactor 56
1 parent 33a9ddf commit 6bcd6f5

File tree

2 files changed

+54
-20
lines changed

2 files changed

+54
-20
lines changed

‎src/main/java/com/fishercoder/solutions/_56.java

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.fishercoder.solutions;
22

33
import com.fishercoder.common.classes.Interval;
4-
import com.fishercoder.common.utils.CommonUtils;
5-
64
import java.util.ArrayList;
75
import java.util.Collections;
86
import java.util.List;
@@ -18,7 +16,8 @@
1816
*/
1917
public class _56 {
2018

21-
public static List<Interval> merge(List<Interval> intervals) {
19+
public static class Solution1 {
20+
public List<Interval> merge(List<Interval> intervals) {
2221
if (intervals.size() <= 1) {
2322
return intervals;
2423
}
@@ -38,22 +37,6 @@ public static List<Interval> merge(List<Interval> intervals) {
3837
}
3938
return result;
4039
}
41-
42-
public static void main(String[] args) {
43-
List<Interval> list = new ArrayList<Interval>();
44-
// //test case 1:
45-
// list.add(new Interval(2,3));
46-
// list.add(new Interval(5,5));
47-
// list.add(new Interval(2,2));
48-
// list.add(new Interval(3,4));
49-
// list.add(new Interval(3,4));
50-
51-
//test case 2:
52-
list.add(new Interval(1, 3));
53-
list.add(new Interval(2, 6));
54-
list.add(new Interval(8, 10));
55-
list.add(new Interval(15, 18));
56-
CommonUtils.printList(merge(list));
57-
}
40+
}
5841

5942
}

‎src/test/java/com/fishercoder/_56Test.java

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package com.fishercoder;
2+
3+
import com.fishercoder.common.classes.Interval;
4+
import com.fishercoder.solutions._56;
5+
import java.util.ArrayList;
6+
import java.util.List;
7+
import org.junit.BeforeClass;
8+
import org.junit.Test;
9+
10+
import static org.junit.Assert.assertEquals;
11+
12+
public class _56Test {
13+
private static _56.Solution1 solution1;
14+
private static List<Interval> intervals;
15+
private static List<Interval> expected;
16+
17+
@BeforeClass
18+
public static void setup() {
19+
solution1 = new _56.Solution1();
20+
}
21+
22+
@Test
23+
public void test1() {
24+
intervals = new ArrayList();
25+
intervals.add(new Interval(2, 3));
26+
intervals.add(new Interval(5, 5));
27+
intervals.add(new Interval(2, 2));
28+
intervals.add(new Interval(3, 4));
29+
intervals.add(new Interval(3, 4));
30+
31+
expected = new ArrayList<>();
32+
expected.add(new Interval(2, 4));
33+
expected.add(new Interval(5, 5));
34+
assertEquals(expected, solution1.merge(intervals));
35+
}
36+
37+
@Test
38+
public void test2() {
39+
intervals = new ArrayList();
40+
intervals.add(new Interval(1, 3));
41+
intervals.add(new Interval(2, 6));
42+
intervals.add(new Interval(8, 10));
43+
intervals.add(new Interval(15, 18));
44+
45+
expected = new ArrayList<>();
46+
expected.add(new Interval(1, 6));
47+
expected.add(new Interval(8, 10));
48+
expected.add(new Interval(15, 18));
49+
assertEquals(expected, solution1.merge(intervals));
50+
}
51+
}

0 commit comments

Comments
 (0)
0