Fixed unit test

Implements #11
NCI-Agency · Nov 7, 2017 · ce42f74 · ce42f74
1 parent bf8409e
commit ce42f74
Show file tree

Hide file tree

Showing 2 changed files with 120 additions and 79 deletions.
diff --git a/src/main/java/mil/dds/anet/resources/ReportResource.java b/src/main/java/mil/dds/anet/resources/ReportResource.java
@@ -808,24 +808,34 @@ public RollupGraphComparator(final List<String> pinnedOrgNames) {
 		@Override
 		public int compare(final RollupGraph o1, final RollupGraph o2) {
 
-			if (pinnedOrgNames.contains(o1.getOrg().getShortName())) {
+			int result = 0;
+
+			if (o1.getOrg() != null && o2.getOrg() == null) {
+				result = -1;
+			} else if (o2.getOrg() != null && o1.getOrg() == null) {
+				result = 1;
+			} else if (o2.getOrg() == null && o1.getOrg() == null) {
+				result = 0;
+			} else if (pinnedOrgNames.contains(o1.getOrg().getShortName())) {
 				if (pinnedOrgNames.contains(o2.getOrg().getShortName())) {
-					return pinnedOrgNames.indexOf(o1.getOrg().getShortName())
+					result = pinnedOrgNames.indexOf(o1.getOrg().getShortName())
 							- pinnedOrgNames.indexOf(o2.getOrg().getShortName());
 				} else {
-					return -1;
+					result = -1;
 				}
 			} else if (pinnedOrgNames.contains(o2.getOrg().getShortName())) {
-				return 1;
+				result = 1;
 			} else {
 				final int c = o1.getOrg().getShortName().compareTo(o2.getOrg().getShortName());
-				
+
 				if (c != 0) {
-					return c;
+					result = c;
 				} else {
-					return o1.getOrg().getId() - o2.getOrg().getId();
+					result = o1.getOrg().getId() - o2.getOrg().getId();
 				}
 			}
+
+			return result;
 		}
 	}
 }
