Menu
▾
▴
[Openhpi-svn] SF.net SVN: openhpi: [6728] testsuite/trunk/ann
|
From: <sun...@us...> - 2008-03-25 07:14:50
|
Revision: 6728
http://openhpi.svn.sourceforge.net/openhpi/?rev=6728&view=rev
Author: suntrupth
Date: 2008-03-25 00:14:47 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
All annunciator unit tests are modified
Modified Paths:
--------------
testsuite/trunk/ann/ann_test_001.py
testsuite/trunk/ann/ann_test_002.py
testsuite/trunk/ann/ann_test_003.py
testsuite/trunk/ann/ann_test_004.py
testsuite/trunk/ann/ann_test_005.py
testsuite/trunk/ann/ann_test_006.py
testsuite/trunk/ann/ann_test_007.py
testsuite/trunk/ann/ann_test_008.py
Modified: testsuite/trunk/ann/ann_test_001.py
===================================================================
--- testsuite/trunk/ann/ann_test_001.py 2008-03-24 21:28:06 UTC (rev 6727)
+++ testsuite/trunk/ann/ann_test_001.py 2008-03-25 07:14:47 UTC (rev 6728)
@@ -17,29 +17,25 @@
import unittest
from openhpi import *
-"""
- runTest : Announcement test
+class TestSequence(unittest.TestCase):
+
+ """
+ runTest : Announcement test
- This test tests the creation of an announcement list.
+ This test tests the creation of an announcement list.
- Return value: 0 on success, 1 on failure
-"""
+ Return value: 0 on success, 1 on failure
+ """
-def runTest(self):
- ann = oh_announcement()
- ann = oh_announcement_create()
+ def runTest(self):
+ ann = oh_announcement()
+ ann = oh_announcement_create()
- if(ann == None):
- print "ERROR: ann pointer == None."
- return 1
+ self.assertEqual(ann != None, True)
- if(ann.nextId != SAHPI_OLDEST_ENTRY + 1):
- print "ERROR: ann.nextId invalid."
- return 1
-
- if(ann.annentries != None):
- print "ERROR: ann.annentries invalid."
- return 1
-
-if __name__=='__main__':
- unittest.main()
+ self.assertEqual(ann.nextId == SAHPI_OLDEST_ENTRY + 1,True)
+
+ self.assertEqual(ann.annentries == None, True)
+
+ if __name__=='__main__':
+ unittest.main()
Modified: testsuite/trunk/ann/ann_test_002.py
===================================================================
--- testsuite/trunk/ann/ann_test_002.py 2008-03-24 21:28:06 UTC (rev 6727)
+++ testsuite/trunk/ann/ann_test_002.py 2008-03-25 07:14:47 UTC (rev 6728)
@@ -17,50 +17,48 @@
import unittest
from openhpi import *
-"""
- main: Announcement test
+class TestSequence(unittest.TestCase):
+
+ """
+ main: Announcement test
- This test adds one announcement to the list
+ This test adds one announcement to the list
- Return value: 0 on success, 1 on failure
-"""
+ Return value: 0 on success, 1 on failure
+ """
-def runTest(self):
- ann=oh_announcement()
- announ=SaHpiAnnouncementT()
- rc=SaErrorT()
+ def runTest(self):
+ announ=SaHpiAnnouncementT( # <-- Constructor
+ EntryId=0, # <-- keyword argument example
+ Timestamp=0,
+ AddedByUser=SAHPI_FALSE,
+ Severity=SAHPI_CRITICAL,
+ Acknowledged=SAHPI_FALSE,
+ StatusCond=SaHpiConditionT(
+ Type=SAHPI_STATUS_COND_TYPE_SENSOR,
+ Entity=SaHpiEntityPathT(
+ Entry=[
+ SaHpiEntityT(EntityType=SAHPI_ENT_SYSTEM_BOARD, EntityLocation=1),
+ SaHpiEntityT(EntityType=SAHPI_ENT_ROOT, EntityLocation=0)
+ ]
+ ),
+ DomaindId=1,
+ ResourceId=1,
+ SensorNum=1,
+ EventState=SAHPI_ES_UNSPECIFIED,
+ Name=SaHpiNameT(Length=6, Value='announ'), # Length equals the length of Value.
+ Mid=123
+ )
+
+ ) # we will not worry about the Data field for this test
- announ.EntryId = 0 # modified by oh_announcement_append
- announ.Timestamp = 0 # modified by oh_announcement_append
- announ.AddedByUser = False # modified by oh_announcement_append
- announ.Severity = SAHPI_CRITICAL
- announ.Acknowledged = False
- announ.StatusCond.Type= SAHPI_STATUS_COND_TYPE_SENSOR
- announ.StatusCond.Entity.Entry[0].EntityType = SAHPI_ENT_SYSTEM_BOARD
- announ.StatusCond.Entity.Entry[0].EntityLocation = 1
- announ.StatusCond.Entity.Entry[1].EntityType = SAHPI_ENT_ROOT
- announ.StatusCond.Entity.Entry[1].EntityLocation = 0
- announ.StatusCond.DomainId = 1
- announ.StatusCond.ResourceId = 1
- announ.StatusCond.SensorNum = 1
- announ.StatusCond.EventState = SAHPI_ES_UNSPECIFIED
- announ.StatusCond.Name.Length = 5
- memcpy(announ.StatusCond.Name.Value,"announ", 5)
- announ.StatusCond.Mid = 123
- # we will not worry about the Data field for this test
+ ann = oh_announcement_create()
- ann = oh_announcement_create()
+ rc = oh_announcement_append(ann, announ)
- rc = oh_announcement_append(ann, announ)
+ self.assertEqual(ann.nextId != SAHPI_OLDEST_ENTRY + 2,True)
+
+ self.assertEqual(ann.annentries == None,True)
- if(ann.nextId != SAHPI_OLDEST_ENTRY + 2):
- print "ERROR: ann.nextId invalid."
- return 1
-
- if(ann.annentries == None):
- print "ERROR: ann.annentries invalid."
- return 1
-
-if __name__=='__main__':
- unittest.main()
-
+ if __name__=='__main__':
+ unittest.main()
Modified: testsuite/trunk/ann/ann_test_003.py
===================================================================
--- testsuite/trunk/ann/ann_test_003.py 2008-03-24 21:28:06 UTC (rev 6727)
+++ testsuite/trunk/ann/ann_test_003.py 2008-03-25 07:14:47 UTC (rev 6728)
@@ -17,55 +17,54 @@
import unittest
from openhpi import *
-"""
- main: Announcement test
+class TestSequence(unittest.TestCase):
+
+ """
+ main: Announcement test
- This test adds one announcement to the list
+ This test adds one announcement to the list
- Return value: 0 on success, 1 on failure
- """
+ Return value: 0 on success, 1 on failure
+ """
-def runTest(self):
- ann=oh_announcement()
- announ=SaHpiAnnouncementT()
- rc=SaErrorT()
+ def runTest(self):
+ announ=SaHpiAnnouncementT( # <-- Constructor
+ EntryId=0, # <-- keyword argument example
+ Timestamp=0,
+ AddedByUser=SAHPI_FALSE,
+ Severity=SAHPI_CRITICAL,
+ Acknowledged=SAHPI_FALSE,
+ StatusCond=SaHpiConditionT(
+ Type=SAHPI_STATUS_COND_TYPE_SENSOR,
+ Entity=SaHpiEntityPathT(
+ Entry=[
+ SaHpiEntityT(EntityType=SAHPI_ENT_SYSTEM_BOARD, EntityLocation=1),
+ SaHpiEntityT(EntityType=SAHPI_ENT_ROOT, EntityLocation=0)
+ ]
+ ),
+ DomaindId=1,
+ ResourceId=1,
+ SensorNum=1,
+ EventState=SAHPI_ES_UNSPECIFIED,
+ Name=SaHpiNameT(Length=6, Value='announ'), # Length equals the length of Value.
+ Mid=123
+ )
+
+ ) # we will not worry about the Data field for this test
- announ.EntryId = 0 # modified by oh_announcement_append
- announ.Timestamp = 0 # modified by oh_announcement_append
- announ.AddedByUser = False # modified by oh_announcement_append
- announ.Severity = SAHPI_CRITICAL
- announ.Acknowledged = False
- announ.StatusCond.Type= SAHPI_STATUS_COND_TYPE_SENSOR
- announ.StatusCond.Entity.Entry[0].EntityType = SAHPI_ENT_SYSTEM_BOARD
- announ.StatusCond.Entity.Entry[0].EntityLocation = 1
- announ.StatusCond.Entity.Entry[1].EntityType = SAHPI_ENT_ROOT
- announ.StatusCond.Entity.Entry[1].EntityLocation = 0
- announ.StatusCond.DomainId = 1
- announ.StatusCond.ResourceId = 1
- announ.StatusCond.SensorNum = 1
- announ.StatusCond.EventState = SAHPI_ES_UNSPECIFIED
- announ.StatusCond.Name.Length = 5
- memcpy(announ.StatusCond.Name.Value,"announ", 5)
- announ.StatusCond.Mid = 123
- # we will not worry about the Data field for this test
+ ann = oh_announcement_create()
- ann = oh_announcement_create()
+ rc = oh_announcement_append(ann, announ)
- rc = oh_announcement_append(ann, announ)
+ announ.Severity = SAHPI_MAJOR
+ rc = oh_announcement_append(ann, announ)
- announ.Severity = SAHPI_MAJOR
- rc = oh_announcement_append(ann, announ)
+ announ.Severity = SAHPI_MINOR
+ rc = oh_announcement_append(ann, announ)
- announ.Severity = SAHPI_MINOR
- rc = oh_announcement_append(ann, announ)
+ self.assertEqual(ann.nextId != SAHPI_OLDEST_ENTRY + 4,True)
- if(ann.nextId != SAHPI_OLDEST_ENTRY + 4):
- print "ERROR: ann.nextId invalid."
- return 1
-
- if(ann.annentries == None):
- print "ERROR: ann.annentries invalid."
- return 1
+ self.assertEqual(ann.annentries == None,True)
-if __name__=='__main__':
+ if __name__=='__main__':
unittest.main()
Modified: testsuite/trunk/ann/ann_test_004.py
===================================================================
--- testsuite/trunk/ann/ann_test_004.py 2008-03-24 21:28:06 UTC (rev 6727)
+++ testsuite/trunk/ann/ann_test_004.py 2008-03-25 07:14:47 UTC (rev 6728)
@@ -17,58 +17,56 @@
import unittest
from openhpi import *
-"""
- main: Announcement test
+class TestSequence(unittest.TestCase):
+
+ """
+ main: Announcement test
- This test adds one announcement to the list
+ This test adds one announcement to the list
- Return value: 0 on success, 1 on failure
-"""
+ Return value: 0 on success, 1 on failure
+ """
-def runTest(self):
- ann=oh_announcement()
- announ=SaHpiAnnouncementT()
- rc=SaErrorT()
+ def runTest(self):
+ announ=SaHpiAnnouncementT( # <-- Constructor
+ EntryId=0, # <-- keyword argument example
+ Timestamp=0,
+ AddedByUser=SAHPI_FALSE,
+ Severity=SAHPI_CRITICAL,
+ Acknowledged=SAHPI_FALSE,
+ StatusCond=SaHpiConditionT(
+ Type=SAHPI_STATUS_COND_TYPE_SENSOR,
+ Entity=SaHpiEntityPathT(
+ Entry=[
+ SaHpiEntityT(EntityType=SAHPI_ENT_SYSTEM_BOARD, EntityLocation=1),
+ SaHpiEntityT(EntityType=SAHPI_ENT_ROOT, EntityLocation=0)
+ ]
+ ),
+ DomaindId=1,
+ ResourceId=1,
+ SensorNum=1,
+ EventState=SAHPI_ES_UNSPECIFIED,
+ Name=SaHpiNameT(Length=6, Value='announ'), # Length equals the length of Value.
+ Mid=123
+ )
+
+ ) # we will not worry about the Data field for this test
- announ.EntryId = 0 # modified by oh_announcement_append
- announ.Timestamp = 0 # modified by oh_announcement_append
- announ.AddedByUser = False # modified by oh_announcement_append
- announ.Severity = SAHPI_CRITICAL
- announ.Acknowledged = False
- announ.StatusCond.Type= SAHPI_STATUS_COND_TYPE_SENSOR
- announ.StatusCond.Entity.Entry[0].EntityType = SAHPI_ENT_SYSTEM_BOARD
- announ.StatusCond.Entity.Entry[0].EntityLocation = 1
- announ.StatusCond.Entity.Entry[1].EntityType = SAHPI_ENT_ROOT
- announ.StatusCond.Entity.Entry[1].EntityLocation = 0
- announ.StatusCond.DomainId = 1
- announ.StatusCond.ResourceId = 1
- announ.StatusCond.SensorNum = 1
- announ.StatusCond.EventState = SAHPI_ES_UNSPECIFIED
- announ.StatusCond.Name.Length = 5
- memcpy(announ.StatusCond.Name.Value,"announ", 5)
- announ.StatusCond.Mid = 123
- # we will not worry about the Data field for this test
+ ann = oh_announcement_create()
- ann = oh_announcement_create()
+ rc = oh_announcement_append(ann, announ)
- rc = oh_announcement_append(ann, announ)
+ announ.Severity = SAHPI_MAJOR
+ rc = oh_announcement_append(ann, announ)
- announ.Severity = SAHPI_MAJOR
- rc = oh_announcement_append(ann, announ)
+ announ.Severity = SAHPI_MINOR
+ rc = oh_announcement_append(ann, announ)
- announ.Severity = SAHPI_MINOR
- rc = oh_announcement_append(ann, announ)
+ rc = oh_announcement_get(ann, 2, announ)
- rc = oh_announcement_get(ann, 2, announ)
+ self.assertEqual(announ.EntryId != 2,True)
- if(announ.EntryId != 2):
- print "ERROR: announ.EntryId invalid."
- return 1
-
+ self.assertEqual(announ.Severity != SAHPI_MAJOR,True)
- if(announ.Severity != SAHPI_MAJOR):
- print "ERROR: announ.Severity invalid."
- return 1
-
-if __name__=='__main__':
+ if __name__=='__main__':
unittest.main()
Modified: testsuite/trunk/ann/ann_test_005.py
===================================================================
--- testsuite/trunk/ann/ann_test_005.py 2008-03-24 21:28:06 UTC (rev 6727)
+++ testsuite/trunk/ann/ann_test_005.py 2008-03-25 07:14:47 UTC (rev 6728)
@@ -17,89 +17,72 @@
import unittest
from openhpi import *
+class TestSequence(unittest.TestCase):
-"""
- main: Announcement test
+ """
+ main: Announcement test
- This test adds one announcement to the list
+ This test adds one announcement to the list
- Return value: 0 on success, 1 on failure
-"""
+ Return value: 0 on success, 1 on failure
+ """
-def runTest(self):
- ann=oh_announcement()
- announ=SaHpiAnnouncementT()
- rc=SaErrorT()
+ def runTest(self):
+ announ=SaHpiAnnouncementT( # <-- Constructor
+ EntryId=0, # <-- keyword argument example
+ Timestamp=0,
+ AddedByUser=SAHPI_FALSE,
+ Severity=SAHPI_CRITICAL,
+ Acknowledged=SAHPI_FALSE,
+ StatusCond=SaHpiConditionT(
+ Type=SAHPI_STATUS_COND_TYPE_SENSOR,
+ Entity=SaHpiEntityPathT(
+ Entry=[
+ SaHpiEntityT(EntityType=SAHPI_ENT_SYSTEM_BOARD, EntityLocation=1),
+ SaHpiEntityT(EntityType=SAHPI_ENT_ROOT, EntityLocation=0)
+ ]
+ ),
+ DomaindId=1,
+ ResourceId=1,
+ SensorNum=1,
+ EventState=SAHPI_ES_UNSPECIFIED,
+ Name=SaHpiNameT(Length=6, Value='announ'), # Length equals the length of Value.
+ Mid=123
+ )
+
+ ) # we will not worry about the Data field for this test
- announ.EntryId = 0 # modified by oh_announcement_append
- announ.Timestamp = 0 # modified by oh_announcement_append
- announ.AddedByUser = False # modified by oh_announcement_append
- announ.Severity = SAHPI_CRITICAL
- announ.Acknowledged = False
- announ.StatusCond.Type= SAHPI_STATUS_COND_TYPE_SENSOR
- announ.StatusCond.Entity.Entry[0].EntityType = SAHPI_ENT_SYSTEM_BOARD
- announ.StatusCond.Entity.Entry[0].EntityLocation = 1
- announ.StatusCond.Entity.Entry[1].EntityType = SAHPI_ENT_ROOT
- announ.StatusCond.Entity.Entry[1].EntityLocation = 0
- announ.StatusCond.DomainId = 1
- announ.StatusCond.ResourceId = 1
- announ.StatusCond.SensorNum = 1
- announ.StatusCond.EventState = SAHPI_ES_UNSPECIFIED
- announ.StatusCond.Name.Length = 5
- memcpy(announ.StatusCond.Name.Value,"announ", 5)
- announ.StatusCond.Mid = 123
- # we will not worry about the Data field for this test
+ ann = oh_announcement_create()
- ann = oh_announcement_create()
+ rc = oh_announcement_append(ann, announ)
+ self.assertEqual(rc != SA_OK,True)
+
+ announ.Severity = SAHPI_MAJOR
+ rc = oh_announcement_append(ann, announ)
+ self.assertEqual (rc != SA_OK,True)
- rc = oh_announcement_append(ann, announ)
- if (rc != SA_OK):
- print "ERROR: 1 oh_announcement_append failed."
- return 1
+ announ.Severity = SAHPI_MINOR
+ rc = oh_announcement_append(ann, announ)
+ self.assertEqual (rc != SA_OK,True)
+
+ announ.Severity = SAHPI_CRITICAL
+ rc = oh_announcement_append(ann, announ)
+ self.assertEqual (rc != SA_OK,True)
+
+ announ.EntryId = SAHPI_FIRST_ENTRY
+ announ.Timestamp = 0
+ rc = oh_announcement_get_next(ann, SAHPI_ALL_SEVERITIES, FALSE, announ)
+ self.assertEqual(rc != SA_OK,True)
- announ.Severity = SAHPI_MAJOR
- rc = oh_announcement_append(ann, announ)
- if (rc != SA_OK):
- print "ERROR: 2 oh_announcement_append failed."
- return 1
-
- announ.Severity = SAHPI_MINOR
- rc = oh_announcement_append(ann, announ)
- if (rc != SA_OK):
- print "ERROR: 3 oh_announcement_append failed."
- return 1
-
- announ.Severity = SAHPI_CRITICAL
- rc = oh_announcement_append(ann, announ)
- if (rc != SA_OK):
- print "ERROR: 4 oh_announcement_append failed."
- return 1
-
- announ.EntryId = SAHPI_FIRST_ENTRY
- announ.Timestamp = 0
- rc = oh_announcement_get_next(ann, SAHPI_ALL_SEVERITIES, FALSE, announ)
- if(rc != SA_OK):
- print "ERROR: on_announcement_get_next returned " + rc
- return 1
- print "EntryId" + announ.EntryId + "returned with Severity" + announ.Severity
+ rc = oh_announcement_get_next(ann, SAHPI_ALL_SEVERITIES, FALSE, announ)
+ self.assertEqual(rc != SA_OK,True)
- rc = oh_announcement_get_next(ann, SAHPI_ALL_SEVERITIES, FALSE, announ)
- if(rc != SA_OK) :
- print "ERROR: on_announcement_get_next returned ", rc
- return 1
- print "EntryId " + announ.EntryId + "returned with Severity" + announ.Severity
+ rc = oh_announcement_get(ann, 1, announ)
+ self.assertEqual (rc != SA_OK,True)
+
+ rc = oh_announcement_get_next(ann, SAHPI_CRITICAL, FALSE, announ)
+ self.assertEqual((rc != SA_OK or announ.Severity == SAHPI_CRITICAL),True)
- rc = oh_announcement_get(ann, 1, announ)
- if (rc != SA_OK):
- print "ERROR: oh_announcement_get did not find anything."
- return 1
-
- rc = oh_announcement_get_next(ann, SAHPI_CRITICAL, FALSE, announ)
- if(rc != SA_OK or announ.Severity != SAHPI_CRITICAL):
- print " ERROR: on_announcement_get_next returned :" + rc + "Severity returned is :" + announ.Severity + "EntryId :" +announ.EntryId
- return 1
- print "EntryId" + announ.EntryId + "returned."
+ if __name__=='__main__':
+ unittest.main()
-if __name__=='__main__':
- unittest.main()
-
Modified: testsuite/trunk/ann/ann_test_006.py
===================================================================
--- testsuite/trunk/ann/ann_test_006.py 2008-03-24 21:28:06 UTC (rev 6727)
+++ testsuite/trunk/ann/ann_test_006.py 2008-03-25 07:14:47 UTC (rev 6728)
@@ -17,62 +17,59 @@
import unittest
from openhpi import *
-"""
- * main: Announcement test
- *
- * This test adds one announcement to the list
- *
- * Return value: 0 on success, 1 on failure
-"""
+class TestSequence(unittest.TestCase):
-def runTest(self):
- ann=oh_announcement()
- announ=SaHpiAnnouncementT()
- rc=SaErrorT()
+ """
+ main: Announcement test
+
+ This test adds one announcement to the list
+
+ Return value: 0 on success, 1 on failure
+ """
- announ.EntryId = 0 # modified by oh_announcement_append
- announ.Timestamp = 0 # modified by oh_announcement_append
- announ.AddedByUser = False # modified by oh_announcement_append
- announ.Severity = SAHPI_CRITICAL
- announ.Acknowledged = False
- announ.StatusCond.Type= SAHPI_STATUS_COND_TYPE_SENSOR
- announ.StatusCond.Entity.Entry[0].EntityType = SAHPI_ENT_SYSTEM_BOARD
- announ.StatusCond.Entity.Entry[0].EntityLocation = 1
- announ.StatusCond.Entity.Entry[1].EntityType = SAHPI_ENT_ROOT
- announ.StatusCond.Entity.Entry[1].EntityLocation = 0
- announ.StatusCond.DomainId = 1
- announ.StatusCond.ResourceId = 1
- announ.StatusCond.SensorNum = 1
- announ.StatusCond.EventState = SAHPI_ES_UNSPECIFIED
- announ.StatusCond.Name.Length = 5
- memcpy(announ.StatusCond.Name.Value,"announ", 5)
- announ.StatusCond.Mid = 123
- # we will not worry about the Data field for this test
+ def runTest(self):
+ announ=SaHpiAnnouncementT( # <-- Constructor
+ EntryId=0, # <-- keyword argument example
+ Timestamp=0,
+ AddedByUser=SAHPI_FALSE,
+ Severity=SAHPI_CRITICAL,
+ Acknowledged=SAHPI_FALSE,
+ StatusCond=SaHpiConditionT(
+ Type=SAHPI_STATUS_COND_TYPE_SENSOR,
+ Entity=SaHpiEntityPathT(
+ Entry=[
+ SaHpiEntityT(EntityType=SAHPI_ENT_SYSTEM_BOARD, EntityLocation=1),
+ SaHpiEntityT(EntityType=SAHPI_ENT_ROOT, EntityLocation=0)
+ ]
+ ),
+ DomaindId=1,
+ ResourceId=1,
+ SensorNum=1,
+ EventState=SAHPI_ES_UNSPECIFIED,
+ Name=SaHpiNameT(Length=6, Value='announ'), # Length equals the length of Value.
+ Mid=123
+ )
+
+ ) # we will not worry about the Data field for this test
- ann = oh_announcement_create()
+ ann = oh_announcement_create()
- rc = oh_announcement_append(ann, announ)
+ rc = oh_announcement_append(ann, announ)
- announ.Severity = SAHPI_MAJOR
- rc = oh_announcement_append(ann, announ)
+ announ.Severity = SAHPI_MAJOR
+ rc = oh_announcement_append(ann, announ)
- announ.Severity = SAHPI_MINOR
- rc = oh_announcement_append(ann, announ)
+ announ.Severity = SAHPI_MINOR
+ rc = oh_announcement_append(ann, announ)
- rc = oh_announcement_ack(ann, 2, SAHPI_MAJOR)
- if(rc != SA_OK):
- print "ERROR: on_announcement_ack returned " +rc
- return 1
-
- rc = oh_announcement_get(ann, 2, announ)
- if(rc != SA_OK):
- print "ERROR: on_announcement_get returned " +rc
- return 1
-
- if(announ.Acknowledged != TRUE):
- print "ERROR: announ.Acknowledged invalid" +rc
- return 1
-
-if __name__=='__main__':
- unittest.main()
+ rc = oh_announcement_ack(ann, 2, SAHPI_MAJOR)
+ self.assertEqual(rc != SA_OK,True)
+
+ rc = oh_announcement_get(ann, 2, announ)
+ self.assertEqual(rc != SA_OK)
+
+ self.assertEqual(announ.Acknowledged != TRUE,True)
+
+ if __name__=='__main__':
+ unittest.main()
Modified: testsuite/trunk/ann/ann_test_007.py
===================================================================
--- testsuite/trunk/ann/ann_test_007.py 2008-03-24 21:28:06 UTC (rev 6727)
+++ testsuite/trunk/ann/ann_test_007.py 2008-03-25 07:14:47 UTC (rev 6728)
@@ -17,56 +17,55 @@
import unittest
from openhpi import *
-"""
- main: Announcement test
+class TestSequence(unittest.TestCase):
+
+ """
+ main: Announcement test
- This test adds one announcement to the list
+ This test adds one announcement to the list
- Return value: 0 on success, 1 on failure
-"""
+ Return value: 0 on success, 1 on failure
+ """
-def runTest(self):
- ann=oh_announcement()
- announ=SaHpiAnnouncementT()
- rc=SaErrorT()
+ def runTest(self):
+ announ=SaHpiAnnouncementT( # <-- Constructor
+ EntryId=0, # <-- keyword argument example
+ Timestamp=0,
+ AddedByUser=SAHPI_FALSE,
+ Severity=SAHPI_CRITICAL,
+ Acknowledged=SAHPI_FALSE,
+ StatusCond=SaHpiConditionT(
+ Type=SAHPI_STATUS_COND_TYPE_SENSOR,
+ Entity=SaHpiEntityPathT(
+ Entry=[
+ SaHpiEntityT(EntityType=SAHPI_ENT_SYSTEM_BOARD, EntityLocation=1),
+ SaHpiEntityT(EntityType=SAHPI_ENT_ROOT, EntityLocation=0)
+ ]
+ ),
+ DomaindId=1,
+ ResourceId=1,
+ SensorNum=1,
+ EventState=SAHPI_ES_UNSPECIFIED,
+ Name=SaHpiNameT(Length=6, Value='announ'), # Length equals the length of Value.
+ Mid=123
+ )
+
+ ) # we will not worry about the Data field for this test
- announ.EntryId = 0 # modified by oh_announcement_append
- announ.Timestamp = 0 # modified by oh_announcement_append
- announ.AddedByUser = False # modified by oh_announcement_append
- announ.Severity = SAHPI_CRITICAL
- announ.Acknowledged = False
- announ.StatusCond.Type= SAHPI_STATUS_COND_TYPE_SENSOR
- announ.StatusCond.Entity.Entry[0].EntityType = SAHPI_ENT_SYSTEM_BOARD
- announ.StatusCond.Entity.Entry[0].EntityLocation = 1
- announ.StatusCond.Entity.Entry[1].EntityType = SAHPI_ENT_ROOT
- announ.StatusCond.Entity.Entry[1].EntityLocation = 0
- announ.StatusCond.DomainId = 1
- announ.StatusCond.ResourceId = 1
- announ.StatusCond.SensorNum = 1
- announ.StatusCond.EventState = SAHPI_ES_UNSPECIFIED
- announ.StatusCond.Name.Length = 5
- memcpy(announ.StatusCond.Name.Value,"announ", 5)
- announ.StatusCond.Mid = 123
- # we will not worry about the Data field for this test
+ ann = oh_announcement_create()
- ann = oh_announcement_create()
+ rc = oh_announcement_append(ann, announ)
- rc = oh_announcement_append(ann, announ)
+ announ.Severity = SAHPI_MAJOR
+ rc = oh_announcement_append(ann, announ)
- announ.Severity = SAHPI_MAJOR
- rc = oh_announcement_append(ann, announ)
+ announ.Severity = SAHPI_MINOR
+ rc = oh_announcement_append(ann, announ)
- announ.Severity = SAHPI_MINOR
- rc = oh_announcement_append(ann, announ)
-
- rc = oh_announcement_del(ann, 2, SAHPI_MAJOR)
- if(rc != SA_OK):
- print "ERROR: on_announcement_del returned." +rc
- return 1
-
- if(g_list_length(ann.annentries) != 2):
- print "ERROR: invalid number of announcements in list." +rc
- return 1
-
-if __name__=='__main__':
- unittest.main()
+ rc = oh_announcement_del(ann, 2, SAHPI_MAJOR)
+ self.assertEqual(rc != SA_OK,True)
+
+ self.assertEqual(g_list_length(ann.annentries) != 2,True)
+
+ if __name__=='__main__':
+ unittest.main()
Modified: testsuite/trunk/ann/ann_test_008.py
===================================================================
--- testsuite/trunk/ann/ann_test_008.py 2008-03-24 21:28:06 UTC (rev 6727)
+++ testsuite/trunk/ann/ann_test_008.py 2008-03-25 07:14:47 UTC (rev 6728)
@@ -17,53 +17,53 @@
import unittest
from openhpi import *
-"""
- * main: Announcement test
- *
- * This test adds one announcement to the list
- *
- * Return value: 0 on success, 1 on failure
- """
+class TestSequence(unittest.TestCase):
-def runTest(self):
- ann=oh_announcement()
- announ=SaHpiAnnouncementT()
- rc=SaErrorT()
-
+ """
+ main: Announcement test
+
+ This test adds one announcement to the list
+
+ Return value: 0 on success, 1 on failure
+ """
- announ.EntryId = 0 # modified by oh_announcement_append
- announ.Timestamp = 0 # modified by oh_announcement_append
- announ.AddedByUser = False # modified by oh_announcement_append
- announ.Severity = SAHPI_CRITICAL
- announ.Acknowledged = False
- announ.StatusCond.Type= SAHPI_STATUS_COND_TYPE_SENSOR
- announ.StatusCond.Entity.Entry[0].EntityType = SAHPI_ENT_SYSTEM_BOARD
- announ.StatusCond.Entity.Entry[0].EntityLocation = 1
- announ.StatusCond.Entity.Entry[1].EntityType = SAHPI_ENT_ROOT
- announ.StatusCond.Entity.Entry[1].EntityLocation = 0
- announ.StatusCond.DomainId = 1
- announ.StatusCond.ResourceId = 1
- announ.StatusCond.SensorNum = 1
- announ.StatusCond.EventState = SAHPI_ES_UNSPECIFIED
- announ.StatusCond.Name.Length = 5
- memcpy(announ.StatusCond.Name.Value,"announ", 5)
- announ.StatusCond.Mid = 123
- # we will not worry about the Data field for this test
+ def runTest(self):
+ announ=SaHpiAnnouncementT( # <-- Constructor
+ EntryId=0, # <-- keyword argument example
+ Timestamp=0,
+ AddedByUser=SAHPI_FALSE,
+ Severity=SAHPI_CRITICAL,
+ Acknowledged=SAHPI_FALSE,
+ StatusCond=SaHpiConditionT(
+ Type=SAHPI_STATUS_COND_TYPE_SENSOR,
+ Entity=SaHpiEntityPathT(
+ Entry=[
+ SaHpiEntityT(EntityType=SAHPI_ENT_SYSTEM_BOARD, EntityLocation=1),
+ SaHpiEntityT(EntityType=SAHPI_ENT_ROOT, EntityLocation=0)
+ ]
+ ),
+ DomaindId=1,
+ ResourceId=1,
+ SensorNum=1,
+ EventState=SAHPI_ES_UNSPECIFIED,
+ Name=SaHpiNameT(Length=6, Value='announ'), # Length equals the length of Value.
+ Mid=123
+ )
+
+ ) # we will not worry about the Data field for this test
- ann = oh_announcement_create()
+ ann = oh_announcement_create()
- rc = oh_announcement_append(ann, announ)
+ rc = oh_announcement_append(ann, announ)
- announ.Severity = SAHPI_MAJOR
- rc = oh_announcement_append(ann, announ)
+ announ.Severity = SAHPI_MAJOR
+ rc = oh_announcement_append(ann, announ)
- announ.Severity = SAHPI_MINOR
- rc = oh_announcement_append(ann, announ)
+ announ.Severity = SAHPI_MINOR
+ rc = oh_announcement_append(ann, announ)
- rc = oh_announcement_close(ann)
- if(rc != SA_OK):
- print "ERROR: on_announcement_close returned ", rc
- return 1
-
-if __name__=='__main__':
- unittest.main()
+ rc = oh_announcement_close(ann)
+ self.assertEqual(rc != SA_OK,True)
+
+ if __name__=='__main__':
+ unittest.main()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|