Improve JUnit test coverage 53/41953/1
authorIanHowell <ian.howell@att.com>
Fri, 6 Apr 2018 14:57:16 +0000 (09:57 -0500)
committerIanHowell <ian.howell@att.com>
Tue, 10 Apr 2018 15:49:25 +0000 (10:49 -0500)
* Fixed a typo in DenialOfServiceTaf
* Added a JUnit for DenialOfServiceTaf
* Cleaned up JU_Cached, JU_AuthzEnv (WIP)

Issue-ID: AAF-128
Change-Id: I76ace8aff3f72538f40068f6cc9c80f24aee7403
Signed-off-by: IanHowell <ian.howell@att.com>
Increase coverage in cadi/client and cadi/core

Get coverage for Holder, NulTaf, and NullTafResp to 100%

Issue-ID: AAF-128
Change-Id: Ica83c29311801d499f922ccb4c33fb7f4e58f686
Signed-off-by: IanHowell <ian.howell@att.com>
Improve coverage of the Tafs

Issue-ID: AAF-128
Change-Id: I07f9ebee0a64c598047e74801a266898107783f7
Signed-off-by: IanHowell <ian.howell@att.com>
Improve test coverage of XReader

Issue-ID: AAF-128
Change-Id: I9b369b803743166027170b4a8ca50bd337e45b7b
Signed-off-by: IanHowell <ian.howell@att.com>
Improve coverage of GreatCircle

Issue-ID: AAF-128
Change-Id: Id5e41a481db1106d050fb216664c1aa1e07cef2a
Signed-off-by: IanHowell <ian.howell@att.com>
Suppress test output

Issue-ID: AAF-128
Change-Id: I7a7afe7617c81403d27baf89353f175d9cead165
Signed-off-by: IanHowell <ian.howell@att.com>
Move JU_DNSLocator to the correct package

Change-Id: Ic8feddf7444afcaaaa252a40d340116597533f46
Signed-off-by: IanHowell <ian.howell@att.com>
17 files changed:
auth/auth-cass/src/test/java/org/onap/aaf/auth/dao/JU_Cached.java
auth/auth-core/src/test/java/org/onap/aaf/auth/env/test/JU_AuthzEnv.java
auth/auth-core/test/keyfile [new file with mode: 0644]
cadi/client/src/test/java/org/onap/aaf/cadi/client/test/JU_GreatCircle.java [deleted file]
cadi/client/src/test/java/org/onap/aaf/cadi/client/test/JU_Holder.java [moved from cadi/client/src/test/java/org/onap/aaf/client/test/JU_DNSLocator.java with 65% similarity]
cadi/client/src/test/java/org/onap/aaf/cadi/locator/test/JU_DNSLocator.java [moved from cadi/client/src/test/java/org/onap/aaf/cadi/client/test/JU_DNSLocator.java with 100% similarity]
cadi/client/src/test/java/org/onap/aaf/cadi/routing/test/JU_GreatCircle.java [new file with mode: 0644]
cadi/client/src/test/java/org/onap/aaf/client/test/JU_HolderTest.java [deleted file]
cadi/core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTaf.java
cadi/core/src/test/java/org/onap/aaf/cadi/test/JU_Symm.java
cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_EpiTaf.java [new file with mode: 0644]
cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_NullTaf.java [new file with mode: 0644]
cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_PuntTafResp.java [moved from cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_NullTafRespTest.java with 62% similarity]
cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_TrustNotTafResp.java [new file with mode: 0644]
cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_TrustTafResp.java [new file with mode: 0644]
cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/dos/JU_DenialOfServiceTaf.java [new file with mode: 0644]
cadi/core/src/test/java/org/onap/aaf/cadi/test/wsse/JU_XReader.java

index 22f9a6f..e942f3f 100644 (file)
 package org.onap.aaf.auth.dao;
 
 import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.mockito.Mockito.*;
+import org.junit.*;
+import org.mockito.*;
+// import org.junit.runner.RunWith;
+// import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.util.Date;
 import java.util.List;
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.Timer;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.onap.aaf.auth.cache.Cache;
 import org.onap.aaf.auth.cache.Cache.Dated;
 import org.onap.aaf.auth.dao.CIDAO;
 import org.onap.aaf.auth.dao.Cached;
 import org.onap.aaf.auth.dao.Cached.Getter;
+import org.onap.aaf.auth.dao.JU_Cached.DataStub;
+import org.onap.aaf.auth.dao.cass.CacheableData;
 import org.onap.aaf.auth.env.AuthzEnv;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.Trans;
-import org.powermock.modules.junit4.PowerMockRunner;
 
