Keep only clean TestCases, remove 2 license issues

Issue-ID: AAF-111
Change-Id: I7f779f4beacc84427734ce2c5b0369d5727e136d
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>

3 files changed, 71 insertions, 74 deletions

diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index 2e02120d..ed9c5914 100644
--- a/auth/auth-deforg/pom.xml
+++ b/auth/auth-deforg/pom.xml
@@ -72,9 +72,6 @@
 
 
 	<properties>
-	<skipTests>true</skipTests>
-
-
 		<maven.test.failure.ignore>false</maven.test.failure.ignore>
 		<!--  SONAR  -->
 		 <jacoco.version>0.7.7.201606060606</jacoco.version>
diff --git a/auth/auth-deforg/src/test/java/org/onap/aaf/org/test/JU_DefaultOrg.java b/auth/auth-deforg/src/test/java/org/onap/aaf/org/test/JU_DefaultOrg.java
index 72b15480..e6f058a4 100644
--- a/auth/auth-deforg/src/test/java/org/onap/aaf/org/test/JU_DefaultOrg.java
+++ b/auth/auth-deforg/src/test/java/org/onap/aaf/org/test/JU_DefaultOrg.java
@@ -63,7 +63,7 @@ public class JU_DefaultOrg {
 	String s;
 	String defFile;
 
-	@Before
+	//@Before
 	public void setUp() throws OrganizationException{
 		MockitoAnnotations.initMocks(this);
 		PowerMockito.when(authzEnvMock.getProperty(s=(REALM + ".mailHost"), null)).thenReturn("hello");
@@ -74,7 +74,7 @@ public class JU_DefaultOrg {
 		defaultOrg = new DefaultOrg(authzEnvMock, REALM);
 	}
 
-	@Test    //(expected=OrganizationException.class)
+	//@Test    //(expected=OrganizationException.class)
 	public void test() throws OrganizationException{
 		//PowerMockito.when(authzEnvMock.getProperty(Matchers.anyString())).thenReturn(" ");
 		//defaultOrg = new DefaultOrg(authzEnvMock);
@@ -82,7 +82,7 @@ public class JU_DefaultOrg {
 	}
 
 
-	@Test    //(expected=OrganizationException.class)
+	//@Test    //(expected=OrganizationException.class)
 	public void testMultipleCreds() throws OrganizationException{
 		String id = "test";
 		//PowerMockito.when(authzEnvMock.getProperty(Matchers.anyString())).thenReturn(" ");
@@ -94,7 +94,7 @@ public class JU_DefaultOrg {
 	}
 
 
-	@Test   
+	//@Test   
 	public void testGetIdentityTypes() throws OrganizationException{
 		Set<String> identityTypes = defaultOrg.getIdentityTypes();
 		System.out.println("value of IdentityTypes:  " + identityTypes);
@@ -102,14 +102,14 @@ public class JU_DefaultOrg {
 	}
 
 
-	@Test   
+	//@Test   
 	public void testGetRealm() throws OrganizationException{
 		String realmTest = defaultOrg.getRealm();
 		System.out.println("value of realm:  " + realmTest);
 		assertTrue(realmTest == REALM);
 	}
 
-	@Test   
+	//@Test   
 	public void testGetName() throws OrganizationException{
 		String testName = defaultOrg.getName();
 		System.out.println("value of name:  " + testName);
@@ -117,7 +117,7 @@ public class JU_DefaultOrg {
 	}
 
 
-	@Test   
+	//@Test   
 	public void testGetDomain() throws OrganizationException{
 		String testDomain = defaultOrg.getDomain();
 		System.out.println("value of domain:  " + testDomain);
@@ -131,7 +131,7 @@ public class JU_DefaultOrg {
 	// 	assertNotNull(Result);	
 	// }
 
-	@Test
+	//@Test
 	public void notYetImplemented() {
 		fail("Tests in this file should not be trusted");
 	}
diff --git a/auth/auth-deforg/src/test/java/org/onap/aaf/org/test/JU_Identities.java b/auth/auth-deforg/src/test/java/org/onap/aaf/org/test/JU_Identities.java
index e32ce844..458d3b25 100644
--- a/auth/auth-deforg/src/test/java/org/onap/aaf/org/test/JU_Identities.java
+++ b/auth/auth-deforg/src/test/java/org/onap/aaf/org/test/JU_Identities.java
@@ -43,68 +43,68 @@ import org.onap.aaf.org.Identities.Data;
  *
  */
 public class JU_Identities {
-
-	private static final String DATA_IDENTITIES = "/opt/app/onap/data/identities.dat";
-	private static File fids;
-	private static Identities ids;
-	private static AuthzEnv env;
-
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@BeforeClass
-	public static void setUpBeforeClass() throws Exception {
-		env = new AuthzEnv();
-		AuthzTrans trans = env.newTransNoAvg();
-		// Note: utilize TimeTaken, from trans.start if you want to time.
-		fids = new File(DATA_IDENTITIES);
-		if(fids.exists()) {
-			ids = new Identities(fids);
-			ids.open(trans, 5000);
-		} else {
-			
-			throw new Exception("Data File for Tests, \"" + DATA_IDENTITIES 
-					+ "\" must exist before test can run. (Current dir is " + System.getProperty("user.dir") + ")");
-		}
-	}
-
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@AfterClass
-	public static void tearDownAfterClass() throws Exception {
-		AuthzTrans trans = env.newTransNoAvg();
-		if(ids!=null) {
-			ids.close(trans);
-		}
-	}
-
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@Before
-	public void setUp() throws Exception {
-	}
-
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@After
-	public void tearDown() throws Exception {
-	}
- 
-	@Test
-	public void test() throws IOException {
-		Reuse reuse = ids.reuse(); // this object can be reused within the same thread.
-		Data id = ids.find("osaaf",reuse);
-		Assert.assertNotNull(id);
-		System.out.println(id);
-
-		id = ids.find("mmanager",reuse);
-		Assert.assertNotNull(id);
-		System.out.println(id);
-
-		//TODO Fill out JUnit with Tests of all Methods in "Data id"
-	}
+//
+//	private static final String DATA_IDENTITIES = "/opt/app/onap/data/identities.dat";
+//	private static File fids;
+//	private static Identities ids;
+//	private static AuthzEnv env;
+//
+//	/**
+//	 * @throws java.lang.Exception
+//	 */
+//	@BeforeClass
+//	public static void setUpBeforeClass() throws Exception {
+//		env = new AuthzEnv();
+//		AuthzTrans trans = env.newTransNoAvg();
+//		// Note: utilize TimeTaken, from trans.start if you want to time.
+//		fids = new File(DATA_IDENTITIES);
+//		if(fids.exists()) {
+//			ids = new Identities(fids);
+//			ids.open(trans, 5000);
+//		} else {
+//			
+//			throw new Exception("Data File for Tests, \"" + DATA_IDENTITIES 
+//					+ "\" must exist before test can run. (Current dir is " + System.getProperty("user.dir") + ")");
+//		}
+//	}
+//
+//	/**
+//	 * @throws java.lang.Exception
+//	 */
+//	@AfterClass
+//	public static void tearDownAfterClass() throws Exception {
+//		AuthzTrans trans = env.newTransNoAvg();
+//		if(ids!=null) {
+//			ids.close(trans);
+//		}
+//	}
+//
+//	/**
+//	 * @throws java.lang.Exception
+//	 */
+//	@Before
+//	public void setUp() throws Exception {
+//	}
+//
+//	/**
+//	 * @throws java.lang.Exception
+//	 */
+//	@After
+//	public void tearDown() throws Exception {
+//	}
+// 
+//	@Test
+//	public void test() throws IOException {
+//		Reuse reuse = ids.reuse(); // this object can be reused within the same thread.
+//		Data id = ids.find("osaaf",reuse);
+//		Assert.assertNotNull(id);
+//		System.out.println(id);
+//
+//		id = ids.find("mmanager",reuse);
+//		Assert.assertNotNull(id);
+//		System.out.println(id);
+//
+//		//TODO Fill out JUnit with Tests of all Methods in "Data id"
+//	}
 
 }