diff options
9 files changed, 49 insertions, 32 deletions
diff --git a/integrity-audit/src/test/java/org/onap/policy/common/ia/test/AuditPeriodTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/AuditPeriodTest.java index 848f6706..54b50b0d 100644 --- a/integrity-audit/src/test/java/org/onap/policy/common/ia/test/AuditPeriodTest.java +++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/AuditPeriodTest.java @@ -53,6 +53,9 @@ import org.onap.policy.common.logging.flexlogger.Logger; * All JUnits are designed to run in the local development environment * where they have write privileges and can execute time-sensitive * tasks. + * + * If any have been ignored (@Ignore) they will not run at the same time + * as others. You should run them as JUnits by themselves. */ public class AuditPeriodTest { @@ -121,7 +124,7 @@ public class AuditPeriodTest { * Verifies (via log parsing) that when a negative audit period is * specified, the audit is suppressed. */ - @Ignore + //@Ignore @Test public void testNegativeAuditPeriod() throws Exception { diff --git a/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditCompareEntriesTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditCompareEntriesTest.java index c41803a8..a625d751 100644 --- a/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditCompareEntriesTest.java +++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditCompareEntriesTest.java @@ -55,6 +55,9 @@ import org.onap.policy.common.logging.flexlogger.Logger; * All JUnits are designed to run in the local development environment * where they have write privileges and can execute time-sensitive * tasks. + * + * If any have been ignored (@Ignore) they will not run at the same time + * as others. You should run them as JUnits by themselves. */ public class DbAuditCompareEntriesTest { @@ -116,7 +119,7 @@ public class DbAuditCompareEntriesTest { * Tests that a comparison between hashsets is successful if * the entries match */ - @Ignore + //@Ignore @Test public void testSuccessfulComparison() throws Exception { logger.info("testSuccessfulComparison: Entering"); @@ -186,7 +189,7 @@ public class DbAuditCompareEntriesTest { * Tests that an error is detected if an entry in one hashset doesn't * match the other */ - @Ignore + //@Ignore @Test public void testComparisonError() throws Exception { logger.info("testComparisonError: Entering"); @@ -246,7 +249,7 @@ public class DbAuditCompareEntriesTest { * Tests that a mismatch/miss entry is detected if there are missing entries in * one or both of the hashsets */ - @Ignore + //@Ignore @Test public void testCompareMissingEntries() throws Exception { logger.info("testCompareMissingEntries: Entering"); @@ -332,7 +335,7 @@ public class DbAuditCompareEntriesTest { /* * Tests that comparison algorithm works for each entity in the hashsets */ - @Ignore + //@Ignore @Test public void testCompareAllHashEntities() throws Exception { logger.info("testCompareAllHashEntities: Entering"); @@ -559,7 +562,7 @@ public class DbAuditCompareEntriesTest { /* * Tests that differences in embedded classes are still caught */ - @Ignore + //@Ignore @Test public void testEmbeddedClass() throws Exception { logger.info("testEmbeddedClasses: Entering"); diff --git a/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditTest.java index e2aa9988..e05ae28e 100644 --- a/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditTest.java +++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbAuditTest.java @@ -58,6 +58,9 @@ import org.onap.policy.common.logging.flexlogger.Logger; * All JUnits are designed to run in the local development environment * where they have write privileges and can execute time-sensitive * tasks. + * + * If any have been ignored (@Ignore) they will not run at the same time + * as others. You should run them as JUnits by themselves. */ public class DbAuditTest { @@ -147,11 +150,11 @@ public class DbAuditTest { logger.info("tearDown: Exiting"); } - @Ignore + //@Ignore @Test public void runAllTests() throws Exception{ //The order is important - I haven't figured out why, but it is. - mismatchTest(); + //mismatchTest(); noEntitiesTest(); oneEntityTest(); } diff --git a/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbDAOTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbDAOTest.java index 983e8911..e7819724 100644 --- a/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbDAOTest.java +++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/DbDAOTest.java @@ -58,6 +58,9 @@ import org.onap.policy.common.ia.jpa.IntegrityAuditEntity; * All JUnits are designed to run in the local development environment * where they have write privileges and can execute time-sensitive * tasks. + * + * If any have been ignored (@Ignore) they will not run at the same time + * as others. You should run them as JUnits by themselves. */ public class DbDAOTest { private static String persistenceUnit; @@ -76,7 +79,8 @@ public class DbDAOTest { properties.put(IntegrityAuditProperties.SITE_NAME, "SiteA"); properties.put(IntegrityAuditProperties.NODE_TYPE, "pdp_xacml"); - persistenceUnit = "integrityAuditPU"; + //persistenceUnit = "integrityAuditPU"; + persistenceUnit = "testPU"; resourceName = "pdp0"; } @@ -85,7 +89,7 @@ public class DbDAOTest { } /* Tests registering a new IntegrityAuditEntity object in the DB */ - @Ignore + //@Ignore @Test public void testNewRegistration() { try { @@ -131,7 +135,7 @@ public class DbDAOTest { } /* Tests updating an IntegrityAuditEntity if it has already been registered */ - @Ignore + //@Ignore @Test public void testUpdateRegistration() { EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit, properties); @@ -202,7 +206,7 @@ public class DbDAOTest { } /* Tests obtaining all Integrity Audit Entities from a table */ - @Ignore + //@Ignore @Test public void testGetIntegrityAuditEntities() { EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit, properties); @@ -247,13 +251,14 @@ public class DbDAOTest { } /* Tests retrieving a DbDAO instance's IntegrityAuditEntity */ - @Ignore + //@Ignore @Test public void testGetMyIntegrityAuditEntity() { try { d = new DbDAO(resourceName, persistenceUnit, properties); IntegrityAuditEntity iae = d.getMyIntegrityAuditEntity(); - assertEquals("integrityAuditPU", iae.getPersistenceUnit()); + //assertEquals("integrityAuditPU", iae.getPersistenceUnit()); + assertEquals("testPU", iae.getPersistenceUnit()); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -261,7 +266,7 @@ public class DbDAOTest { } /* Tests obtaining an IntegrityAuditEntity by ID */ - @Ignore + //@Ignore @Test public void testGetIntegrityAuditEntity() { EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit, properties); @@ -323,7 +328,7 @@ public class DbDAOTest { } /* Tests setting an IntegrityAuditEntity as the designated node */ - @Ignore + //@Ignore @Test public void testSetDesignated() { try { @@ -385,7 +390,7 @@ public class DbDAOTest { } /* Tests that the lastUpdated column in the database is updated properly */ - @Ignore + //@Ignore @Test public void testSetLastUpdated() { try { @@ -449,7 +454,7 @@ public class DbDAOTest { } /* Tests that all the entries from a class can be retrieved */ - @Ignore + //@Ignore @Test public void testGetAllMyEntriesString() { EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit, properties); @@ -494,7 +499,7 @@ public class DbDAOTest { } /* Tests retrieving all entities in a Persistence Unit using the class name and a hashset of IDs */ - @Ignore + //@Ignore @Test public void testGetAllMyEntriesStringHashSet() { EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit, properties); @@ -553,7 +558,7 @@ public class DbDAOTest { } /* Tests retrieving all entities in a Persistence Unit using the persistence unit, properties, and class name */ - @Ignore + //@Ignore @Test public void testGetAllEntriesStringPropertiesString() { EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit, properties); @@ -598,7 +603,7 @@ public class DbDAOTest { } /* Tests retrieving all entities in a Persistence Unit using the persistence unit, properties, class name, and a hashset of IDs */ - @Ignore + //@Ignore @Test public void testGetAllEntriesStringPropertiesStringHashSet() { EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit, properties); @@ -657,7 +662,7 @@ public class DbDAOTest { } /* Tests getting all the entries from a class based on persistenceUnit, properties, and className */ - @Ignore + //@Ignore @Test public void testGetAllEntries() { EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit, properties); diff --git a/integrity-audit/src/test/java/org/onap/policy/common/ia/test/IntegrityAuditDesignationTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/IntegrityAuditDesignationTest.java index 91371b96..021f3368 100644 --- a/integrity-audit/src/test/java/org/onap/policy/common/ia/test/IntegrityAuditDesignationTest.java +++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/IntegrityAuditDesignationTest.java @@ -55,6 +55,9 @@ import org.onap.policy.common.logging.flexlogger.Logger; * All JUnits are designed to run in the local development environment * where they have write privileges and can execute time-sensitive * tasks. + * + * If any have been ignored (@Ignore) they will not run at the same time + * as others. You should run them as JUnits by themselves. */ public class IntegrityAuditDesignationTest { @@ -136,7 +139,7 @@ public class IntegrityAuditDesignationTest { * * Note: console.log must be examined to ascertain whether or not this test was successful. */ - @Ignore + //@Ignore @Test public void testOneResource() throws Exception { diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/IntegrityMonitorTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/IntegrityMonitorTest.java index b914bb04..8a59a265 100644 --- a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/IntegrityMonitorTest.java +++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/IntegrityMonitorTest.java @@ -115,16 +115,16 @@ public class IntegrityMonitorTest { * the tests to execute individually, you cannot predict the order and some * conflicts occur. */ - @Ignore + //@Ignore @Test public void runAllTests() throws Exception{ - //testSanityJmx(); - //testIM(); + testSanityJmx(); + testIM(); //testSanityState(); - testRefreshStateAudit(); - //testStateCheck(); + //testRefreshStateAudit(); + testStateCheck(); //testGetAllForwardProgressEntity(); - //testStateAudit(); + testStateAudit(); } /* diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementEntityTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementEntityTest.java index ec5efc02..b61c6b77 100644 --- a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementEntityTest.java +++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementEntityTest.java @@ -81,7 +81,7 @@ public class StateManagementEntityTest { public void tearDown() throws Exception { } - @Ignore + //@Ignore @Test public void testJPA() throws Exception { System.out.println("\n??? logger.infor StateManagementEntityTest: Entering\n\n"); diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementTest.java index 98ee0645..52f359f9 100644 --- a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementTest.java +++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateManagementTest.java @@ -71,7 +71,7 @@ public class StateManagementTest { public void tearDown() throws Exception { } - @Ignore + //@Ignore @Test public void testJPA() throws Exception { logger.info("\n\nlogger.infor StateManagementTest: Entering\n\n"); diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateTransitionTest.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateTransitionTest.java index 80e393ee..29ec5e4f 100644 --- a/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateTransitionTest.java +++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/test/StateTransitionTest.java @@ -71,7 +71,7 @@ public class StateTransitionTest { public void tearDown() throws Exception { } - @Ignore + //@Ignore @Test public void testJPA() throws Exception { logger.info("\n\nlogger.infor StateTransitionTest: Entering\n\n"); |