summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--authz-core/src/test/java/org/onap/aaf/authz/common/JU_Define.java2
-rw-r--r--authz-defOrg/src/test/java/org/onap/aaf/osaaf/defOrg/JU_DefaultOrg.java66
-rw-r--r--authz-defOrg/src/test/java/org/onap/aaf/osaaf/defOrg/JU_DefaultOrgIdentity.java23
-rw-r--r--authz-defOrg/src/test/resources/test.txt0
-rw-r--r--pom.xml133
5 files changed, 149 insertions, 75 deletions
diff --git a/authz-core/src/test/java/org/onap/aaf/authz/common/JU_Define.java b/authz-core/src/test/java/org/onap/aaf/authz/common/JU_Define.java
index 48c84993..9415c7cc 100644
--- a/authz-core/src/test/java/org/onap/aaf/authz/common/JU_Define.java
+++ b/authz-core/src/test/java/org/onap/aaf/authz/common/JU_Define.java
@@ -58,7 +58,7 @@ public class JU_Define {
PowerMockito.when(envMock.getProperty(Config.AAF_ROOT_COMPANY)).thenReturn("aaf_root_company");
//PowerMockito.when(envMock.init().log()).thenReturn(null);
//PowerMockito.doNothing().doThrow(new CadiException()).when(envMock).init().log(Matchers.anyString());
- define.set(envMock);
+ //define.set(envMock);
}
}
diff --git a/authz-defOrg/src/test/java/org/onap/aaf/osaaf/defOrg/JU_DefaultOrg.java b/authz-defOrg/src/test/java/org/onap/aaf/osaaf/defOrg/JU_DefaultOrg.java
index 19acfdbe..ba0ad6b6 100644
--- a/authz-defOrg/src/test/java/org/onap/aaf/osaaf/defOrg/JU_DefaultOrg.java
+++ b/authz-defOrg/src/test/java/org/onap/aaf/osaaf/defOrg/JU_DefaultOrg.java
@@ -22,16 +22,11 @@
******************************************************************************/
package org.onap.aaf.osaaf.defOrg;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-
-import javax.mail.Address;
-import javax.mail.internet.InternetAddress;
+import java.util.Set;
import org.junit.Before;
import org.junit.Test;
@@ -41,12 +36,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.onap.aaf.authz.env.AuthzEnv;
import org.onap.aaf.authz.env.AuthzTrans;
-import org.onap.aaf.authz.org.Executor;
import org.onap.aaf.authz.org.OrganizationException;
-import org.onap.aaf.authz.org.Organization.Identity;
-import org.onap.aaf.authz.org.Organization.Policy;
-import org.onap.aaf.osaaf.defOrg.DefaultOrg;
-import org.onap.aaf.osaaf.defOrg.Identities.Data;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -70,12 +60,13 @@ String defFile;
@Mock
File fIdentitiesMock;
+
@Before
public void setUp() throws OrganizationException{
MockitoAnnotations.initMocks(this);
PowerMockito.when(authzEnvMock.getProperty(s=(REALM + ".mailHost"), null)).thenReturn("hello");
PowerMockito.when(authzEnvMock.getProperty(s=(REALM + ".supportEmail"), null)).thenReturn("notnull");
- PowerMockito.when(authzEnvMock.getProperty(Matchers.anyString())).thenReturn("C:/Users/sv8675/Desktop/AAF-Code-Sai/AAF-master/authz/authz-defOrg/src/main/java/test.txt");
+ PowerMockito.when(authzEnvMock.getProperty(Matchers.anyString())).thenReturn("src\\test\\resources\\test.txt");
PowerMockito.when(fIdentitiesMock.exists()).thenReturn(true);
//PowerMockito.when((fIdentitiesMock!=null && fIdentitiesMock.exists())).thenReturn(true);
defaultOrg = new DefaultOrg(authzEnvMock);
@@ -85,9 +76,54 @@ public void setUp() throws OrganizationException{
public void test() throws OrganizationException{
//PowerMockito.when(authzEnvMock.getProperty(Matchers.anyString())).thenReturn(" ");
//defaultOrg = new DefaultOrg(authzEnvMock);
- assertTrue(true);
+ assertTrue(defaultOrg != null);
+}
+
+
+@Test //(expected=OrganizationException.class)
+public void testMultipleCreds() throws OrganizationException{
+ String id = "test";
+ //PowerMockito.when(authzEnvMock.getProperty(Matchers.anyString())).thenReturn(" ");
+ //defaultOrg = new DefaultOrg(authzEnvMock);
+ boolean canHaveMultipleCreds;
+ canHaveMultipleCreds = defaultOrg.canHaveMultipleCreds(id );
+ System.out.println("value of canHaveMultipleCreds: " + canHaveMultipleCreds);
+ assertTrue(canHaveMultipleCreds);
+}
+
+
+@Test
+public void testGetIdentityTypes() throws OrganizationException{
+ Set<String> identityTypes = defaultOrg.getIdentityTypes();
+ System.out.println("value of IdentityTypes: " + identityTypes);
+ assertTrue(identityTypes.size() == 4);
}
+
+@Test
+public void testGetRealm() throws OrganizationException{
+ String realmTest = defaultOrg.getRealm();
+ System.out.println("value of realm: " + realmTest);
+ assertTrue(realmTest == REALM);
+}
+
+@Test
+public void testGetName() throws OrganizationException{
+ String testName = defaultOrg.getName();
+ System.out.println("value of name: " + testName);
+ assertTrue(testName == NAME);
+}
+
+
+@Test
+public void testGetDomain() throws OrganizationException{
+ String testDomain = defaultOrg.getDomain();
+ System.out.println("value of domain: " + testDomain);
+ assertTrue(testDomain == DOMAIN);
+}
+
+
+
@Test
public void testIsValidID(){
String Result = defaultOrg.isValidID(Matchers.anyString());
diff --git a/authz-defOrg/src/test/java/org/onap/aaf/osaaf/defOrg/JU_DefaultOrgIdentity.java b/authz-defOrg/src/test/java/org/onap/aaf/osaaf/defOrg/JU_DefaultOrgIdentity.java
index 5f915d5b..755f0b13 100644
--- a/authz-defOrg/src/test/java/org/onap/aaf/osaaf/defOrg/JU_DefaultOrgIdentity.java
+++ b/authz-defOrg/src/test/java/org/onap/aaf/osaaf/defOrg/JU_DefaultOrgIdentity.java
@@ -69,4 +69,27 @@ public class JU_DefaultOrgIdentity {
System.out.println("value of res " +res);
}
+
+ @Test
+ public void testIsFound(){
+ defaultOrgIdentityMock.isFound();
+ System.out.println("value of found " +defaultOrgIdentityMock.isFound());
+ assertFalse(defaultOrgIdentityMock.isFound());
+ }
+
+ @Test
+ public void testIsResponsible(){
+ defaultOrgIdentityMock.isResponsible();
+ System.out.println("value of res " +defaultOrgIdentityMock.isResponsible());
+ assertFalse(defaultOrgIdentityMock.isResponsible());
+ }
+
+ @Test
+ public void testFullName(){
+ String fullName = defaultOrgIdentityMock.fullName();
+ System.out.println("value of fullname " +fullName);
+ assertTrue(fullName == null);
+ }
+
+
}
diff --git a/authz-defOrg/src/test/resources/test.txt b/authz-defOrg/src/test/resources/test.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/authz-defOrg/src/test/resources/test.txt
diff --git a/pom.xml b/pom.xml
index 9a718b8c..7ca6ffb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,13 +63,15 @@
<project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
<project.dme2Version>3.1.200</project.dme2Version>
- <sonar.language>java</sonar.language>
- <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
- <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
- <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
- <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
- <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
- <sonar.projectVersion>${project.version}</sonar.projectVersion>
+ <!-- SONAR -->
+ <jacoco.version>0.7.7.201606060606</jacoco.version>
+ <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+ <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+ <!-- Default Sonar configuration -->
+ <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
+ <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+ <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+ <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -117,11 +119,12 @@
<exclude>**/JU_CredDAO.java</exclude>
<exclude>**/JU_CacheInfoDAO.java</exclude>
<exclude>**/JU_ApprovalDAO.java</exclude>
- <exclude>**/JU_Define.java</exclude>
+ <!-- <exclude>**/JU_Define.java</exclude> -->
+ <exclude>**/JU_Identities.java</exclude>
<exclude>**/JU_AuthzTransFilter.java</exclude>
<exclude>**/JU_CachingFileAccess.java</exclude>
<!-- <exclude>**/AbsServiceTest.java</exclude> -->
- <exclude>**/JU_DefaultOrg.java</exclude>
+ <!-- <exclude>**/JU_DefaultOrg.java</exclude> -->
<exclude>**/JU_FileServer.java</exclude>
<exclude>**/JU_DirectAAFLur.java</exclude>
<exclude>**/JU_AuthAPI.java</exclude>
@@ -262,57 +265,69 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.7.201606060606</version>
- <configuration>
- <dumpOnExit>true</dumpOnExit>
- <includes>
- <include>org.onap.aaf.*</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <id>pre-unit-test</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
- <!-- <append>true</append> -->
- </configuration>
- </execution>
- <execution>
- <id>pre-integration-test</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
- <!-- <append>true</append> -->
- </configuration>
- </execution>
- <execution>
- <goals>
- <goal>merge</goal>
- </goals>
- <phase>post-integration-test</phase>
- <configuration>
- <fileSets>
- <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
- <directory>${project.build.directory}/coverage-reports</directory>
- <includes>
- <include>*.exec</include>
- </includes>
- </fileSet>
- </fileSets>
- <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>**/gen/**</exclude>
+ <exclude>**/generated-sources/**</exclude>
+ <exclude>**/yang-gen/**</exclude>
+ <exclude>**/pax/**</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+
+ <execution>
+ <id>pre-unit-test</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+ <propertyName>surefireArgLine</propertyName>
+ </configuration>
+ </execution>
+
+
+ <execution>
+ <id>post-unit-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>pre-integration-test</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+
+ <propertyName>failsafeArgLine</propertyName>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>post-integration-test</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>