Increased auth cmd to 53 percent

[aaf/authz.git] / auth / auth-cmd / src / test / java / org / onap / aaf / auth / cmd / test / JU_BaseCmd.java

diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_BaseCmd.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_BaseCmd.java
index 784634f..c071d95 100644 (file)
--- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_BaseCmd.java
+++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_BaseCmd.java
@@ -53,192 +53,68 @@ public class JU_BaseCmd {
        private static AAFcli cli;
        private static BaseCmd bCmd;
 
-//     @BeforeClass
-//     public static void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException {
-//             cli = JU_AAFCli.getAAfCli();
-//             bCmd = new BaseCmd<>(cli, "testString");
-//     }
-
-//     @Test
-//     public void exec() throws CadiException, APIException, LocatorException {
-//             assertEquals(bCmd._exec(4, "add", "del", "reset", "extend"), 0);
-//
-//     }
-//     
-//     @Test
-//     public void exec1() throws CadiException, APIException, LocatorException {
-//             assertEquals(bCmd._exec(0, "add", "del", "reset", "extend"), 0);
-//
-//     }
-
-//     @Test
-//     public void error() throws CadiException, APIException, LocatorException {
-//             boolean noError = true;
-//             Future<String> future = new Future<String>() {
-//
-//                     @Override
-//                     public boolean get(int timeout) throws CadiException {
-//                             // TODO Auto-generated method stub
-//                             return false;
-//                     }
-//
-//                     @Override
-//                     public int code() {
-//                             // TODO Auto-generated method stub
-//                             return 0;
-//                     }
-//
-//                     @Override
-//                     public String body() {
-//                             // TODO Auto-generated method stub
-//                             return "{%}";
-//                     }
-//
-//                     @Override
-//                     public String header(String tag) {
-//                             // TODO Auto-generated method stub
-//                             return null;
-//                     }
-//             };
-//             try {
-//                     //TODO: Gabe [JUnit] Not visible for junit
-//                     bCmd.error(future);
-//             } catch (Exception e) {
-//                     noError = false;
-//             }
-//             assertEquals(noError, true);
-//
-//     }
-//
-//
-//
-//     @Test
-//     public void activity() throws DatatypeConfigurationException {
-//             boolean noError = true;
-//             History history = new History();
-//             History.Item item = new History.Item();
-//             item.setTarget("target");
-//             item.setUser("user");
-//             item.setMemo("memo");
-//
-//             GregorianCalendar c = new GregorianCalendar();
-//             c.setTime(new Date());
-//             XMLGregorianCalendar date = DatatypeFactory.newInstance().newXMLGregorianCalendar(c);
-//             item.setTimestamp(date);
-//             history.getItem().add(item);
-//             try {
-//                     bCmd.activity(history, "history");
-//             } catch (Exception e) {
-//                     noError = false;
-//             }
-//             assertEquals(noError, true);
-//
-//     }
-//
-//     @Test
-//     public void activity1() throws DatatypeConfigurationException {
-//             boolean noError = true;
-//             History history = new History();
-//             History.Item item = new History.Item();
-//             item.setTarget("target");
-//             item.setUser("user");
-//             item.setMemo("memo");
-//
-//             GregorianCalendar c = new GregorianCalendar();
-//             c.setTime(new Date());
-//             XMLGregorianCalendar date = DatatypeFactory.newInstance().newXMLGregorianCalendar(c);
-//             item.setTimestamp(date);
-//             history.getItem().add(item);
-//             try {
-//                     bCmd.activity(history, "1[]");
-//             } catch (Exception e) {
-//                     noError = false;
-//             }
-//             assertEquals(noError, true);
-//
-//     }
-//     
-//
-//
-//     @Test
-//     public void error1() {
-//             boolean noError = true;
-//             Future<String> future = new Future<String>() {
-//
-//                     @Override
-//                     public boolean get(int timeout) throws CadiException {
-//                             // TODO Auto-generated method stub
-//                             return false;
-//                     }
-//
-//                     @Override
-//                     public int code() {
-//                             // TODO Auto-generated method stub
-//                             return 0;
-//                     }
-//
-//                     @Override
-//                     public String body() {
-//                             // TODO Auto-generated method stub
-//                             return "{<html><code>1</code></html>";
-//                     }
-//
-//                     @Override
-//                     public String header(String tag) {
-//                             // TODO Auto-generated method stub
-//                             return null;
-//                     }
-//             };
-//             try {
-//                     bCmd.error(future);
-//             } catch (Exception e) {
-//                     noError = false;
-//             }
-//             assertEquals(noError, true);
-//
-//     }
-
-//     @Test
-//     public void error2() {
-//             boolean noError = true;
-//             Future<String> future = new Future<String>() {
-//
-//                     @Override
-//                     public boolean get(int timeout) throws CadiException {
-//                             // TODO Auto-generated method stub
-//                             return false;
-//                     }
-//
-//                     @Override
-//                     public int code() {
-//                             // TODO Auto-generated method stub
-//                             return 0;
-//                     }
-//
-//                     @Override
-//                     public String body() {
-//                             // TODO Auto-generated method stub
-//                             return "other";
-//                     }
-//
-//                     @Override
-//                     public String header(String tag) {
-//                             // TODO Auto-generated method stub
-//                             return null;
-//                     }
-//             };
-//             try {
-//                     bCmd.error(future);
-//             } catch (Exception e) {
-//                     noError = false;
-//             }
-//             assertEquals(noError, true);
-//
-//     }
+       @BeforeClass
+       public static void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException {
+               cli = JU_AAFCli.getAAfCli();
+               bCmd = new BaseCmd<>(cli, "testString");
+       }
+
+       @Test
+       public void exec() throws CadiException, APIException, LocatorException {
+               assertEquals(bCmd._exec(4, "add", "del", "reset", "extend"), 0);
+
+       }
        
-       @Test                                           //TODO: Temporary fix AAF-111
-       public void netYetTested() {
-               assertTrue(true);
+       @Test
+       public void exec1() throws CadiException, APIException, LocatorException {
+               assertEquals(bCmd._exec(0, "add", "del", "reset", "extend"), 0);
+
+       }
+
+       @Test
+       public void activity() throws DatatypeConfigurationException {
+               boolean noError = true;
+               History history = new History();
+               History.Item item = new History.Item();
+               item.setTarget("target");
+               item.setUser("user");
+               item.setMemo("memo");
+
+               GregorianCalendar c = new GregorianCalendar();
+               c.setTime(new Date());
+               XMLGregorianCalendar date = DatatypeFactory.newInstance().newXMLGregorianCalendar(c);
+               item.setTimestamp(date);
+               history.getItem().add(item);
+               try {
+                       bCmd.activity(history, "history");
+               } catch (Exception e) {
+                       noError = false;
+               }
+               assertEquals(noError, true);
+
+       }
+
+       @Test
+       public void activity1() throws DatatypeConfigurationException {
+               boolean noError = true;
+               History history = new History();
+               History.Item item = new History.Item();
+               item.setTarget("target");
+               item.setUser("user");
+               item.setMemo("memo");
+
+               GregorianCalendar c = new GregorianCalendar();
+               c.setTime(new Date());
+               XMLGregorianCalendar date = DatatypeFactory.newInstance().newXMLGregorianCalendar(c);
+               item.setTimestamp(date);
+               history.getItem().add(item);
+               try {
+                       bCmd.activity(history, "1[]");
+               } catch (Exception e) {
+                       noError = false;
+               }
+               assertEquals(noError, true);
+
        }
 
 }