Batch work and client

Issue-ID: AAF-740
Change-Id: I16da4f2a87ec5d19590f0af642b91f9e2e02b246
Signed-off-by: Instrumental <jonathan.gathman@att.com>

3 files changed, 3 insertions, 100 deletions

diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java
index 4861696b..05a41667 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java
@@ -77,9 +77,9 @@ public class JU_Cred {
         prop = new PropAccess();
         prop.setProperty(Config.AAF_ROOT_NS, "org.onap.aaf");
         prop.setProperty(Config.AAF_ROOT_COMPANY,"test");
-        define.set(prop);
+        Define.set(prop);
         
-        instance = new Instance(12, date, integer, 125642678910L,"234",1,"");
+        instance = new Instance(12, date, integer, 125642678910L,"234");
         cred = new Cred("myid1234@aaf.att.com");
     }
     
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java
index 4ed167e9..5b337d52 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java
@@ -36,7 +36,7 @@ public class JU_ExpireRange {
 		
 		Set<String> names=expRange.names();
 		assertTrue(names.contains("OneMonth"));
-		assertTrue(names.contains("CredOneWeek"));
+		assertTrue(names.contains("OneWeek"));
 		assertTrue(names.contains("Delete"));
 		assertFalse(names.contains(null));
 		assertFalse(names.contains("bogus"));
diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MiscID.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MiscID.java
deleted file mode 100644
index d8a2682c..00000000
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MiscID.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * ============LICENSE_START====================================================
- * org.onap.aaf
- * ===========================================================================
- * Copyright (c) 2018 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====================================================
- *
- */
-
-package org.onap.aaf.auth.batch.helpers.test;
-
-import static org.junit.Assert.*;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.onap.aaf.auth.batch.BatchException;
-import org.onap.aaf.auth.batch.helpers.MiscID;
-
-import com.datastax.driver.core.Row;
-
-import junit.framework.Assert;
-
-import static org.mockito.Mockito.*;
-import org.junit.Test;
-
-public class JU_MiscID {
-    
-    MiscID miscId;
-    
-    @Before
-    public void setUp() {
-        miscId = new MiscID();
-    }
-    
-    @Test
-    public void testRowSet() {
-        Row row = mock(Row.class);
-        miscId.set(row);
-    }
-    
-    @Test
-    public void testStringSet() throws BatchException {
-        String[] strArr = {"id", "sponsor", "created", "renewal"};
-        miscId.set(strArr);
-    }
-    
-    @Test
-    public void testHashcode() throws BatchException {
-        String[] strArr = {"id", "sponsor", "created", "renewal"};
-        miscId.set(strArr);
-        Assert.assertEquals(3355, miscId.hashCode());
-    }
-    
-    @Test
-    public void testEquals() throws BatchException {
-        String[] strArr = {"id", "sponsor", "created", "renewal"};
-        miscId.set(strArr);
-        Assert.assertFalse(miscId.equals("id"));
-        Assert.assertTrue(miscId.equals(miscId));
-    }
-    
-    @Test
-    public void testInsertStmt() throws IllegalArgumentException, IllegalAccessException {
-        String expected = "INSERT INTO authz.miscid (id,created,sponsor,renewal) VALUES ('null','null','null','null')";
-        String result = miscId.insertStmt().toString();
-        Assert.assertEquals(expected, result);
-    }
-    
-    @Test
-    public void testUpdateStmt() throws IllegalArgumentException, IllegalAccessException, BatchException {
-        String expected = "UPDATE authz.miscid SET sponser='sponsor1',created='created1',renewal='renewal1' WHERE id='id'";
-        String[] strArr = {"id", "sponsor", "created", "renewal"};
-        miscId.set(strArr);
-        MiscID miscId1 = new MiscID();
-        String[] strArr1 = {"id", "sponsor1", "created1", "renewal1"};
-        miscId1.set(strArr1);        
-        StringBuilder result = miscId.updateStmt(miscId1);
-
-        Assert.assertEquals(expected, result.toString());
-    }
-
-
-}