X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ECOMP-PAP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fopenecomp%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcomponents%2FPolicyDBDaoTest.java;h=9d7fae2098fb1b0e978dc89aec046a2b8d2ee0dd;hb=685ed1545ed28b777a3ba6e7d315b78f355154cb;hp=81f33c99b9937d1aac0e9b1ee0b4973496868682;hpb=91d04c64771832a0b8815ffbe1f0f9920320d94d;p=policy%2Fengine.git
diff --git a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDaoTest.java b/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDaoTest.java
index 81f33c99b..9d7fae209 100644
--- a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDaoTest.java
+++ b/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDaoTest.java
@@ -20,12 +20,8 @@
package org.openecomp.policy.pap.xacml.rest.components;
-import java.io.ByteArrayInputStream;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.nio.file.Paths;
import java.util.Date;
import java.util.List;
@@ -36,42 +32,32 @@ import javax.persistence.Persistence;
import javax.persistence.PersistenceException;
import javax.persistence.Query;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.junit.After;
+import org.junit.Assert;
+//import org.apache.commons.logging.Log;
+//import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
-import org.openecomp.policy.pap.xacml.rest.adapters.PolicyRestAdapter;
-import org.openecomp.policy.pap.xacml.rest.components.ConfigPolicy;
-import org.openecomp.policy.pap.xacml.rest.components.Policy;
-import org.openecomp.policy.pap.xacml.rest.components.PolicyDBDao;
-import org.openecomp.policy.pap.xacml.rest.components.PolicyDBDaoTransaction;
+import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
+import org.openecomp.policy.common.logging.flexlogger.Logger;
import org.openecomp.policy.pap.xacml.rest.components.PolicyDBDao.PolicyDBDaoTestClass;
import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.jpa.ActionBodyEntity;
+import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
import org.openecomp.policy.rest.jpa.GroupEntity;
import org.openecomp.policy.rest.jpa.PdpEntity;
import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.util.Webapps;
-
-import com.att.research.xacml.api.pap.PAPException;
-
import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
import org.openecomp.policy.xacml.util.XACMLPolicyWriter;
-import com.att.research.xacml.util.XACMLProperties;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-//import org.apache.commons.logging.Log;
-//import org.apache.commons.logging.LogFactory;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.Ignore;
+import com.att.research.xacml.api.pap.PAPException;
+import com.att.research.xacml.util.XACMLProperties;
import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
-import org.junit.Assert;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-
-@Ignore //only run locally as timing sometimes causes failures on Jenkins
public class PolicyDBDaoTest {
private static Logger logger = FlexLogger.getLogger(PolicyDBDaoTest.class);
@@ -87,16 +73,16 @@ public class PolicyDBDaoTest {
EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
try{
- em.createQuery("DELETE FROM PolicyDBDaoEntity").executeUpdate();
- em.createQuery("DELETE FROM PolicyEntity").executeUpdate();
- em.createQuery("DELETE FROM ConfigurationDataEntity").executeUpdate();
- em.createQuery("DELETE FROM ActionBodyEntity").executeUpdate();
- em.createQuery("DELETE FROM PdpEntity").executeUpdate();
- em.createQuery("DELETE FROM GroupEntity").executeUpdate();
+ em.createQuery("DELETE FROM PolicyDBDaoEntity").executeUpdate();
+ em.createQuery("DELETE FROM PolicyEntity").executeUpdate();
+ em.createQuery("DELETE FROM ConfigurationDataEntity").executeUpdate();
+ em.createQuery("DELETE FROM ActionBodyEntity").executeUpdate();
+ em.createQuery("DELETE FROM PdpEntity").executeUpdate();
+ em.createQuery("DELETE FROM GroupEntity").executeUpdate();
- em.getTransaction().commit();
+ em.getTransaction().commit();
} catch(Exception e){
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
em.getTransaction().rollback();
}
em.close();
@@ -104,7 +90,7 @@ public class PolicyDBDaoTest {
dbd = PolicyDBDao.getPolicyDBDaoInstance(emf);
dbd2 = PolicyDBDao.getPolicyDBDaoInstance(emf);
} catch (Exception e) {
- //e.printStackTrace();
+ //logger.error("Exception Occured"+e);
Assert.fail();
}
@@ -136,21 +122,6 @@ public class PolicyDBDaoTest {
}
- @Test
- public void getScopeAndNameAndTypeTest(){
-
- String s = d.getGitPath();
- String pathIwantToUse;
- if(s.contains("/")){
- pathIwantToUse = "/root/users/" + s + "/org/openecomp/Config_mypolicy.xml";
- } else {
- pathIwantToUse = "C:\\root\\users\\" + s + "\\org\\openecomp\\Config_mypolicy.xml";
- }
- String[] snt = d.getScopeAndNameAndType(pathIwantToUse);
- Assert.assertEquals("Scope was parsed wrong","org.openecomp", snt[0]);
- Assert.assertEquals("Policy name was parsed wrong","Config_mypolicy.xml", snt[1]);
- Assert.assertEquals("Policy type was parsed wrong","Config", snt[2]);
- }
@Test
public void computeScopeTest(){
Assert.assertEquals("com",d.computeScope("C:\\Users\\testuser\\admin\\repo\\com\\", "C:\\Users\\testuser\\admin\\repo"));
@@ -167,176 +138,27 @@ public class PolicyDBDaoTest {
Assert.assertEquals("org.openecomp.Action_mypolicy.json", configFile);
}
- @Test
- public void transactionTests(){
-
-
-// try{
-// transac.commitTransaction();
-// Assert.fail();
-// } catch(IllegalStateException e){
-// //worked
-// } catch(Exception e2){
-// Assert.fail();
-// }
- String filePath = null;
- String xmlFile = "\n\n \n \n \n \n \n 99\n \n \n \n \n \n \n \n \n \n \n PDPAction\n \n \n REST\n \n \n http://localhost:8056/pcd\n \n \n GET\n \n \n $URLaction/com.Action_patbaction7.json\n \n \n \n \n\n";
- String jsonFile = "{\"actionAttribute\":\"Memory\"}";
-
- try{
- //policy file
- InputStream in = new ByteArrayInputStream(xmlFile.getBytes());
- String workspaceDir = "src/test/resources/junitTestCreatedDirectory/"+XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_WORKSPACE)+"/admin/"+XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_REPOSITORY);
- FileUtils.forceMkdir(new File(workspaceDir+"/org/openecomp"));
- File outFile = new File(workspaceDir+"/org/openecomp/Action_mypol.xml");
- OutputStream out = new FileOutputStream(outFile);
- IOUtils.copy(in, out);
- filePath = outFile.getAbsolutePath();
- out.close();
-
- //action body file
- InputStream actionIn = new ByteArrayInputStream(jsonFile.getBytes());
- String webappDir = "src/test/resources/junitTestCreatedDirectory/"+XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_WORKSPACE);
- XACMLProperties.setProperty(XACMLRestProperties.PROP_PAP_WEBAPPS, webappDir);
- String actionDir = Webapps.getActionHome();
- FileUtils.forceMkdir(new File(actionDir));
- File actionOutFile = new File(actionDir+"/org.openecomp.Action_mypol.json");
- OutputStream actionOut = new FileOutputStream(actionOutFile);
- IOUtils.copy(actionIn, actionOut);
- actionOut.close();
-
- }catch(Exception e){
- //could not run test
- }
- PolicyDBDaoTransaction transac = dbd.getNewTransaction();
- if(filePath != null){
- try{
- transac.createPolicy(filePath, "tester");
- transac.commitTransaction();
- } catch(Exception e){
- Assert.fail();
- }
- EntityManager getData = emf.createEntityManager();
- Query getDataQuery = getData.createQuery("SELECT p FROM PolicyEntity p WHERE p.scope=:scope AND p.policyName=:name");
- getDataQuery.setParameter("scope", "org.openecomp");
- getDataQuery.setParameter("name","Action_mypol.xml");
- PolicyEntity result = null;
- try{
- result = (PolicyEntity)getDataQuery.getSingleResult();
- } catch(Exception e){
- e.printStackTrace();
- Assert.fail();
- }
- Assert.assertEquals(xmlFile, result.getPolicyData());
- getData.close();
- result = null;
- xmlFile = null;
- try{
- transac = dbd.getNewTransaction();
- transac.deletePolicy(filePath);
- } catch(Exception e){
- e.printStackTrace();
- Assert.fail();
- }
- Assert.assertTrue(transac.isTransactionOpen());
- try{
- transac.deletePolicy(filePath);
- Assert.fail();
- } catch(IllegalStateException e){
- //pass
- } catch(Exception e){
- Assert.fail();
- }
- transac.commitTransaction();
- //Assert.assertFalse(transac.isTransactionOpen());
- try{
- transac = dbd.getNewTransaction();
- transac.deletePolicy(filePath);
- } catch(Exception e){
- e.printStackTrace();
- Assert.fail();
- }
- transac.commitTransaction();
- //Assert.assertFalse(transac.isTransactionOpen());
- String workspaceDir = "src/test/resources/junitTestCreatedDirectory/"+XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_WORKSPACE)+"/admin/"+XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_REPOSITORY);
- PolicyDBDaoTransaction willFail = dbd.getNewTransaction();
- File fakeFile = new File("directorythatdoesnotexist/"+workspaceDir);
- try{
- willFail.createPolicy(fakeFile.getAbsolutePath(), "user1");
- Assert.fail();
- } catch(IllegalArgumentException e){
- if(!e.getMessage().equals("The file path could not be parsed")){
- Assert.fail();
- }
- }
- willFail.close();
-
- fakeFile = new File("directorythatdoesnotexist/"+workspaceDir+"/Action_mypol2.xml");
- willFail = dbd.getNewTransaction();
- try{
- willFail.createPolicy(fakeFile.getAbsolutePath(), "user1");
- Assert.fail();
- } catch(IllegalArgumentException e){
- if(!e.getMessage().equals("The file path could not be parsed")){
- Assert.fail();
- }
- }
- willFail.close();
-
- fakeFile = new File("directorythatdoesnotexist/"+workspaceDir+"org/openecomp/Action_mypol2.xml");
- willFail = dbd.getNewTransaction();
- try{
- willFail.createPolicy(fakeFile.getAbsolutePath(), "user1");
- Assert.fail();
- } catch(IllegalArgumentException e){
- if(!e.getMessage().equals("The file path does not exist")){
- Assert.fail();
- }
- }
- willFail.close();
-
- emf = Persistence.createEntityManagerFactory("testPU");
- EntityManager aem = emf.createEntityManager();
- Query actionQuery = aem.createQuery("SELECT a FROM ActionBodyEntity a WHERE a.actionBodyName=:actionBodyName");
- actionQuery.setParameter("actionBodyName", "org.openecomp.Action_mypol.json");
- List> actionQueryList = actionQuery.getResultList();
- if(actionQueryList.size() < 1){
- Assert.fail("ActionBodyEntity not found with actionBodyName=: org.openecomp.Action_mypol.json" );
- } else if(actionQueryList.size() > 1){
- //something went wrong
- Assert.fail("Somehow, more than one ActionBodyEntity with the actionBodyName = org.openecomp.Action_mypol.json");
- } else {
- ActionBodyEntity abe = (ActionBodyEntity)actionQueryList.get(0);
- logger.debug("\n\nPolicyDBDaoTest.transactionTests() Assert.assertEquals"
- + "\n abe.getActionBody() = " + abe.getActionBody()
- + "\n jsonFile = " + jsonFile
- + "\n\n");
- Assert.assertEquals(abe.getActionBody(),jsonFile);
- }
- }
- }
-
+ @Ignore
@Test
public void createFromPolicyObject(){
- String workspaceDir = "src/test/resources/junitTestCreatedDirectory/"+XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_WORKSPACE)+"/admin/"+XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_REPOSITORY);
- File parentPath = new File(workspaceDir+"/org/openecomp");
- File scope = new File(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_WORKSPACE)+"/admin/"+XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_REPOSITORY));
+ String workspaceDir = "src/test/resources/";
+ File parentPath = new File(workspaceDir+"/com");
Policy policyObject = new ConfigPolicy();
policyObject.policyAdapter = new PolicyRestAdapter();
policyObject.policyAdapter.setConfigName("testpolicy1");
policyObject.policyAdapter.setParentPath(parentPath.getAbsolutePath());
- policyObject.policyAdapter.setUserGitPath(scope.getPath());
policyObject.policyAdapter.setPolicyDescription("my description");
policyObject.policyAdapter.setConfigBodyData("this is my test config file");
policyObject.policyAdapter.setPolicyName("testpolicy1");
policyObject.policyAdapter.setConfigType(ConfigPolicy.OTHER_CONFIG);
policyObject.policyAdapter.setPolicyType("Config");
+ policyObject.policyAdapter.setDomainDir("org.openecomp");
PolicyType policyTypeObject = new PolicyType();
policyObject.policyAdapter.setPolicyData(policyTypeObject);
PolicyDBDaoTransaction transaction = dbd.getNewTransaction();
try{
- transaction.createPolicy(policyObject, "testuser1");
- transaction.commitTransaction();
+ transaction.createPolicy(policyObject, "testuser1");
+ transaction.commitTransaction();
} catch(Exception e){
transaction.rollbackTransaction();
Assert.fail();
@@ -350,7 +172,7 @@ public class PolicyDBDaoTest {
try{
result = (PolicyEntity)getDataQuery.getSingleResult();
} catch(Exception e){
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
String expectedData;
@@ -367,7 +189,7 @@ public class PolicyDBDaoTest {
transaction = dbd.getNewTransaction();
transaction.deletePolicy(policyFile.getAbsolutePath());
} catch(Exception e){
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
Assert.assertTrue(transaction.isTransactionOpen());
@@ -385,13 +207,14 @@ public class PolicyDBDaoTest {
transaction = dbd.getNewTransaction();
transaction.deletePolicy(policyFile.getAbsolutePath());
} catch(Exception e){
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
//Assert.assertFalse(transaction.isTransactionOpen());
transaction.commitTransaction();
}
+ @Ignore
@Test
public void groupTransactions(){
PolicyDBDaoTransaction group = dbd.getNewTransaction();
@@ -401,7 +224,7 @@ public class PolicyDBDaoTest {
group.commitTransaction();
} catch(Exception e){
group.rollbackTransaction();
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
EntityManager em = emf.createEntityManager();
@@ -423,7 +246,7 @@ public class PolicyDBDaoTest {
group.commitTransaction();
} catch(Exception e){
group.rollbackTransaction();
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
em = emf.createEntityManager();
@@ -443,7 +266,7 @@ public class PolicyDBDaoTest {
group.commitTransaction();
} catch(Exception e){
group.rollbackTransaction();
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
group = dbd.getNewTransaction();
@@ -452,7 +275,7 @@ public class PolicyDBDaoTest {
group.commitTransaction();
} catch(Exception e){
group.rollbackTransaction();
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
em = emf.createEntityManager();
@@ -474,7 +297,7 @@ public class PolicyDBDaoTest {
group.commitTransaction();
} catch(Exception e){
group.rollbackTransaction();
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
em = emf.createEntityManager();
@@ -495,7 +318,7 @@ public class PolicyDBDaoTest {
group.commitTransaction();
} catch(Exception e){
group.rollbackTransaction();
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
group = dbd.getNewTransaction();
@@ -504,7 +327,7 @@ public class PolicyDBDaoTest {
group.commitTransaction();
} catch(Exception e){
group.rollbackTransaction();
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
@@ -514,7 +337,7 @@ public class PolicyDBDaoTest {
group.commitTransaction();
} catch(Exception e){
group.rollbackTransaction();
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
group = dbd.getNewTransaction();
@@ -523,7 +346,7 @@ public class PolicyDBDaoTest {
group.commitTransaction();
} catch(Exception e){
group.rollbackTransaction();
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
em = emf.createEntityManager();
@@ -543,7 +366,7 @@ public class PolicyDBDaoTest {
group.commitTransaction();
} catch(Exception e){
group.rollbackTransaction();
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
em = emf.createEntityManager();
@@ -578,7 +401,7 @@ public class PolicyDBDaoTest {
group.rollbackTransaction();
} catch(Exception e){
group.rollbackTransaction();
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
@@ -592,7 +415,7 @@ public class PolicyDBDaoTest {
group.updateGroup(pdpGroup, "testuser");
group.commitTransaction();
}catch (Exception e){
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
group.rollbackTransaction();
Assert.fail();
}
@@ -616,13 +439,6 @@ public class PolicyDBDaoTest {
Assert.fail();
}
em.close();
- //update pdp
-
- //set group as default
-
- //move pdp to new group
-
-
}
@Test
@@ -635,8 +451,7 @@ public class PolicyDBDaoTest {
System.out.println("Decrypted password: "+decr);
Assert.assertEquals("testpassword", decr);
} catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}
@@ -647,7 +462,7 @@ public class PolicyDBDaoTest {
String desc = d.getDescriptionFromXacml(""+myTestDesc+"");
Assert.assertEquals(myTestDesc, desc);
}
-
+ @Ignore
@Test
public void threadingStabilityTest(){
if(logger.isDebugEnabled()){
@@ -670,8 +485,7 @@ public class PolicyDBDaoTest {
}
Thread.sleep(sleepTime);
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
}
if(logger.isDebugEnabled()){
Date date= new java.util.Date();
@@ -712,8 +526,7 @@ public class PolicyDBDaoTest {
}
Thread.sleep(sleepTime);
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
}
if(logger.isDebugEnabled()){
Date date= new java.util.Date();
@@ -808,7 +621,7 @@ public class PolicyDBDaoTest {
+ "\n TimeStamp = " + date.getTime()
+ "\n\n");
}
- e.printStackTrace();
+ logger.error("Exception Occured"+e);
Assert.fail();
}