-@RunWith(PowerMockRunner.class)
+// @RunWith(PowerMockRunner.class)
 public class JU_Cached {
-       Cached cached;
+
        @Mock
        CIDAO<Trans> ciDaoMock;
+
        @Mock
        AuthzEnv authzEnvMock;
+
        @Mock
        CIDAO<AuthzTrans> cidaoATMock;
        
        String name = "nameString";
-       
+
        @Before
        public void setUp(){
-               cached = new Cached(ciDaoMock, name, (int)0, 30000L);
+               MockitoAnnotations.initMocks(this);
        }
        
-       @Test(expected=ArithmeticException.class)
+       @Test
        public void testCachedIdx(){
-               int Result = cached.cacheIdx("1234567890");             
+               Cached<Trans, DataStub> cached = new Cached<Trans, DataStub>(ciDaoMock, name, 1, 30000L);
+               assertThat(cached.cacheIdx("1234567890"), is(0));
        }
        
-       @Test(expected=ArithmeticException.class)
+       @Test
        public void testInvalidate(){
-               int Res = cached.invalidate(name);
+               Cached<Trans, DataStub> cached = new Cached<Trans, DataStub>(ciDaoMock, name, 5, 30000L);
+               cached.add("test", new ArrayList<DataStub>());
+               cached.invalidate("test");
+               cached.invalidate("test1");
        }
        
        @SuppressWarnings("static-access")
        @Test
        public void testStopTimer(){
+               Cached<Trans, DataStub> cached = new Cached<Trans, DataStub>(ciDaoMock, name, 1, 30000L);
                cached.stopTimer();
                assertTrue(true);
        }
@@ -80,6 +91,7 @@ public class JU_Cached {
        @SuppressWarnings("static-access")
        @Test
        public void testStartRefresh(){
+               Cached<Trans, DataStub> cached = new Cached<Trans, DataStub>(ciDaoMock, name, 1, 30000L);
                cached.startRefresh(authzEnvMock, cidaoATMock);
                assertTrue(true);
        }
@@ -121,4 +133,8 @@ public class JU_Cached {
 //             }
 //             return rld;
 //     }
+
+       class DataStub extends CacheableData {
+               @Override public int[] invalidate(Cached<?, ?> cache) { return null; }
+       }
 }
index 6413b09..8630aad 100644 (file)
  ******************************************************************************/
 package org.onap.aaf.auth.env.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
+import org.junit.*;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.PrintStream;
+import java.io.ByteArrayOutputStream;
 import java.util.Properties;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.onap.aaf.auth.env.AuthzEnv;
 import org.onap.aaf.cadi.Access;
 import org.onap.aaf.cadi.PropAccess;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.onap.aaf.cadi.config.Config;
 
-import junit.framework.Assert;
-
-@RunWith(PowerMockRunner.class)
 public class JU_AuthzEnv {
-       private static final org.onap.aaf.cadi.Access.Level DEBUG = null;
+
        AuthzEnv authzEnv;
-       enum Level {DEBUG, INFO, AUDIT, INIT, WARN, ERROR};
+
+       ByteArrayOutputStream outStream;
+       ByteArrayOutputStream errStream;
 
        @Before
-       public void setUp(){
-               PropAccess access = null;
-               Properties props = null;
+       public void setUp() {
+               outStream = new ByteArrayOutputStream();
+               errStream = new ByteArrayOutputStream();
+
+               System.setOut(new PrintStream(outStream));
+               System.setErr(new PrintStream(errStream));
+
                authzEnv = new AuthzEnv();
+       }
+
+       @After
+       public void tearDown() {
+               System.setOut(System.out);
+               System.setErr(System.err);
+       }
+
+       @Test
+       @SuppressWarnings("unused")
+       public void testConstructors() {
                AuthzEnv authzEnv1 = new AuthzEnv("Test");
-               AuthzEnv authzEnv2 = new AuthzEnv(props);
-               AuthzEnv authzEnv3 = new AuthzEnv(access);
+               AuthzEnv authzEnv2 = new AuthzEnv((PropAccess)null);
+               AuthzEnv authzEnv3 = new AuthzEnv((Properties)null);
        }
 
        @Test
        public void testTransRate() {
-       Long Result =   authzEnv.transRate();
-       assertNotNull(Result);
+               Long Result = authzEnv.transRate();
+               assertNotNull(Result);
        }
 
        @Test
        public void checkNewTransNoAvg() {
-
-               Assert.assertNotNull(authzEnv.newTransNoAvg());
+               assertNotNull(authzEnv.newTransNoAvg());
        }
 
        @Test
        public void checkNewTrans() {
-               Assert.assertNotNull(authzEnv.newTrans());
+               assertNotNull(authzEnv.newTrans());
        }
 
        @Test
        public void checkPropAccess() {
-               Assert.assertNotNull(authzEnv.access());
+               assertNotNull(authzEnv.access());
        }
 
        @Test
        public void checkgetProperties() { //TODO:[GABE]No setter for this, add?
-               Assert.assertNotNull(authzEnv.getProperties());
-               Assert.assertNotNull(authzEnv.getProperties("test"));
+               assertNotNull(authzEnv.getProperties());
+               assertNotNull(authzEnv.getProperties("test"));
        }
 
        @Test
        public void checkPropertyGetters(){
                authzEnv.setProperty("key","value");
-               Assert.assertEquals(authzEnv.getProperty("key"), "value");
-               Assert.assertEquals(authzEnv.getProperty("key","value"), "value");
+               assertEquals(authzEnv.getProperty("key"), "value");
+               assertEquals(authzEnv.getProperty("key","value"), "value");
        }
 
        @Test
        public void checkPropertySetters(){
-               Assert.assertEquals(authzEnv.getProperty("key","value"), authzEnv.setProperty("key","value"));
+               assertEquals(authzEnv.getProperty("key","value"), authzEnv.setProperty("key","value"));
        }
 
-//     @Test(expected = IOException.class)                             //TODO: AAF-111 make fail not happen
-//     public void testDecryptException() throws IOException{
-//             String encrypted = "enc:";
-//             authzEnv.setProperty(Config.CADI_KEYFILE, "test");//TODO: Figure out setter for this
-//             authzEnv.decrypt(encrypted, true);
-//             authzEnv.decrypt("", false);            //TODO: AAF-111 fail without logging a fail
-//     }
+       @Test(expected = IOException.class)
+       public void testDecryptException() throws IOException{
+               authzEnv.setProperty(Config.CADI_KEYFILE, "test/keyfile");
+               authzEnv.decrypt(null, false);
+       }
 
        @Test
        public void testDecrypt() throws IOException{
@@ -114,7 +124,7 @@ public class JU_AuthzEnv {
        public void testClassLoader() {
                ClassLoader cLoad = mock(ClassLoader.class);
                cLoad = authzEnv.classLoader();
-               Assert.assertNotNull(cLoad);
+               assertNotNull(cLoad);
        }
 
        @Test
@@ -149,10 +159,9 @@ public class JU_AuthzEnv {
                Access.Level lvl = Access.Level.DEBUG;
                Access.Level lvl1 = Access.Level.AUDIT;
                boolean test = authzEnv.willLog(lvl);
-               Assert.assertFalse(test);
+               assertFalse(test);
                test = authzEnv.willLog(lvl1);
-               Assert.assertTrue(test);
-
+               assertTrue(test);
        }
 
        @Test
diff --git a/auth/auth-core/test/keyfile b/auth/auth-core/test/keyfile
new file mode 100644 (file)
index 0000000..e84bd61
--- /dev/null
@@ -0,0 +1,27 @@
+9zgJxUXT1CrzC_A2Z0PdKi3n9l6zmErB26ZlSXCCyloxi3bGqD3lNHC3aFHfgC8-ZwNMuLBM93WY
+JV4sEacNodHGjgmAqSVyMHiPTEP4XRrydfjXAvaBIERcU1Yvu4pa4Mq25RXLHt8tIAnToFVbq82n
+bjkfdcv2-shgwkEvRiNIdK5TITO8JTvTRWND5MqXc9gnCKkR6Rl5dU5QGIB2SxWOPCvKBBWeUGRO
+bSinrjkI-iXabuLOYUaGo6FI_XAU5S9WxvfrDVpBijUAGJW8QZe1oBIo5QmQlx6ONB4ohjEu89ZZ
+gTee22MvSNUvaT8IGbj_Zt_TyuCqcdmkVahWp5ffeK2J3bmHActAC2IxXD4yV-sFLB7PW7I8KMA7
+tML3Lcy9ozmYa2E8N8B9uQ0zMHz_TVpPvj5xkVF4_FEKOTD1mkf-JYC1CyzwJS2YWWxO6fqsxIjD
+1qB4OJudv4RK6hSxdVrNxc_wchVAGXVD6ulm8UPBGP_wpfItP8BGYwCHlOjUrZofewKB2Aa9Uk9m
+oyk309WmPVBeRzZ0vRlXUp8jhKlAPISvv8CBbG-6SuXAszY2qedgd3huYKNreVN-xMZM2hnYbEUW
+0sdcqpFqIV039Awfwjn5sZPFW4iT3yWhxib1PwFzwfaXnrwgwbLAda68mRDAWCrsDRu11IiQJqb7
+cjNLYBOGDVhX7jeUyBJUzW-xhl__DsoCZSqP39vFoPtglXHlQNtVqQ8d96mu_QMY5bcuhevI4RQ_
+SD7WcRyAiUztiC4Eb6BYwld0RITdB1-Y43jkZlfA8Ej5Zw8sX_-2J2hKdDPT4KrTYWA5T6wiIJK9
+lxIc39wGHpxQ4kz8gx0VeqRU2hgHVKovuaEvBnwv8JW3qeuowaUmiPi7UuIRwi4pFX5iQv62yrfO
+5Z6EXBDVI8Ikq4UTu70vX_bCuXHtvqm97PFh2KXjBHS--iNVQ5GhnDKKv_Fd4naQjCSwTTgtxD4X
+ASgLSSETGJ8wAjWHOWUuVT4jUDFIQwunNaH6y2NaDWA0tkO74oYaQIL_-kd9ChGLzGL389v8BV2X
+oaw70W9L3-OOtzAz-hACbOtbbMkx2bVMmS8QhjYg-_2bpwSb8NR322pQ9AodFTU4x5HrLoERk2Rw
+hRExZP7K-_idMJUGLF9gJFFS01UyBLijyWGyN0teQleXgn6IzZk7dH9roddoe9IacjiV7XfE4i1U
+rVNTRKiDdHSX02KGOihs_j-Tf0PYsz0wEeACINA5MafGzc9x2b8yMzBxwPHxRszjL4dymCoLXRI5
+srLsWk2Jwtp9meW8jhkoAi5xUKzLiYIhEohIX3eEEA0O0wuK0fzcMB7IbyTYYazawUKmUXZ94OLu
+Fmb-UaAEvU-9U4O3DNfbDN2ELxUHmWaqNqpGl1IV0ZxGrKNZi9Rga9-_vfVGcoVMD7vZOhiZddc9
+WRlom3tQZRx2Sm42baNH8wS34J0KuUYPcjQ-1_GEJxcH0hv6hzSm4is7mUdnyB95g1UohKdQOfaY
+tOdHlXbu2zG6SyPaYyQFfQbMPwBn-hx_7bYj9Px-EhYeMpBIP8X98jkd3BlWY4sdWqxsQfAb5pml
+cnDRynHag2XxLqttAWSwru_owfeXzmYsPD-PINRu-Csjzlbdhq73amTFN-U8mYA09dlCck2fW8qo
+mAXLkVlboVaPuem6WvfSd93ZinsB5Wi5RX6RQxeHeo88cWrJ11Au14J8xFlurcZwdSjO4dsnZj_D
+ry0uKWsyNoLogBuDansiNGGO8-1qsyRxVp3zbxOMQmPouN6l0ZfxQdACqX8_4HTD7NMNMnLYjPjC
+4YfOUx4pQMdjzno05vuF5zY-UQ3SN7HkmXsF6tVJdt15cmtLFetD5LTbvdRr1eeHWuwD4-aJQx4T
+SdOLQ3zHeMnNFsxR_xKsu4AGjcC2-TpGixmA1kJtYBm1WIGoxQ6N4rneEo-82yvKwYst9-DJcV6x
+xy1dpJqtx3I7M6DqPVURomeh2czO6UMRPVIQ1ltj4E27_FWFsWC38ZyR4nFimovFLJNCzy2k
\ No newline at end of file
diff --git a/cadi/client/src/test/java/org/onap/aaf/cadi/client/test/JU_GreatCircle.java b/cadi/client/src/test/java/org/onap/aaf/cadi/client/test/JU_GreatCircle.java
deleted file mode 100644 (file)
index d2e02cb..0000000
+++ /dev/null
@@ -1,62 +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.cadi.client.test;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.aaf.cadi.routing.GreatCircle;
-
-public class JU_GreatCircle {
-
-       @BeforeClass
-       public static void setUpBeforeClass() throws Exception {
-       }
-
-       @AfterClass
-       public static void tearDownAfterClass() throws Exception {
-       }
-
-       @Before
-       public void setUp() throws Exception {
-       }
-
-       @After
-       public void tearDown() throws Exception {
-       }
-
-       @Test
-       public void test() {
-               Assert.assertEquals(7.803062505568182,GreatCircle.calc(38.627345,-90.193774, 35.252234,-81.384929),0.000000001);
-               Assert.assertEquals(0.0,GreatCircle.calc(38.627345,-90.193774, 38.627345,-90.193774),0.000000001);
-               Assert.assertEquals(7.803062505568182,GreatCircle.calc(35.252234,-81.384929,38.627345,-90.193774),0.000000001);
-               Assert.assertEquals(7.803062505568182,GreatCircle.calc(38.627345,-90.193774, 35.252234,-81.384929),0.000000001);
-               Assert.assertEquals(7.803062505568182,GreatCircle.calc(-38.627345,90.193774, -35.252234,81.384929),0.000000001);
-               Assert.assertEquals(105.71060033936052,GreatCircle.calc(-38.627345,90.193774, -35.252234,-81.384929),0.000000001);
-               Assert.assertEquals(105.71060033936052,GreatCircle.calc(38.627345,-90.193774, 35.252234,81.384929),0.000000001);
-               Assert.assertEquals(74.32786874922931,GreatCircle.calc(-38.627345,90.193774, 35.252234,81.384929),0.000000001);
-       }
-
-}
  * *
  * *
  ******************************************************************************/
-package org.onap.aaf.client.test;
+package org.onap.aaf.cadi.client.test;
 
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.junit.AfterClass;
+import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
 import org.junit.Test;
-import org.onap.aaf.cadi.PropAccess;
-import org.onap.aaf.cadi.Locator.Item;
-import org.onap.aaf.cadi.locator.DNSLocator;
 
-public class JU_DNSLocator {
+import org.onap.aaf.cadi.client.Holder;
 
-       @AfterClass
-       public static void tearDownAfterClass() throws Exception {
-       }
+public class JU_Holder {
 
        @Test
        public void test() {
+               String str1 = "a string";
+               String str2 = "another string";
+               Holder<String> holder = new Holder<String>(str1);
+               assertThat(holder.get(), is(str1));
+               assertThat(holder.toString(), is(str1));
                
-               DNSLocator dl = new DNSLocator(new PropAccess(), "https", "aaf.it.att.com","8150-8152");
-               try {
-                       Item item = dl.best();
-                       URI uri = dl.get(item);
-                       URL url = uri.toURL();
-                       URLConnection conn = url.openConnection();
-                       conn.connect();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
+               holder.set(str2);
+               assertThat(holder.get(), is(str2));
+               assertThat(holder.toString(), is(str2));
        }
 
 }
diff --git a/cadi/client/src/test/java/org/onap/aaf/cadi/routing/test/JU_GreatCircle.java b/cadi/client/src/test/java/org/onap/aaf/cadi/routing/test/JU_GreatCircle.java
new file mode 100644 (file)
index 0000000..f492d4a
--- /dev/null
@@ -0,0 +1,79 @@
+/**
+ * ============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.cadi.routing.test;
+
+import static org.junit.Assert.*;
+import org.junit.*;
+
+import org.onap.aaf.cadi.routing.GreatCircle;
+
+public class JU_GreatCircle {
+
+       @BeforeClass
+       public static void setUpBeforeClass() throws Exception {
+       }
+
+       @AfterClass
+       public static void tearDownAfterClass() throws Exception {
+       }
+
+       @Before
+       public void setUp() throws Exception {
+       }
+
+       @After
+       public void tearDown() throws Exception {
+       }
+
+       @Test
+       public void calc1Test() {
+               assertEquals(7.803062505568182, GreatCircle.calc(38.627345, -90.193774, 35.252234, -81.384929), 0.000000001);
+               assertEquals(0.0, GreatCircle.calc(38.627345, -90.193774, 38.627345, -90.193774), 0.000000001);
+               assertEquals(7.803062505568182, GreatCircle.calc(35.252234, -81.384929, 38.627345, -90.193774), 0.000000001);
+               assertEquals(7.803062505568182, GreatCircle.calc(38.627345, -90.193774, 35.252234, -81.384929), 0.000000001);
+               assertEquals(7.803062505568182, GreatCircle.calc(-38.627345, 90.193774, -35.252234, 81.384929), 0.000000001);
+               assertEquals(105.71060033936052, GreatCircle.calc(-38.627345, 90.193774, -35.252234, -81.384929), 0.000000001);
+               assertEquals(105.71060033936052, GreatCircle.calc(38.627345, -90.193774, 35.252234, 81.384929), 0.000000001);
+               assertEquals(74.32786874922931, GreatCircle.calc(-38.627345, 90.193774, 35.252234, 81.384929), 0.000000001);
+       }
+
+       @Test
+       public void calc2Test() {
+               assertEquals(7.803062505568182, GreatCircle.calc(new String[] {"38.627345", "-90.193774", "35.252234", "-81.384929"}), 0.000000001);
+               assertEquals(7.803062505568182, GreatCircle.calc(new String[] {"38.627345,-90.193774", "35.252234,-81.384929"}), 0.000000001);
+               assertEquals(7.803062505568182, GreatCircle.calc(new String[] {"38.627345,-90.193774,35.252234,-81.384929"}), 0.000000001);
+
+               assertEquals(-1, GreatCircle.calc(new String[0]), 0.000000001);
+               assertEquals(-1, GreatCircle.calc(new String[] {"38.627345;-90.193774", "35.252234,-81.384929"}), 0.000000001);
+               assertEquals(-1, GreatCircle.calc(new String[] {"38.627345,-90.193774", "35.252234;-81.384929"}), 0.000000001);
+               assertEquals(-1, GreatCircle.calc(new String[] {"38.627345,-90.193774;35.252234,-81.384929"}), 0.000000001);
+
+               assertEquals(-1, GreatCircle.calc(new String[] {"Invalid input", "Invalid input", "Invalid input", "Invalid input"}), 0.000000001);
+       }
+
+       @Test
+       public void coverageTest() {
+               @SuppressWarnings("unused")
+               GreatCircle gc = new GreatCircle();
+       }
+
+}
diff --git a/cadi/client/src/test/java/org/onap/aaf/client/test/JU_HolderTest.java b/cadi/client/src/test/java/org/onap/aaf/client/test/JU_HolderTest.java
deleted file mode 100644 (file)
index 51d7dd1..0000000
+++ /dev/null
@@ -1,79 +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====================================================
- * *
- * *
- ******************************************************************************/
-package org.onap.aaf.client.test;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-import org.onap.aaf.cadi.client.Holder;
-
-import static org.junit.Assert.*;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class JU_HolderTest {
-
-       @Test
-       public void testSet() {
-               Holder<String> holder = new Holder<String>("StringHolder");
-               assertEquals(holder.get(), "StringHolder");
-               
-               holder.set("New String");
-               assertEquals(holder.get(), "New String");
-       }
-
-       @Test
-       public void testSet4() {
-               Holder<String> holder = new Holder<String>("StringHolder");
-               assertEquals(holder.get(), "StringHolder");
-               
-               holder.set("New String1");
-               assertEquals(holder.get(), "New String1");
-       }
-       @Test
-       public void testSet1() {
-               Holder<String> holder = new Holder<String>("StringHolder");
-               assertEquals(holder.get(), "StringHolder");
-               
-               holder.set("New String2");
-               assertEquals(holder.get(), "New String2");
-       }
-       
-       @Test
-       public void testSet2() {
-               Holder<String> holder = new Holder<String>("StringHolder");
-               assertEquals(holder.get(), "StringHolder");
-               
-               holder.set("New String3");
-               assertEquals(holder.get(), "New String3");
-       }
-       
-       @Test
-       public void testSet3() {
-               Holder<String> holder = new Holder<String>("StringHolder");
-               assertEquals(holder.get(), "StringHolder");
-               
-               holder.set("New String4");
-               assertEquals(holder.get(), "New String4");
-       }
-}
index 1f6391f..44a3a4a 100644 (file)
@@ -110,8 +110,8 @@ public class DenialOfServiceTaf implements HttpTaf {
         *  
         */
        public static Counter isDeniedIP(String ipvX) {
-               if(deniedID!=null) {
-                       return deniedID.get(ipvX);
+               if(deniedIP!=null) {
+                       return deniedIP.get(ipvX);
                }
                return null;
        }
index 34f528f..57cc222 100644 (file)
  ******************************************************************************/
 package org.onap.aaf.cadi.test;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+import java.lang.reflect.*;
+import org.junit.*;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 import java.util.Arrays;
 
-import java.lang.reflect.*;
-import org.junit.Before;
-import org.junit.Test;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.Symm;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
 public class JU_Symm {
        private Symm defaultSymm;
 
+       private ByteArrayOutputStream outStream;
+
        @Before
        public void setup() throws Exception {
-       defaultSymm = new Symm(
-                       "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray()
-                       ,76, "Use default!" ,true);
+               defaultSymm = new Symm(
+                               "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray()
+                               ,76, "Use default!" ,true);
+               outStream = new ByteArrayOutputStream();
+               System.setOut(new PrintStream(outStream));
+       }
+
+       @After
+       public void tearDown() {
+               System.setOut(System.out);
        }
 
        @Test
diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_EpiTaf.java b/cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_EpiTaf.java
new file mode 100644 (file)
index 0000000..baab0b6
--- /dev/null
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * ============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====================================================
+ * *
+ * *
+ ******************************************************************************/
+package org.onap.aaf.cadi.test.taf;
+
+import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+import org.junit.*;
+
+import java.io.IOException;
+
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.Taf;
+import org.onap.aaf.cadi.taf.TafResp;
+import org.onap.aaf.cadi.taf.TafResp.RESP;
+
+import org.onap.aaf.cadi.taf.EpiTaf;
+import org.onap.aaf.cadi.taf.NullTaf;
+import org.onap.aaf.cadi.Taf.LifeForm;
+import org.onap.aaf.cadi.principal.TaggedPrincipal;
+
+public class JU_EpiTaf {
+
+       @Test(expected = CadiException.class)
+       @SuppressWarnings("unused")
+       public void constructorTest() throws CadiException {
+               EpiTaf et = new EpiTaf();
+       }
+
+       @Test
+       public void validateTryAnotherTest() throws CadiException {
+               EpiTaf et = new EpiTaf(new TryAnotherTaf());
+               TafResp output = et.validate(LifeForm.CBLF);
+               assertThat(output.isAuthenticated(), is(RESP.NO_FURTHER_PROCESSING));
+       }
+
+       @Test
+       public void validateTryAuthenticatingTest() throws CadiException {
+               EpiTaf et = new EpiTaf(new TryAuthenticatingTaf(), new TryAuthenticatingTaf());
+               TafResp output = et.validate(LifeForm.CBLF);
+               assertThat(output.isAuthenticated(), is(RESP.TRY_AUTHENTICATING));
+               output = et.validate(LifeForm.CBLF);
+               assertThat(output.isAuthenticated(), is(RESP.TRY_AUTHENTICATING));
+       }
+
+       @Test
+       public void validateDefaultCaseTest() throws CadiException {
+               EpiTaf et = new EpiTaf(new NullTaf());
+               TafResp output = et.validate(LifeForm.CBLF);
+               assertThat(output.isAuthenticated(), is(RESP.NO_FURTHER_PROCESSING));
+       }
+
+       class TryAnotherTafResp implements TafResp {
+               @Override public boolean isValid() { return false; } 
+               @Override public String desc() { return null; } 
+               @Override public RESP isAuthenticated() { return RESP.TRY_ANOTHER_TAF; } 
+               @Override public RESP authenticate() throws IOException { return null; } 
+               @Override public TaggedPrincipal getPrincipal() { return null; } 
+               @Override public Access getAccess() { return null; } 
+               @Override public boolean isFailedAttempt() { return false; } 
+       }
+
+       class TryAnotherTaf implements Taf {
+               @Override public TafResp validate(LifeForm reading, String ... info) { return new TryAnotherTafResp(); }
+       }
+
+       class TryAuthenticatingResp implements TafResp {
+               @Override public boolean isValid() { return false; } 
+               @Override public String desc() { return null; } 
+               @Override public RESP isAuthenticated() { return RESP.TRY_AUTHENTICATING; } 
+               @Override public RESP authenticate() throws IOException { return null; } 
+               @Override public TaggedPrincipal getPrincipal() { return null; } 
+               @Override public Access getAccess() { return null; } 
+               @Override public boolean isFailedAttempt() { return false; } 
+       }
+
+       class TryAuthenticatingTaf implements Taf {
+               @Override public TafResp validate(LifeForm reading, String ... info) { return new TryAuthenticatingResp(); }
+       }
+
+       class EpiTafStub extends EpiTaf {
+               public EpiTafStub() throws CadiException { }
+       }
+
+}
diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_NullTaf.java b/cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_NullTaf.java
new file mode 100644 (file)
index 0000000..9131172
--- /dev/null
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * ============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====================================================
+ * *
+ * *
+ ******************************************************************************/
+package org.onap.aaf.cadi.test.taf;
+
+import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+import org.junit.*;
+
+import java.io.IOException;
+
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CachedPrincipal.Resp;
+import org.onap.aaf.cadi.taf.TafResp;
+import org.onap.aaf.cadi.taf.TafResp.RESP;
+
+import org.onap.aaf.cadi.taf.NullTaf;
+
+public class JU_NullTaf {
+
+       @Test
+       public void test() throws IOException {
+               NullTaf nt = new NullTaf();
+               TafResp singleton1 = nt.validate(null);
+               TafResp singleton2 = nt.validate(null, null, null);
+               Resp singleton3 = nt.revalidate(null, null);
+               
+               assertThat(singleton1, is(singleton2));
+               
+               assertFalse(singleton1.isValid());
+               
+               assertThat(singleton1.isAuthenticated(), is(RESP.NO_FURTHER_PROCESSING));
+               
+               assertThat(singleton1.desc(), is("All Authentication denied"));
+               
+               assertThat(singleton1.authenticate(), is(RESP.NO_FURTHER_PROCESSING));
+               
+               assertThat(singleton1.getPrincipal(), is(nullValue()));
+               
+               assertThat(singleton1.getAccess(), is(Access.NULL));
+               
+               assertTrue(singleton1.isFailedAttempt());
+
+               assertThat(singleton3, is(Resp.NOT_MINE));
+       }
+
+}
 package org.onap.aaf.cadi.test.taf;
 
 import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+import org.junit.*;
 
 import java.io.IOException;
 
-import org.junit.Before;
-import org.junit.Test;
 import org.onap.aaf.cadi.Access;
-import org.onap.aaf.cadi.taf.TafResp;
 import org.onap.aaf.cadi.taf.TafResp.RESP;
 
-public class JU_NullTafRespTest {
-
-//     @Before
-//     public void setUp() throws Exception {
-//     }
-
-//     @Test
-//     public void test() throws IOException {
-//             TafResp singleton = NullTafResp.singleton();
-//             TafResp singleton1 = NullTafResp.singleton();
-               
-//             assertEquals(singleton, singleton1);
-               
-//             assertFalse(singleton.isValid());
-               
-//             assertEquals(singleton.isAuthenticated(), RESP.NO_FURTHER_PROCESSING);
-               
-//             assertEquals(singleton.desc(), "All Authentication denied");
-               
-//             assertEquals(singleton.authenticate(), RESP.NO_FURTHER_PROCESSING);
-               
-//             assertNull(singleton.getPrincipal());
-               
-//             assertEquals(singleton.getAccess(), Access.NULL);
-               
-//             assertEquals(singleton.isFailedAttempt(), true);
-//     }
+import org.onap.aaf.cadi.taf.PuntTafResp;
+
+
+public class JU_PuntTafResp {
+
+       @Test
+       public void test() throws IOException {
+               String name = "name";
+               String explanation = "example explanation";
+
+               PuntTafResp punt = new PuntTafResp(name, explanation);
+
+               assertFalse(punt.isValid());
+               assertThat(punt.isAuthenticated(), is(RESP.TRY_ANOTHER_TAF));
+               assertThat(punt.desc(), is(name + " is not processing this transaction: " + explanation));
+               assertThat(punt.authenticate(), is(RESP.TRY_ANOTHER_TAF));
+               assertThat(punt.getPrincipal(), is(nullValue()));
+               assertThat(punt.getAccess(), is(Access.NULL));
+               assertFalse(punt.isFailedAttempt());
+       }
 
 }
diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_TrustNotTafResp.java b/cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_TrustNotTafResp.java
new file mode 100644 (file)
index 0000000..798348e
--- /dev/null
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * ============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====================================================
+ * *
+ * *
+ ******************************************************************************/
+package org.onap.aaf.cadi.test.taf;
+
+import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.mockito.Mockito.*;
+import org.junit.*;
+import org.mockito.*;
+
+import java.io.IOException;
+
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.taf.TafResp;
+import org.onap.aaf.cadi.taf.TafResp.RESP;
+import org.onap.aaf.cadi.taf.TrustNotTafResp;
+import org.onap.aaf.cadi.principal.TaggedPrincipal;
+
+public class JU_TrustNotTafResp {
+
+       @Mock
+       TafResp delegateMock;
+
+       @Mock
+       TaggedPrincipal principalMock;
+
+       @Mock
+       Access accessMock;
+
+       private final String description = "Example Description";
+
+       @Before
+       public void setup() throws IOException {
+               MockitoAnnotations.initMocks(this);
+
+               when(delegateMock.getPrincipal()).thenReturn(principalMock);
+               when(delegateMock.getAccess()).thenReturn(accessMock);
+       }
+
+       @Test
+       public void test() throws IOException {
+               TrustNotTafResp ttr = new TrustNotTafResp(delegateMock, description);
+               assertThat(ttr.isValid(), is(false));
+               assertThat(ttr.desc(), is(description));
+               assertThat(ttr.authenticate(), is(RESP.NO_FURTHER_PROCESSING));
+               assertThat(ttr.isAuthenticated(), is(RESP.NO_FURTHER_PROCESSING));
+               assertThat(ttr.getPrincipal(), is(principalMock));
+               assertThat(ttr.getAccess(), is(accessMock));
+               assertThat(ttr.isFailedAttempt(), is(true));
+               assertThat(ttr.toString(), is(description));
+       }
+
+}
diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_TrustTafResp.java b/cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/JU_TrustTafResp.java
new file mode 100644 (file)
index 0000000..04e3a1f
--- /dev/null
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * ============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====================================================
+ * *
+ * *
+ ******************************************************************************/
+package org.onap.aaf.cadi.test.taf;
+
+import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.mockito.Mockito.*;
+import org.junit.*;
+import org.mockito.*;
+
+import java.io.IOException;
+
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.taf.TafResp;
+import org.onap.aaf.cadi.taf.TafResp.RESP;
+import org.onap.aaf.cadi.taf.TrustTafResp;
+import org.onap.aaf.cadi.principal.TaggedPrincipal;
+
+public class JU_TrustTafResp {
+
+       @Mock
+       TafResp delegateMock;
+
+       @Mock
+       TaggedPrincipal principalMock;
+
+       @Mock
+       Access accessMock;
+
+       private final String description = "Example Description";
+       private final String anotherDescription = "Another Description";
+       private final String name = "name";
+
+       private final RESP resp = RESP.IS_AUTHENTICATED;
+
+       @Before
+       public void setup() throws IOException {
+               MockitoAnnotations.initMocks(this);
+
+               when(delegateMock.desc()).thenReturn(anotherDescription);
+               when(delegateMock.isValid()).thenReturn(true);
+               when(delegateMock.isAuthenticated()).thenReturn(resp);
+               when(delegateMock.authenticate()).thenReturn(resp);
+               when(delegateMock.getAccess()).thenReturn(accessMock);
+               when(delegateMock.isFailedAttempt()).thenReturn(true);
+
+               when(principalMock.getName()).thenReturn(name);
+       }
+
+       @Test
+       public void test() throws IOException {
+               TrustTafResp ttr = new TrustTafResp(delegateMock, principalMock, description);
+               assertThat(ttr.isValid(), is(true));
+               assertThat(ttr.desc(), is(description + ' ' + anotherDescription));
+               assertThat(ttr.authenticate(), is(resp));
+               assertThat(ttr.isAuthenticated(), is(resp));
+               assertThat(ttr.getPrincipal(), is(principalMock));
+               assertThat(ttr.getAccess(), is(accessMock));
+               assertThat(ttr.isFailedAttempt(), is(true));
+               assertThat(ttr.toString(), is(name + " by trust of " + description + ' ' + anotherDescription));
+       }
+
+}
diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/dos/JU_DenialOfServiceTaf.java b/cadi/core/src/test/java/org/onap/aaf/cadi/test/taf/dos/JU_DenialOfServiceTaf.java
new file mode 100644 (file)
index 0000000..40933b4
--- /dev/null
@@ -0,0 +1,369 @@
+/*******************************************************************************
+ * ============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====================================================
+ * *
+ * *
+ ******************************************************************************/
+package org.onap.aaf.cadi.test.taf.dos;
+
+import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.mockito.Mockito.*;
+import org.junit.*;
+import org.mockito.*;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CachedPrincipal.Resp;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.taf.TafResp;
+import org.onap.aaf.cadi.Taf.LifeForm;
+import org.onap.aaf.cadi.taf.dos.DenialOfServiceTaf;
+import org.onap.aaf.cadi.taf.dos.DenialOfServiceTaf.Counter;
+
+public class JU_DenialOfServiceTaf {
+
+       @Mock
+       HttpServletResponse respMock;
+
+       @Mock
+       HttpServletRequest reqMock1;
+
+       @Mock
+       HttpServletRequest reqMock2;
+
+       @Mock
+       HttpServletRequest reqMock3;
+
+       @Mock
+       Access accessMock;
+
+       private File dosIPFile;
+       private File dosIDFile;
+       private File dosDir;
+       private final String dosDirName = "test";
+       
+       private final String id1 = "id1";
+       private final String id2 = "id2";
+
+       private final String ip1 = "111.111.111.111";
+       private final String ip2 = "222.222.222.222";
+
+       @Before
+       public void setup() throws IOException {
+               MockitoAnnotations.initMocks(this);
+
+               dosDir = new File(dosDirName);
+               dosDir.mkdirs();
+               dosIPFile = new File(dosDirName, "/dosIP");
+               dosIDFile = new File(dosDirName, "/dosID");
+               dosIPFile.delete();
+               dosIDFile.delete();
+
+               when(accessMock.getProperty(Config.AAF_DATA_DIR, null)).thenReturn(dosDirName);
+               when(reqMock1.getRemoteAddr()).thenReturn(ip1);
+               when(reqMock2.getRemoteAddr()).thenReturn(ip2);
+
+               setPrivateField(DenialOfServiceTaf.class, "deniedIP", null);
+               setPrivateField(DenialOfServiceTaf.class, "deniedID", null);
+               setPrivateField(DenialOfServiceTaf.class, "dosIP", null);
+               setPrivateField(DenialOfServiceTaf.class, "dosID", null);
+       }
+
+       @After
+       public void tearDown() {
+               dosIPFile = new File(dosDirName, "/dosIP");
+               dosIDFile = new File(dosDirName, "/dosID");
+               dosIPFile.delete();
+               dosIDFile.delete();
+       }
+
+       @Test
+       public void constructorTest() throws CadiException {
+               @SuppressWarnings("unused")
+               DenialOfServiceTaf dost;
+
+               // coverage...
+               when(accessMock.getProperty(Config.AAF_DATA_DIR, null)).thenReturn(null);
+               dost = new DenialOfServiceTaf(accessMock);
+
+               when(accessMock.getProperty(Config.AAF_DATA_DIR, null)).thenReturn(dosDirName);
+               dost = new DenialOfServiceTaf(accessMock);
+
+               // more coverage...
+               dost = new DenialOfServiceTaf(accessMock);
+
+               // more coverage...
+               setPrivateField(DenialOfServiceTaf.class, "dosID", null);
+               dost = new DenialOfServiceTaf(accessMock);
+       }
+
+       @Test
+       public void validateTest() throws CadiException {
+               DenialOfServiceTaf dost;
+               TafResp tafResp;
+
+               dost = new DenialOfServiceTaf(accessMock);
+               tafResp = dost.validate(LifeForm.SBLF, reqMock1, respMock);
+
+               assertThat(tafResp.desc(), is("DenialOfServiceTaf is not processing this transaction: This Transaction is not denied"));
+
+               assertThat(DenialOfServiceTaf.denyIP(ip1), is(true));
+
+               tafResp = dost.validate(LifeForm.SBLF, reqMock1, respMock);
+               assertThat(tafResp.desc(), is(ip1 + " is on the IP Denial list"));
+
+               tafResp = dost.validate(LifeForm.SBLF, reqMock2, respMock);
+               assertThat(tafResp.desc(), is("DenialOfServiceTaf is not processing this transaction: This Transaction is not denied"));
+       }
+
+       @Test
+       public void revalidateTest() throws CadiException {
+               DenialOfServiceTaf dost = new DenialOfServiceTaf(accessMock);
+               Resp resp = dost.revalidate(null, null);
+               assertThat(resp, is(Resp.NOT_MINE));
+       }
+
+       @Test
+       public void denyIPTest() throws CadiException {
+               assertThat(DenialOfServiceTaf.isDeniedIP(ip1), is(nullValue()));
+               assertThat(DenialOfServiceTaf.denyIP(ip1), is(true));  // true because it's been added
+               assertThat(DenialOfServiceTaf.denyIP(ip2), is(true));  // true because it's been added
+               assertThat(DenialOfServiceTaf.denyIP(ip1), is(false)); // false because it's already been added
+               assertThat(DenialOfServiceTaf.denyIP(ip2), is(false)); // false because it's already been added
+
+               Counter counter;
+               counter = DenialOfServiceTaf.isDeniedIP(ip1);
+               assertThat(counter.getName(), is(ip1));
+               assertThat(counter.getCount(), is(0));
+               assertThat(counter.getLast(), is(0L));
+               assertThat(counter.toString(), is(ip1 + " is on the denied list, but has not attempted Access" ));
+
+               DenialOfServiceTaf dost = new DenialOfServiceTaf(accessMock);
+               dost.validate(LifeForm.SBLF, reqMock1, respMock);
+               long approxTime = System.currentTimeMillis();
+
+               counter = DenialOfServiceTaf.isDeniedIP(ip1);
+               assertThat(counter.getName(), is(ip1));
+               assertThat(counter.getCount(), is(1));
+               assertThat((Math.abs(approxTime - counter.getLast()) < 10), is(true));
+               assertThat(counter.toString().contains(ip1), is(true));
+               assertThat(counter.toString().contains(" has been denied 1 times since "), is(true));
+               assertThat(counter.toString().contains(".  Last denial was "), is(true));
+
+               // coverage...
+               dost.validate(LifeForm.SBLF, reqMock1, respMock);
+
+               assertThat(DenialOfServiceTaf.removeDenyIP(ip1), is(true));
+               assertThat(DenialOfServiceTaf.removeDenyIP(ip1), is(false));
+               assertThat(DenialOfServiceTaf.removeDenyIP(ip2), is(true));
+               assertThat(DenialOfServiceTaf.removeDenyIP(ip2), is(false));
+       }
+
+       @Test
+       public void denyIDTest() throws CadiException {
+               assertThat(DenialOfServiceTaf.isDeniedID(id1), is(nullValue()));
+               assertThat(DenialOfServiceTaf.denyID(id1), is(true));  // true because it's been added
+               assertThat(DenialOfServiceTaf.denyID(id2), is(true));  // true because it's been added
+               assertThat(DenialOfServiceTaf.denyID(id1), is(false)); // false because it's already been added
+               assertThat(DenialOfServiceTaf.denyID(id2), is(false)); // false because it's already been added
+
+               Counter counter;
+               counter = DenialOfServiceTaf.isDeniedID(id1);
+               assertThat(counter.getName(), is(id1));
+               assertThat(counter.getCount(), is(0));
+               assertThat(counter.getLast(), is(0L));
+
+               assertThat(DenialOfServiceTaf.removeDenyID(id1), is(true));
+               assertThat(DenialOfServiceTaf.removeDenyID(id1), is(false));
+               assertThat(DenialOfServiceTaf.removeDenyID(id2), is(true));
+               assertThat(DenialOfServiceTaf.removeDenyID(id2), is(false));
+       }
+
+       @Test
+       public void reportTest() throws CadiException {
+               DenialOfServiceTaf dost = new DenialOfServiceTaf(accessMock);
+               List<String> denials = dost.report();
+               assertThat(denials.size(), is(0));
+
+               DenialOfServiceTaf.denyID(id1);
+               DenialOfServiceTaf.denyID(id2);
+
+               DenialOfServiceTaf.denyIP(ip1);
+               DenialOfServiceTaf.denyIP(ip2);
+
+               denials = dost.report();
+               assertThat(denials.size(), is(4));
+               for (String denied : denials) {
+                       switch (denied.split(" ", 2)[0]) {
+                               case ip1:
+                               case ip2:
+                               case id1:
+                               case id2:
+                                       break;
+                               default:
+                                       fail("The line: [" + denied + "] shouldn't be in the report");
+                       }
+               }
+       }
+
+       @Test
+       public void respDenyIDTest() {
+               TafResp tafResp = DenialOfServiceTaf.respDenyID(accessMock, id1);
+               assertThat(tafResp.desc(), is(id1 + " is on the Identity Denial list"));
+       }
+
+       @Test
+       public void ipFileIOTest() throws CadiException, IOException {
+               @SuppressWarnings("unused")
+               DenialOfServiceTaf dost;
+
+               dosIPFile.createNewFile();
+
+               // coverage...
+               DenialOfServiceTaf.denyIP(ip1);
+               DenialOfServiceTaf.removeDenyIP(ip1);
+
+               dost = new DenialOfServiceTaf(accessMock);
+               DenialOfServiceTaf.denyIP(ip1);
+               DenialOfServiceTaf.denyIP(ip2);
+               // coverage...
+               DenialOfServiceTaf.denyIP(ip2);
+
+               String contents = readContentsFromFile(dosIPFile);
+               assertThat(contents.contains(ip1), is(true));
+               assertThat(contents.contains(ip2), is(true));
+
+               // Removing all ips should delete the file
+               assertThat(dosIPFile.exists(), is(true));
+               DenialOfServiceTaf.removeDenyIP(ip1);
+               DenialOfServiceTaf.removeDenyIP(ip2);
+               assertThat(dosIPFile.exists(), is(false));
+
+               dosIPFile.createNewFile();
+
+               DenialOfServiceTaf.denyIP(ip1);
+               DenialOfServiceTaf.denyIP(ip2);
+
+               setPrivateField(DenialOfServiceTaf.class, "dosIP", null);
+               dost = new DenialOfServiceTaf(accessMock);
+
+               contents = readContentsFromFile(dosIPFile);
+               assertThat(contents.contains(ip1), is(true));
+               assertThat(contents.contains(ip2), is(true));
+
+               dosIPFile.delete();
+
+               // coverage...
+               setPrivateField(DenialOfServiceTaf.class, "deniedIP", null);
+               DenialOfServiceTaf.denyIP(ip1);
+               dosIPFile.delete();
+               DenialOfServiceTaf.removeDenyIP(ip1);
+
+               // coverage...
+               dosIPFile.delete();
+               setPrivateField(DenialOfServiceTaf.class, "dosIP", null);
+               dost = new DenialOfServiceTaf(accessMock);
+       }
+
+       @Test
+       public void idFileIOTest() throws CadiException, IOException {
+               @SuppressWarnings("unused")
+               DenialOfServiceTaf dost;
+
+               dosIDFile.createNewFile();
+
+               // coverage...
+               DenialOfServiceTaf.denyID(id1);
+               DenialOfServiceTaf.removeDenyID(id1);
+
+               dost = new DenialOfServiceTaf(accessMock);
+               DenialOfServiceTaf.denyID(id1);
+               DenialOfServiceTaf.denyID(id2);
+               // coverage...
+               DenialOfServiceTaf.denyID(id2);
+
+               String contents = readContentsFromFile(dosIDFile);
+               assertThat(contents.contains(id1), is(true));
+               assertThat(contents.contains(id2), is(true));
+
+               // Removing all ids should delete the file
+               assertThat(dosIDFile.exists(), is(true));
+               DenialOfServiceTaf.removeDenyID(id1);
+               DenialOfServiceTaf.removeDenyID(id2);
+               assertThat(dosIDFile.exists(), is(false));
+
+               dosIDFile.createNewFile();
+
+               DenialOfServiceTaf.denyID(id1);
+               DenialOfServiceTaf.denyID(id2);
+
+               setPrivateField(DenialOfServiceTaf.class, "dosID", null);
+               dost = new DenialOfServiceTaf(accessMock);
+
+               contents = readContentsFromFile(dosIDFile);
+               assertThat(contents.contains(id1), is(true));
+               assertThat(contents.contains(id2), is(true));
+
+               dosIDFile.delete();
+
+               // coverage...
+               setPrivateField(DenialOfServiceTaf.class, "deniedID", null);
+               DenialOfServiceTaf.denyID(id1);
+               dosIDFile.delete();
+               DenialOfServiceTaf.removeDenyID(id1);
+
+               // coverage...
+               dosIDFile.delete();
+               setPrivateField(DenialOfServiceTaf.class, "dosID", null);
+               dost = new DenialOfServiceTaf(accessMock);
+       }
+
+       private void setPrivateField(Class<?> clazz, String fieldName, Object value) {
+               try {
+                       Field field = clazz.getDeclaredField(fieldName);
+                       field.setAccessible(true);
+                       field.set(null, value);
+                       field.setAccessible(false);
+               } catch(Exception e) {
+                       System.err.println("Could not set field [" + fieldName + "] to " + value);
+               }
+       }
+
+       private String readContentsFromFile(File file) throws IOException {
+               BufferedReader br = new BufferedReader(new FileReader(file));
+               StringBuilder sb = new StringBuilder();
+               String line;
+               while ((line = br.readLine()) != null) {
+                       sb.append(line);
+               }
+               br.close();
+               return sb.toString();
+       }
+
+}
index b97b063..b07cd29 100644 (file)
  ******************************************************************************/
 package org.onap.aaf.cadi.test.wsse;
 
+import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+import org.junit.*;
+
+import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
 
+import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.XMLEvent;
 
-import org.junit.Test;
 import org.onap.aaf.cadi.wsse.XEvent;
 import org.onap.aaf.cadi.wsse.XReader;
 
 public class JU_XReader {
-       // TODO: Gabe [JUnit] Class not found error
+
+       private final static String TEST_DIR_NAME = "test";
+       private final static String TEST_XML_NAME = "test.xml";
+       private static File testXML;
+
+       private final static String COMMENT = "a comment";
+       private final static String OUTER_TAG = "outerTag";
+       private final static String INNER_TAG = "innerTag";
+       private final static String DATA_TAG = "dataTag";
+       private final static String DATA = "some text that represents data";
+       private final static String SELF_CLOSING_TAG = "selfClosingTag";
+       private final static String PREFIX = "prefix";
+       private final static String SUFFIX = "suffix";
+
+       @BeforeClass
+       public static void setupOnce() throws IOException {
+               testXML = setupXMLFile();
+       }
+
+       @AfterClass
+       public static void tearDownOnce() {
+               testXML.delete();
+       }
+
        @Test
-       public void test() throws Exception {
-               FileInputStream fis = new FileInputStream("test/CBUSevent.xml");
+       public void test() throws XMLStreamException, IOException {
+               FileInputStream fis = new FileInputStream(TEST_DIR_NAME + '/' + TEST_XML_NAME);
                try {
                        XReader xr = new XReader(fis);
-                       while (xr.hasNext()) {
-                               XEvent xe = xr.nextEvent();
-                               switch (xe.getEventType()) {
-                               case XMLEvent.START_DOCUMENT:
-                                       System.out.println("Start Document");
-                                       break;
-                               case XMLEvent.START_ELEMENT:
-                                       System.out.println("Start Event: " + xe.asStartElement().getName());
-                                       break;
-                               case XMLEvent.END_ELEMENT:
-                                       System.out.println("End Event: " + xe.asEndElement().getName());
-                                       break;
-                               case XMLEvent.CHARACTERS:
-                                       System.out.println("Characters: " + xe.asCharacters().getData());
-                                       break;
-                               case XMLEvent.COMMENT:
-                                       System.out.println("Comment: " + ((XEvent.Comment) xe).value);
-                                       break;
-                               }
-                       }
+                       assertThat(xr.hasNext(), is(true));
+                       XEvent xe;
+
+                       xe = getNextEvent(xr);
+                       assertThat(xe.getEventType(), is(XMLEvent.START_DOCUMENT));
+
+                       xe = getNextEvent(xr);
+                       assertThat(xe.getEventType(), is(XMLEvent.START_ELEMENT));
+
+                       xe = getNextEvent(xr);
+                       assertThat(xe.getEventType(), is(XMLEvent.COMMENT));
+                       assertThat(((XEvent.Comment)xe).value, is(COMMENT));
+
+                       xe = getNextEvent(xr);
+                       assertThat(xe.getEventType(), is(XMLEvent.START_ELEMENT));
+                       assertThat(xe.asStartElement().getName().toString(), is(OUTER_TAG));
+
+                       xe = getNextEvent(xr);
+                       assertThat(xe.getEventType(), is(XMLEvent.START_ELEMENT));
+                       assertThat(xe.asStartElement().getName().toString(), is(INNER_TAG));
+
+                       xe = getNextEvent(xr);
+                       assertThat(xe.getEventType(), is(XMLEvent.START_ELEMENT));
+                       assertThat(xe.asStartElement().getName().toString(), is(DATA_TAG));
+
+                       xe = getNextEvent(xr);
+                       assertThat(xe.getEventType(), is(XMLEvent.CHARACTERS));
+                       assertThat(xe.asCharacters().getData().toString(), is(DATA));
+
+                       xe = getNextEvent(xr);
+                       assertThat(xe.getEventType(), is(XMLEvent.END_ELEMENT));
+                       assertThat(xe.asEndElement().getName().toString(), is(DATA_TAG));
+
+                       xe = getNextEvent(xr);
+                       assertThat(xe.getEventType(), is(XMLEvent.START_ELEMENT));
+                       assertThat(xe.asStartElement().getName().toString(), is(SELF_CLOSING_TAG));
+
+                       xe = getNextEvent(xr);
+                       assertThat(xe.getEventType(), is(XMLEvent.START_ELEMENT));
+                       assertThat(xe.asStartElement().getName().toString(), is(SUFFIX));
+
+                       xe = getNextEvent(xr);
+                       assertThat(xe.getEventType(), is(XMLEvent.END_ELEMENT));
+                       assertThat(xe.asEndElement().getName().toString(), is(INNER_TAG));
+
+                       xe = getNextEvent(xr);
+                       assertThat(xe.getEventType(), is(XMLEvent.END_ELEMENT));
+                       assertThat(xe.asEndElement().getName().toString(), is(OUTER_TAG));
+
+                       assertThat(xr.hasNext(), is(false));
+
                } finally {
                        fis.close();
                }
        }
-}
\ No newline at end of file
+
+       // @Test
+       // public void tagTest() {
+       //      String prefix = "prefix";
+       //      String name = "name";
+       //      String value = "value";
+       //      XReader.Tag tag = new Tag(prefix, name, value);
+
+       //      assertThat(tag.toString(), is(prefix + ':' + name + "=\'" + value + "'"));
+       // }
+
+
+       private static XEvent getNextEvent(XReader xr) throws XMLStreamException {
+               if (xr.hasNext()) {
+                       return xr.nextEvent();
+               }
+               return null;
+       }
+
+       private static File setupXMLFile() throws IOException {
+               File xmlFile = new File(TEST_DIR_NAME, TEST_XML_NAME);
+               PrintWriter writer = new PrintWriter(xmlFile);
+               writer.println("    ");  // Whitespace before the document - this is for coverage
+               writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+               writer.println("<!DOCTYPE xml>");
+               writer.println("<!--" + COMMENT + "-->");
+               writer.println("<" + OUTER_TAG + ">");
+               writer.println("  <" + INNER_TAG + ">");
+               writer.println("    <" + DATA_TAG + ">" + DATA + "</" + DATA_TAG + ">");
+               writer.println("    <" + SELF_CLOSING_TAG + " withAnAttribute=\"That has nested \\\" marks\" />");
+               writer.println("    <" + PREFIX + ":" + SUFFIX + "/>");
+               writer.println("  </" + INNER_TAG + ">");
+               writer.println("</" + OUTER_TAG + ">");
+               writer.flush();
+               writer.close();
+               return xmlFile;
+       }
+}