From 56957c94262fa6d5580669c7c1cdbfcfeaf09a0c Mon Sep 17 00:00:00 2001 From: "gabe.maurer" Date: Mon, 30 Apr 2018 15:49:33 -0500 Subject: Increase code coverage auth fs Issue-ID: AAF-240 Change-Id: I64292fab20dab4693ab2dc92aa2d91c63dee5f47 Signed-off-by: gabe.maurer --- .../org/onap/aaf/auth/cmd/test/role/JU_List.java | 9 ++- .../java/org/onap/aaf/auth/fs/test/JU_AAF_FS.java | 91 ++++++++++++++++++++++ 2 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 auth/auth-fs/src/test/java/org/onap/aaf/auth/fs/test/JU_AAF_FS.java (limited to 'auth') diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/role/JU_List.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/role/JU_List.java index 9eb4b75b..a5b58ef0 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/role/JU_List.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/role/JU_List.java @@ -150,12 +150,13 @@ public class JU_List { pkey.setAction("test"); pkey.setInstance("test"); pkey.setType("test"); - - list.report(roles, perms , urs , "test"); + role.addPerms(pkey); list.report(roles, perms , null , "test"); - cli.eval("DETAILS @[ 123"); + list.report(roles, perms , urs , "test"); + + aafcli.eval("DETAILS @[ 123"); role.setName("test"); - role.addPerms(pkey); + list.report(roles, perms , urs , "test"); } diff --git a/auth/auth-fs/src/test/java/org/onap/aaf/auth/fs/test/JU_AAF_FS.java b/auth/auth-fs/src/test/java/org/onap/aaf/auth/fs/test/JU_AAF_FS.java new file mode 100644 index 00000000..9368d4d7 --- /dev/null +++ b/auth/auth-fs/src/test/java/org/onap/aaf/auth/fs/test/JU_AAF_FS.java @@ -0,0 +1,91 @@ +/** + * ============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.fs.test; + +import static org.junit.Assert.*; + +import org.onap.aaf.auth.env.AuthzEnv; +import org.onap.aaf.auth.fs.AAF_FS; +import org.onap.aaf.auth.rserv.CachingFileAccess; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.misc.env.APIException; +import org.onap.aaf.misc.env.Slot; +import org.onap.aaf.misc.env.StaticSlot; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.Mockito; +import static org.mockito.Mockito.*; + +import java.io.File; +import java.io.IOException; + +import org.junit.Test; + +public class JU_AAF_FS { + AuthzEnv aEnv; + AAF_FS aafFs; + File fService; + File fEtc; + String value; + File d; + private static final String testDir = "src/test/resources/logs"; + + @Before + public void setUp() throws APIException, IOException, CadiException { + value = System.setProperty(Config.CADI_LOGDIR, testDir); + System.setProperty(Config.CADI_ETCDIR, testDir); + System.out.println(ClassLoader.getSystemResource("org.osaaf.log4j.props")); + d = new File(testDir); + d.mkdirs(); + fService = new File(d +"/fs-serviceTEST.log"); + fService.createNewFile(); + fEtc = new File(d + "/org.osaaf.log4j.props"); + fEtc.createNewFile(); + + aEnv = new AuthzEnv(); + aEnv.staticSlot("test"); + aEnv.access().setProperty("aaf_public_dir", "test"); + aEnv.access().setProperty(Config.AAF_COMPONENT, "aaf_com:po.nent"); + aafFs = new AAF_FS(aEnv); + + } + + @Test + public void testMain() { + String[] strArr = {"AAF_LOG4J_PREFIX"}; + + aafFs.main(strArr); + } + + @After + public void cleanUp() { + for(File f : d.listFiles()) { + f.delete(); + } + d.delete(); + } + +} -- cgit 1.2.3-korg