refactor 57

Author: fishercoder1534

src/main/java/com/fishercoder/solutions/_57.java

@@ -22,26 +22,27 @@
  */
 public class _57 {
 
+  public static class Solution1 {
     public List<Interval> insert(List<Interval> intervals, Interval newInterval) {
-        List<Interval> result = new ArrayList<>();
-        int i = 0;
-        // add all the intervals ending before newInterval starts
-        while (i < intervals.size() && intervals.get(i).end < newInterval.start) {
-            result.add(intervals.get(i++));
-        }
-        // merge all overlapping intervals to one considering newInterval
-        while (i < intervals.size() && intervals.get(i).start <= newInterval.end) {
-            newInterval = new Interval( // we could mutate newInterval here also
-                    Math.min(newInterval.start, intervals.get(i).start),
-                    Math.max(newInterval.end, intervals.get(i).end));
-            i++;
-        }
-        result.add(newInterval);
-        // add all the rest
-        while (i < intervals.size()) {
-            result.add(intervals.get(i++));
-        }
-        return result;
+      List<Interval> result = new ArrayList<>();
+      int i = 0;
+      // add all the intervals ending before newInterval starts
+      while (i < intervals.size() && intervals.get(i).end < newInterval.start) {
+        result.add(intervals.get(i++));
+      }
+      // merge all overlapping intervals to one considering newInterval
+      while (i < intervals.size() && intervals.get(i).start <= newInterval.end) {
+        newInterval = new Interval( // we could mutate newInterval here also
+            Math.min(newInterval.start, intervals.get(i).start),
+            Math.max(newInterval.end, intervals.get(i).end));
+        i++;
+      }
+      result.add(newInterval);
+      // add all the rest
+      while (i < intervals.size()) {
+        result.add(intervals.get(i++));
+      }
+      return result;
     }
-
+  }
 }

src/test/java/com/fishercoder/_57Test.java

@@ -12,26 +12,23 @@
 
 import static org.junit.Assert.assertEquals;
 
-/**
- * Created by stevesun on 6/14/17.
- */
 public class _57Test {
-    private static _57 test;
+    private static _57.Solution1 solution1;
     private static List<Interval> intervals;
     private static List<Interval> expected;
     private static List<Interval> actual;
 
     @BeforeClass
     public static void setup() {
-        test = new _57();
+        solution1 = new _57.Solution1();
     }
 
     @Test
     public void test1() {
         intervals = new ArrayList<>(Arrays.asList(new Interval(1, 3), new Interval(6, 9)));
         expected = new ArrayList<>(Arrays.asList(new Interval(1, 5), new Interval(6, 9)));
         CommonUtils.printIntervals(intervals);
-        actual = test.insert(intervals, new Interval(2, 5));
+        actual = solution1.insert(intervals, new Interval(2, 5));
         CommonUtils.printIntervals(actual);
         assertEquals(expected, actual);
     }
@@ -42,7 +39,7 @@ public void test2() {
         intervals = new ArrayList<>(Arrays.asList(new Interval(1, 2), new Interval(3, 5), new Interval(6, 7), new Interval(8, 10), new Interval(12, 16)));
         CommonUtils.printIntervals(intervals);
         expected = new ArrayList<>(Arrays.asList(new Interval(1, 2), new Interval(3, 10), new Interval(12, 16)));
-        actual = test.insert(intervals, new Interval(4, 9));
+        actual = solution1.insert(intervals, new Interval(4, 9));
         CommonUtils.printIntervals(actual);
         assertEquals(expected, actual);
     }
@@ -52,7 +49,7 @@ public void test3() {
         intervals = new ArrayList<>(Arrays.asList(new Interval(1, 5)));
         CommonUtils.printIntervals(intervals);
         expected = new ArrayList<>(Arrays.asList(new Interval(1, 5)));
-        actual = test.insert(intervals, new Interval(2, 3));
+        actual = solution1.insert(intervals, new Interval(2, 3));
         CommonUtils.printIntervals(actual);
         assertEquals(expected, actual);
     }
@@ -62,7 +59,7 @@ public void test4() {
         intervals = new ArrayList<>(Arrays.asList());
         CommonUtils.printIntervals(intervals);
         expected = new ArrayList<>(Arrays.asList(new Interval(5, 7)));
-        actual = test.insert(intervals, new Interval(5, 7));
+        actual = solution1.insert(intervals, new Interval(5, 7));
         CommonUtils.printIntervals(actual);
         assertEquals(expected, actual);
     }
@@ -72,7 +69,7 @@ public void test5() {
         intervals = new ArrayList<>(Arrays.asList(new Interval(1, 5)));
         expected = new ArrayList<>(Arrays.asList(new Interval(1, 5), new Interval(6, 8)));
         CommonUtils.printIntervals(intervals);
-        actual = test.insert(intervals, new Interval(6, 8));
+        actual = solution1.insert(intervals, new Interval(6, 8));
         CommonUtils.printIntervals(actual);
         assertEquals(expected, actual);
     }
@@ -82,7 +79,7 @@ public void test6() {
         intervals = new ArrayList<>(Arrays.asList(new Interval(1, 5)));
         expected = new ArrayList<>(Arrays.asList(new Interval(0, 5)));
         CommonUtils.printIntervals(intervals);
-        actual = test.insert(intervals, new Interval(0, 3));
+        actual = solution1.insert(intervals, new Interval(0, 3));
         CommonUtils.printIntervals(actual);
         assertEquals(expected, actual);
     }
@@ -92,7 +89,7 @@ public void test7() {
         intervals = new ArrayList<>(Arrays.asList(new Interval(1, 5)));
         expected = new ArrayList<>(Arrays.asList(new Interval(0, 0), new Interval(1, 5)));
         CommonUtils.printIntervals(intervals);
-        actual = test.insert(intervals, new Interval(0, 0));
+        actual = solution1.insert(intervals, new Interval(0, 0));
         CommonUtils.printIntervals(actual);
         assertEquals(expected, actual);
     }
@@ -102,7 +99,7 @@ public void test8() {
         intervals = new ArrayList<>(Arrays.asList(new Interval(2, 5), new Interval(6, 7), new Interval(8, 9)));
         expected = new ArrayList<>(Arrays.asList(new Interval(0, 1), new Interval(2, 5), new Interval(6, 7), new Interval(8, 9)));
         CommonUtils.printIntervals(intervals);
-        actual = test.insert(intervals, new Interval(0, 1));
+        actual = solution1.insert(intervals, new Interval(0, 1));
         CommonUtils.printIntervals(actual);
         assertEquals(expected, actual);
     }
@@ -112,7 +109,7 @@ public void test9() {
         intervals = new ArrayList<>(Arrays.asList(new Interval(2, 4), new Interval(5, 7), new Interval(8, 10), new Interval(11, 13)));
         expected = new ArrayList<>(Arrays.asList(new Interval(2, 7), new Interval(8, 10), new Interval(11, 13)));
         CommonUtils.printIntervals(intervals);
-        actual = test.insert(intervals, new Interval(3, 6));
+        actual = solution1.insert(intervals, new Interval(3, 6));
         CommonUtils.printIntervals(actual);
         assertEquals(expected, actual);
     }