Updated to JUnit 4; incidentally reformatted code

.gitignore

@@ -7,3 +7,23 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
+
+# Mac file finder metadata
+.DS_Store
+# MS Office temporary file
+~*
+# Emacs backup file
+*~
+
+# JetBrains (IntelliJ IDEA, PyCharm, etc) files
+.idea/
+out/
+*.iml
+*.iws
+*.ipr
+
+# Eclipse files
+bin/
+.settings/
+.classpath
+.project

pom.xml

@@ -11,7 +11,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/test/java/edu/unl/cse/csce361/sort_three_pairs/SortThreePairsTest.java

 package edu.unl.cse.csce361.sort_three_pairs;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
-import java.io.InputStream;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 import java.io.PrintStream;
 import java.security.Permission;
-import java.io.ByteArrayOutputStream;
 
-public class SortThreePairsTest extends TestCase {
-	public SortThreePairsTest(String testName) {
-		super(testName);
-	}
-
-	public static Test suite() {
-		return new TestSuite(SortThreePairsTest.class);
-	}
+public class SortThreePairsTest {
 
 	protected static String assemble(String... lines) {
 		return String.join("\n", lines) + "\n";
@@ -61,16 +56,14 @@ public class SortThreePairsTest extends TestCase {
 		}
 	}
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
+	@Before
+	public void setUp() {
 		System.setSecurityManager(new TestingSecurityManager());
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
+	@After
+	public void tearDown() {
 		System.setSecurityManager(null);
-		super.tearDown();
 	}
 
 	protected static String runMainForError(int expectedStatus, String... arguments) {
@@ -93,66 +86,79 @@ public class SortThreePairsTest extends TestCase {
 		return collector.toString();
 	}
 
+	@Test
 	public void testZeros() {
 		assertEquals(assemble("(0.0, 0.0)", "(0.0, 0.0)", "(0.0, 0.0)"),
 				runMain("0", "0", "0", "0", "0", "0"));
 	}
 
+	@Test
 	public void testAlreadySorted() {
 		assertEquals(assemble("(0.0, 0.0)", "(1.0, 1.0)", "(2.0, 2.0)"),
 				runMain("0", "0", "1", "1", "2", "2"));
 	}
 
+	@Test
 	public void testReversed() {
 		assertEquals(assemble("(0.0, 0.0)", "(1.0, 1.0)", "(2.0, 2.0)"),
 				runMain("2", "2", "1", "1", "0", "0"));
 	}
 
+	@Test
 	public void testJumbled() {
 		assertEquals(assemble("(0.0, 0.0)", "(1.0, 1.0)", "(2.0, 2.0)"),
 				runMain("1", "1", "2", "2", "0", "0"));
 	}
 
+	@Test
 	public void testTieBreaking() {
 		assertEquals(assemble("(0.0, 1.0)", "(1.0, 2.0)", "(1.0, 3.0)"),
 				runMain("1", "3", "0", "1", "1", "2"));
 	}
 
+	@Test
 	public void testMultipleTieBreaking() {
 		assertEquals(assemble("(0.0, 0.0)", "(0.0, 1.0)", "(0.0, 3.0)"),
 				runMain("0", "1", "0", "0", "0", "3"));
 	}
 
+	@Test
 	public void testDuplicates() {
 		assertEquals(assemble("(1.0, 1.0)", "(1.0, 1.0)", "(1.0, 2.0)"),
 				runMain("1", "1", "1", "2", "1", "1"));
 	}
 
+	@Test
 	public void testPermutation1() {
 		assertEquals(assemble("(0.0, 0.0)", "(1.0, 1.0)", "(2.0, 2.0)"),
 				runMain("0", "0", "2", "2", "1", "1"));
 	}
 
+	@Test
 	public void testPermutation2() {
 		assertEquals(assemble("(0.0, 0.0)", "(1.0, 1.0)", "(2.0, 2.0)"),
 				runMain("2", "2", "0", "0", "1", "1"));
 	}
 
+	@Test
 	public void testPermutation3() {
 		assertEquals(assemble("(0.0, 0.0)", "(1.0, 1.0)", "(2.0, 2.0)"),
 				runMain("2", "2", "1", "1", "0", "0"));
 	}
 
+	@Test
 	public void testPermutation16() {
 		assertEquals(assemble("(0.0, 0.0)", "(1.0, 1.0)", "(2.0, 2.0)"),
 				runMain("1", "1", "2", "2", "0", "0"));
 	}
 
+	@Test
 	public void testPermutation20() {
 		assertEquals(assemble("(0.0, 0.0)", "(1.0, 1.0)", "(2.0, 2.0)"),
 				runMain("1", "1", "0", "0", "2", "2"));
 	}
 
+	@Test
 	public void testTooFewArguments() {
 		assertEquals(
 				assemble("Sorts three points by their x coordinates, breaking ties using y coordinates.",