diff --git a/src/test/java/mil/dds/anet/test/resources/RollupGraphComparatorTest.java b/src/test/java/mil/dds/anet/test/resources/RollupGraphComparatorTest.java
@@ -1,72 +1,103 @@
-package mil.dds.anet.test.resources;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Test;
-
-import mil.dds.anet.beans.RollupGraph;
-import mil.dds.anet.resources.ReportResource.RollupGraphComparator;
-import mil.dds.anet.test.TestData;
-
-import static org.junit.Assert.assertEquals;
-
-public class RollupGraphComparatorTest {
-
-	@Test
-	public void performComparisonTest() {
-
-		List<RollupGraph> rollupGraphs = new ArrayList<>();
-
-		RollupGraph rollupGraph1 = TestData.createRollupGraph();
-		rollupGraph1.getOrg().setShortName("d name");
-		rollupGraphs.add(rollupGraph1);
-
-		RollupGraph rollupGraph2 = TestData.createRollupGraph();
-		rollupGraph2.getOrg().setShortName("b name");
-		rollupGraphs.add(rollupGraph2);
-
-		RollupGraph rollupGraph3 = TestData.createRollupGraph();
-		rollupGraph3.getOrg().setShortName("c name");
-		rollupGraphs.add(rollupGraph3);
-
-		RollupGraph rollupGraph4 = TestData.createRollupGraph();
-		rollupGraph4.getOrg().setShortName("a name");
-		rollupGraphs.add(rollupGraph4);
-
-		Collections.sort(rollupGraphs, new RollupGraphComparator(Arrays.asList("c name", "xxx", "yyy", "b name")));
-
-		assertEquals("incorrect name", "c name", rollupGraphs.get(0).getOrg().getShortName());
-		assertEquals("incorrect name", "b name", rollupGraphs.get(1).getOrg().getShortName());
-		assertEquals("incorrect name", "a name", rollupGraphs.get(2).getOrg().getShortName());
-		assertEquals("incorrect name", "d name", rollupGraphs.get(3).getOrg().getShortName());
-
-	}
-
-	@Test
-	public void performComparisonTestEmptyList() {
-
-		List<RollupGraph> rollupGraphs = new ArrayList<>();
-
-		RollupGraph rollupGraph1 = TestData.createRollupGraph();
-		rollupGraph1.getOrg().setShortName("a name");
-		rollupGraphs.add(rollupGraph1);
-
-		RollupGraph rollupGraph2 = TestData.createRollupGraph();
-		rollupGraph2.getOrg().setShortName("c name");
-		rollupGraphs.add(rollupGraph2);
-
-		RollupGraph rollupGraph3 = TestData.createRollupGraph();
-		rollupGraph3.getOrg().setShortName("b name");
-		rollupGraphs.add(rollupGraph3);
-
-		Collections.sort(rollupGraphs, new RollupGraphComparator(new ArrayList<>()));
-
-		assertEquals("incorrect name", "a name", rollupGraphs.get(0).getOrg().getShortName());
-		assertEquals("incorrect name", "b name", rollupGraphs.get(1).getOrg().getShortName());
-		assertEquals("incorrect name", "c name", rollupGraphs.get(2).getOrg().getShortName());
-
-	}
-}
+package mil.dds.anet.test.resources;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+import mil.dds.anet.beans.RollupGraph;
+import mil.dds.anet.resources.ReportResource.RollupGraphComparator;
+import mil.dds.anet.test.TestData;
+
+public class RollupGraphComparatorTest {
+
+	@Test
+	public void performComparisonTest() {
+
+		List<RollupGraph> rollupGraphs = new ArrayList<>();
+
+		RollupGraph rollupGraph1 = TestData.createRollupGraph();
+		rollupGraph1.getOrg().setShortName("d name");
+		rollupGraphs.add(rollupGraph1);
+
+		RollupGraph rollupGraph2 = TestData.createRollupGraph();
+		rollupGraph2.getOrg().setShortName("b name");
+		rollupGraphs.add(rollupGraph2);
+
+		RollupGraph rollupGraph3 = TestData.createRollupGraph();
+		rollupGraph3.getOrg().setShortName("c name");
+		rollupGraphs.add(rollupGraph3);
+
+		RollupGraph rollupGraph4 = TestData.createRollupGraph();
+		rollupGraph4.getOrg().setShortName("a name");
+		rollupGraphs.add(rollupGraph4);
+
+		Collections.sort(rollupGraphs, new RollupGraphComparator(Arrays.asList("c name", "xxx", "yyy", "b name")));
+
+		assertEquals("incorrect name", "c name", rollupGraphs.get(0).getOrg().getShortName());
+		assertEquals("incorrect name", "b name", rollupGraphs.get(1).getOrg().getShortName());
+		assertEquals("incorrect name", "a name", rollupGraphs.get(2).getOrg().getShortName());
+		assertEquals("incorrect name", "d name", rollupGraphs.get(3).getOrg().getShortName());
+
+	}
+
+	@Test
+	public void performComparisonTestNullOrgs() {
+
+		List<RollupGraph> rollupGraphs = new ArrayList<>();
+
+		RollupGraph rollupGraph1 = TestData.createRollupGraph();
+		rollupGraph1.setOrg(null);
+		rollupGraphs.add(rollupGraph1);
+
+		RollupGraph rollupGraph2 = TestData.createRollupGraph();
+		rollupGraph2.setOrg(null);
+		rollupGraphs.add(rollupGraph2);
+
+		RollupGraph rollupGraph3 = TestData.createRollupGraph();
+		rollupGraph3.getOrg().setShortName("c name");
+		rollupGraphs.add(rollupGraph3);
+
+		RollupGraph rollupGraph4 = TestData.createRollupGraph();
+		rollupGraph4.getOrg().setShortName("a name");
+		rollupGraphs.add(rollupGraph4);
+
+		Collections.sort(rollupGraphs, new RollupGraphComparator(Arrays.asList("c name", "xxx", "yyy", "b name")));
+
+		assertEquals("incorrect name", "c name", rollupGraphs.get(0).getOrg().getShortName());
+		assertEquals("incorrect name", "a name", rollupGraphs.get(1).getOrg().getShortName());
+		assertNull("incorrect org", rollupGraphs.get(2).getOrg());
+		assertNull("incorrect org", rollupGraphs.get(3).getOrg());
+
+	}
+
+	@Test
+	public void performComparisonTestEmptyList() {
+
+		List<RollupGraph> rollupGraphs = new ArrayList<>();
+
+		RollupGraph rollupGraph1 = TestData.createRollupGraph();
+		rollupGraph1.getOrg().setShortName("a name");
+		rollupGraphs.add(rollupGraph1);
+
+		RollupGraph rollupGraph2 = TestData.createRollupGraph();
+		rollupGraph2.getOrg().setShortName("c name");
+		rollupGraphs.add(rollupGraph2);
+
+		RollupGraph rollupGraph3 = TestData.createRollupGraph();
+		rollupGraph3.getOrg().setShortName("b name");
+		rollupGraphs.add(rollupGraph3);
+
+		Collections.sort(rollupGraphs, new RollupGraphComparator(new ArrayList<>()));
+
+		assertEquals("incorrect name", "a name", rollupGraphs.get(0).getOrg().getShortName());
+		assertEquals("incorrect name", "b name", rollupGraphs.get(1).getOrg().getShortName());
+		assertEquals("incorrect name", "c name", rollupGraphs.get(2).getOrg().getShortName());
+
+	}
+}