Author: scottmf
Date: 2009-12-15 12:44:25 -0800 (Tue, 15 Dec 2009)
New Revision: 14093
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14093
Modified:
trunk/unittest/data/escalationManagerTests.README
trunk/unittest/data/escalationManagerTests.xml.gz
trunk/unittest/src/org/hyperic/hq/escalation/server/session/EscalationManagerTestEJBImpl.java
Log:
added extra table EAM_REGISTERED_TRIGGER, test should not fail with foreign key violation
Modified: trunk/unittest/data/escalationManagerTests.README
===================================================================
--- trunk/unittest/data/escalationManagerTests.README 2009-12-15 17:44:35 UTC (rev 14092)
+++ trunk/unittest/data/escalationManagerTests.README 2009-12-15 20:44:25 UTC (rev 14093)
@@ -1,4 +1,4 @@
-bin/exportTable.sh -l jdbc:oracle:thin:@localhost:1522:hqdb -u hqadmin -p hqadmin \
+bin/exportTable.sh -l jdbc:mysql://localhost:3306/hqdb -u hqadmin -p hqadmin \
-t EAM_AGENT,\
EAM_AUDIT,\
EAM_CONFIG_RESPONSE,\
@@ -14,6 +14,7 @@
EAM_PLATFORM,\
EAM_PLATFORM_SERVER_TYPE_MAP,\
EAM_PLATFORM_TYPE,\
+EAM_REGISTERED_TRIGGER,\
EAM_RES_GRP_RES_MAP,\
EAM_RESOURCE,\
EAM_RESOURCE_EDGE,\
@@ -36,4 +37,5 @@
EAM_ALERT_DEFINITION,\
EAM_ALERT,\
EAM_ALERT_CONDITION,\
-EAM_ACTION -d escalationManagerTest
+HQ_SEQUENCE,\
+EAM_ACTION -d escalationManagerTests
Modified: trunk/unittest/data/escalationManagerTests.xml.gz
===================================================================
(Binary files differ)
Modified: trunk/unittest/src/org/hyperic/hq/escalation/server/session/EscalationManagerTestEJBImpl.java
===================================================================
--- trunk/unittest/src/org/hyperic/hq/escalation/server/session/EscalationManagerTestEJBImpl.java 2009-12-15 17:44:35 UTC (rev 14092)
+++ trunk/unittest/src/org/hyperic/hq/escalation/server/session/EscalationManagerTestEJBImpl.java 2009-12-15 20:44:25 UTC (rev 14093)
@@ -52,16 +52,16 @@
state.setAcknowledgedBy(null);
state.setNextAction(0);
state.setNextActionTime(System.currentTimeMillis()+MeasurementConstants.DAY);
- int alertId = 10105;
- Escalation esc = eMan.findById(new Integer(100));
+ int alertId = 10100;
+ Escalation esc = eMan.findById(new Integer(10100));
state.setEscalation(esc);
state.setAlertId(alertId);
- state.setAlertDefinitionId(10001);
+ state.setAlertDefinitionId(10100);
state.setAlertTypeEnum(-559038737);
getOne().runEscalation(state);
aMan.deleteAlerts(new Integer[] {new Integer(alertId)});
Assert.assertNull(
- "alert 10105 should not exist", aMan.getAlertById(new Integer(10105)));
+ "alert " + alertId + " should not exist", aMan.getAlertById(new Integer(alertId)));
try {
// should exit without any errors
eMan.executeState(state.getId());
|
