新建开发分支

Author: easepan

.classpath

@@ -18,6 +18,10 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

src/test/java/com/zhazhapan/util/UtilsTest.java

@@ -1,63 +1,59 @@
-/**
- * 
- */
 package com.zhazhapan.util;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
-
 /**
  * @author pantao
- *
  */
 public class UtilsTest {
 
-	int[] test1 = { 78, 56, 34, 23, 12, 1 };
-	int[] test2 = { 45, 33, 32, 23, 22, 13 };
-	int[] test3 = { 1, 2, 4, 6, 9 };
-	int[] test4 = { 3, 5, 7, 8 };
-
-	@Test
-	public void testNumberExtract() {
-		String s1 = "+.12   3";
-		String s2 = "+ab12.c123  ";
-		String s3 = "+0.c123";
-		String s4 = "   +89h.7.123";
-		String s5 = "afda.afaa";
-		String s6 = "-.abca";
-		String s7 = "-.1   2-3";
-		String s8 = "-8afa232.123";
-		String s9 = "-0.123";
-		assertTrue(123 == Utils.extractInt(s1));
-		assertTrue(12123 == Utils.extractInt(s2));
-		assertTrue(0.123 == Utils.extractDouble(s3));
-		assertTrue(897.123 == Utils.extractDouble(s4));
-		assertTrue("" == Utils.extractDigit(s5));
-		assertTrue("" == Utils.extractDigit(s6));
-		assertTrue(-0.123 == Utils.extractDouble(s7));
-		assertTrue(-8232123 == Utils.extractInt(s8));
-		assertTrue(-0.123f == Utils.extractFloat(s9));
-	}
-
-	@Test
-	public void testConcatArrays() {
-		int[] nums = Utils.concatArrays(test1, test2, test4, test3);
-		for (int i : nums) {
-			System.out.print(i + " ");
-		}
-	}
-
-	@Test
-	public void testGetMaxValue() {
-		int[] test1 = { 1, 2, 3, 2, 123, 34 };
-		assertEquals(123, Utils.getMaxValue(test1));
-	}
-
-	@Test
-	public void testMerageSortedArrays() {
-		assertTrue(Checker.isSorted(Utils.mergeSortedArrays(test1, test2, true)));
-		assertTrue(Checker.isSorted(Utils.mergeSortedArrays(test4, test3)));
-	}
+    private int[] test1 = {78, 56, 34, 23, 12, 1};
+    private int[] test2 = {45, 33, 32, 23, 22, 13};
+    private int[] test3 = {1, 2, 4, 6, 9};
+    private int[] test4 = {3, 5, 7, 8};
+
+    @Test
+    public void testNumberExtract() {
+        String s1 = "+.12   3";
+        String s2 = "+ab12.c123  ";
+        String s3 = "+0.c123";
+        String s4 = "   +89h.7.123";
+        String s5 = "afda.afaa";
+        String s6 = "-.abca";
+        String s7 = "-.1   2-3";
+        String s8 = "-8afa232.123";
+        String s9 = "-0.123";
+        assertTrue(123 == Utils.extractInt(s1));
+        assertTrue(12123 == Utils.extractInt(s2));
+        assertTrue(0.123 == Utils.extractDouble(s3));
+        assertTrue(897.123 == Utils.extractDouble(s4));
+        assertTrue("".equals(Utils.extractDigit(s5)));
+        assertTrue("".equals(Utils.extractDigit(s6)));
+        assertTrue(-0.123 == Utils.extractDouble(s7));
+        assertTrue(-8232123 == Utils.extractInt(s8));
+        assertTrue(-0.123f == Utils.extractFloat(s9));
+    }
+
+    @Test
+    public void testConcatArrays() {
+        int[] nums = Utils.concatArrays(test1, test2, test4, test3);
+        for (int i : nums) {
+            System.out.print(i + " ");
+        }
+    }
+
+    @Test
+    public void testGetMaxValue() {
+        int[] test1 = {1, 2, 3, 2, 123, 34};
+        assertEquals(123, Utils.getMaxValue(test1));
+    }
+
+    @Test
+    public void testMerageSortedArrays() {
+        assertTrue(Checker.isSorted(Utils.mergeSortedArrays(test1, test2, true)));
+        assertTrue(Checker.isSorted(Utils.mergeSortedArrays(test4, test3)));
+    }
 }