6 files changed, 1 insertions, 107 deletions
diff --git a/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java b/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java
deleted file mode 100644
index bedfa25..0000000
--- a/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START====================================================
- * * org.onap.aaf
- * * ===========================================================================
- * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * ===========================================================================
- * * Licensed under the Apache License, Version 2.0 (the "License");
- * * you may not use this file except in compliance with the License.
- * * You may obtain a copy of the License at
- * * 
- *  *      http://www.apache.org/licenses/LICENSE-2.0
- * * 
- *  * Unless required by applicable law or agreed to in writing, software
- * * distributed under the License is distributed on an "AS IS" BASIS,
- * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * * See the License for the specific language governing permissions and
- * * limitations under the License.
- * * ============LICENSE_END====================================================
- * *
- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * *
- ******************************************************************************/
-package org.onap.aaf.cadi.aaf.cass.test;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.cassandra.auth.AuthenticatedUser;
-import org.apache.cassandra.auth.IResource;
-import org.apache.cassandra.auth.Permission;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.aaf.cadi.aaf.cass.AAFAuthenticator;
-import org.onap.aaf.cadi.aaf.cass.AAFAuthorizer;
-
-public class JU_CASS {
-
-	private static AAFAuthenticator aa;
-	private static AAFAuthorizer an;
-
-	@BeforeClass
-	public static void setUpBeforeClass() throws Exception {
-		System.setProperty("cadi_prop_files", "etc/cadi.properties");
-		
-		aa = new AAFAuthenticator();
-		an = new AAFAuthorizer();
-
-		aa.setup();
-		an.setup(); // does nothing after aa.
-		
-		aa.validateConfiguration();
-		
-	}
-
-	@AfterClass
-	public static void tearDownAfterClass() throws Exception {
-	}
-
-	@Test
-	public void test() throws Exception {
-			Map<String,String> creds = new HashMap<String,String>();
-			creds.put("username", "XXX@NS");
-			creds.put("password", "enc:???");
-			AuthenticatedUser aaf = aa.authenticate(creds);
-
-			// Test out "aaf_default_domain
-			creds.put("username", "XX");
-			aaf = aa.authenticate(creds);
-			
-			IResource resource = new IResource() {
-				public String getName() {
-					return "data/authz";
-				}
-
-				public IResource getParent() {
-					return null;
-				}
-
-				public boolean hasParent() {
-					return false;
-				}
-
-				public boolean exists() {
-					return true;
-				}
-				
-			};
-			
-			Set<Permission> perms = an.authorize(aaf, resource);
-			
-			// Test out "AAF" access
-			creds.put("username", "XXX@NS");
-			creds.put("password", "enc:???");
-			aaf = aa.authenticate(creds);
-			perms = an.authorize(aaf, resource);
-			Assert.assertFalse(perms.isEmpty());
-
-			perms = an.authorize(aaf, resource);
-			Assert.assertFalse(perms.isEmpty());
-			
-	}
-
-}
diff --git a/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/AAFAuthenticatedUserTest.java b/cass/src/test/java/org/onap/aaf/cass/AAFAuthenticatedUserTest.java
index f52c5e4..f52c5e4 100644
--- a/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/AAFAuthenticatedUserTest.java
+++ b/cass/src/test/java/org/onap/aaf/cass/AAFAuthenticatedUserTest.java
diff --git a/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/AAFAuthenticatorTest.java b/cass/src/test/java/org/onap/aaf/cass/AAFAuthenticatorTest.java
index 2ade2dc..2ade2dc 100644
--- a/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/AAFAuthenticatorTest.java
+++ b/cass/src/test/java/org/onap/aaf/cass/AAFAuthenticatorTest.java
diff --git a/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/AAFAuthorizerTest.java b/cass/src/test/java/org/onap/aaf/cass/AAFAuthorizerTest.java
index 42673ef..42673ef 100644
--- a/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/AAFAuthorizerTest.java
+++ b/cass/src/test/java/org/onap/aaf/cass/AAFAuthorizerTest.java
diff --git a/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/AAFBaseTest.java b/cass/src/test/java/org/onap/aaf/cass/AAFBaseTest.java
index db9f256..db9f256 100644
--- a/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/AAFBaseTest.java
+++ b/cass/src/test/java/org/onap/aaf/cass/AAFBaseTest.java
diff --git a/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java b/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java
index f5ee310..bedfa25 100644
--- a/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java
+++ b/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package org.onap.aaf.cass;
+package org.onap.aaf.cadi.aaf.cass.test;
 
 import java.util.HashMap;
 import java.util.Map;