refactor: Remove warnings and technical debt

Change-Id: I08b39067dd08ef51ca4881eef3b188fb4cabcbf1

2 files changed, 4 insertions, 10 deletions

diff --git a/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/LoadingCacheTest.java b/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/LoadingCacheTest.java
index b9cfafe8bab..d656bc44b26 100644
--- a/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/LoadingCacheTest.java
+++ b/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/LoadingCacheTest.java
@@ -10,21 +10,19 @@
  *******************************************************************************/
 package org.eclipse.osee.cache.admin.internal;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.concurrent.Callable;
-
 import org.eclipse.osee.cache.admin.Cache;
 import org.eclipse.osee.cache.admin.CacheConfiguration;
 import org.eclipse.osee.cache.admin.CacheDataLoader;
@@ -39,7 +37,6 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-
 import com.google.common.collect.Iterables;
 
 /**
diff --git a/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/NoneLoadingCacheTest.java b/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/NoneLoadingCacheTest.java
index 66c51ed5b04..e3250a97bec 100644
--- a/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/NoneLoadingCacheTest.java
+++ b/plugins/org.eclipse.osee.cache.admin.test/src/org/eclipse/osee/cache/admin/internal/NoneLoadingCacheTest.java
@@ -10,24 +10,21 @@
  *******************************************************************************/
 package org.eclipse.osee.cache.admin.internal;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-
 import java.util.Arrays;
 import java.util.concurrent.Callable;
-
 import org.eclipse.osee.cache.admin.Cache;
 import org.eclipse.osee.cache.admin.CacheConfiguration;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.MockitoAnnotations;
-
 import com.google.common.collect.Iterables;
 
 /**