X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cmd%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcmd%2Ftest%2FJU_BaseCmd.java;h=92fdc8332cdbe6c41bf428a7c2b53abf2bd0cc4f;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=784634f9dfbaa6876b96ba7352cfee676c49ba67;hpb=a46f569038869c77dbf7d34059c8ab2ae720e102;p=aaf%2Fauthz.git

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 784634f9..92fdc833 100644
--- 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
@@ -7,9 +7,9 @@
  * * 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.
@@ -19,6 +19,7 @@
  * *
  * *
  ******************************************************************************/
+
 package org.onap.aaf.auth.cmd.test;
 
 import static org.junit.Assert.assertEquals;
@@ -50,195 +51,71 @@ import aaf.v2_0.History;
 @RunWith(MockitoJUnitRunner.class)
 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);
-//
-//	}
-	
-	@Test						//TODO: Temporary fix AAF-111
-	public void netYetTested() {
-		assertTrue(true);
-	}
+    private static AAFcli cli;
+    private static BaseCmd bCmd;
+
+    @BeforeClass
+    public static void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException, CadiException {
+        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 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);
+
+    }
 
 }