diff --git a/doc/changelog.html b/doc/changelog.html
index 70d41bc..c050652 100644
--- a/doc/changelog.html
+++ b/doc/changelog.html
@@ -16,6 +16,8 @@ OEUnit - Unit Testing Framework
Writing a Test Suite Running a Test Reporting Test Results DataProviders Fixtures License Change Log
diff --git a/doc/dataprovider.html b/doc/dataprovider.html
new file mode 100644
index 0000000..a4fe201
--- /dev/null
+++ b/doc/dataprovider.html
@@ -0,0 +1,214 @@
+
+
+
+ OEUnit - DataProviders
+
+
+
+
+ DataProviders
+
+ What is a DataProvider?
+
+ A DataProvider is a class method inside of a test case, which provides data which is passed
+ to individual test methods as method parameters.dataProvider
+ attribute, supplying the name of a DataProvider method as the attribute value.@DataProvider annotation, with an optional
+ name attribute. This method returns an object of type OEUnit.Data.DataProvider which
+ contains the data that will be used to repeatedly invoke the test method.
+
+ How to use a DataProvider
+
+ 1. Define a test method, with INPUT parameters for each test variable.dataProvider attribute to specify the name of a class method which will provide data
+ for the test variables.
+ ROUTINE-LEVEL ON ERROR UNDO, THROW.
+
+ USING OEUnit.Assertion.Assert.
+ USING OEUnit.Data.DataProvider.
+
+ CLASS SimpleTest:
+
+ @Test (dataProvider=StatusChangeProvider).
+ METHOD PUBLIC VOID AcceptStatusChange(INPUT varStatus AS CHARACTER, INPUT varAccepted AS LOGICAL):
+ DEFINE VARIABLE result AS LOGICAL NO-UNDO.
+ result = Order:ChangeStatus(INPUT varStatus).
+ Assert:AreEqual(result,varAccepted).
+ END METHOD .
+
+ END CLASS .
+
+ @DataProvider annotation to indicate that the class is a DataProvider method.
+ @DataProvider.
+ METHOD PUBLIC DataProvider StatusChangeProvider():
+ DEFINE VARIABLE dataProvider AS DataProvider NO-UNDO .
+ dataProvider = NEW DataProvider().
+ dataProvider:FromJSON("~{ ~"data~": ["
+ + "~{ ~"status~": ~"NEW~", ~"accepted~": true},"
+ + "~{ ~"status~": ~"ACCEPTED~", ~"accepted": true},"
+ + "~{ ~"status~": ~"PICKING~", ~"accepted": true},"
+ + "~{ ~"status~": ~"POSTED~", ~"accepted": false},"
+ + "~{ ~"status~": ~"DELIVERED~", ~"accepted": false},"
+ + "~{ ~"status~": ~"CANCELLED~", ~"accepted": true},"
+ + "]}" ).
+ RETURN dataProvider.
+ END METHOD .
+
+
+
+ The name of the DataProvider class method must match the value of the dataProvider
+ attribute on the test method, or the @DataProvider annotation must
+ have a name attribute which matches the value of the dataProvider
+ attribute on the test method.
+ Execution of a DataProvider method will stop when an assertion fails or a Progress.Lang.Error
+ is thrown.
+ There are no special naming requirements for DataProvider methods.
+ DataProvider methods must be PUBLIC
+ DataProvider methods must accept no parameters.
+ DataProvider methods can be STATIC.
+ DataProvider methods can be used by more than one test method.
+ Any @Before methods are run before each test method invocation.
+ Any @After methods are run after each test method invocation.
+
+
+
+
+
+ Name Attribute
+
+ Each method annotated with @DataProvider can specify a name attribute which is used
+ when searching for a DataProvider method, instead of the method name.
+
+
+ Syntax:
+
+
@DataProvider[(name="DataProviderName ")].
+
+ DataProviderName dataProvider attribute
+
+
+
+
+ @Test (dataProvider=StatusChangeProvider).
+ METHOD PUBLIC VOID AcceptStatusChange(INPUT varStatus AS CHARACTER, INPUT varAccepted AS LOGICAL):
+ DEFINE VARIABLE result AS LOGICAL NO-UNDO.
+ result = Order:ChangeStatus(INPUT varStatus).
+ Assert:AreEqual(result,varAccepted).
+ END METHOD .
+
+ @DataProvider(name=StatusChangeProvider).
+ METHOD PUBLIC DataProvider myDataProvider():
+ DEFINE VARIABLE dataProvider AS DataProvider NO-UNDO .
+ dataProvider = NEW DataProvider().
+ dataProvider:FromJSON("~{ ~"data~": ["
+ + "~{ ~"status~": ~"NEW~", ~"accepted~": true},"
+ + "~{ ~"status~": ~"ACCEPTED~", ~"accepted": true},"
+ + "~{ ~"status~": ~"PICKING~", ~"accepted": true},"
+ + "~{ ~"status~": ~"POSTED~", ~"accepted": false},"
+ + "~{ ~"status~": ~"DELIVERED~", ~"accepted": false},"
+ + "~{ ~"status~": ~"CANCELLED~", ~"accepted": true},"
+ + "]}" ).
+ RETURN dataProvider.
+ END METHOD .
+ DataProvider Methods
+ The DataProvider class provides a range of methods for loading data into the DataProvider.
+ METHOD PUBLIC LOGICAL FromJSON(INPUT json AS LONGCHAR)
+ This method is used to load data from JSON text stored in a LONGCHAR .
+
+
+
+
+ The structure of the JSON data should match that which is accepted by an OpenEdge DATASET
+ or TEMP-TABLE when using the READ-JSON method.
+ The method will return TRUE if the data was successfully loaded.
+
+ METHOD PUBLIC LOGICAL FromJSONFile(INPUT path AS CHARACTER):
+ This method is used to load data from JSON text stored in a file. The file path should be provided as the
+ INPUT parameter.
+
+
+
+
+ The structure of the JSON data in the file should match that which is accepted by an OpenEdge
+ DATASET or TEMP-TABLE when using the
+ READ-JSON method.
+ The method will return TRUE if the data was successfully loaded.
+
+ METHOD PUBLIC LOGICAL FromXML(INPUT xml AS LONGCHAR)
+ This method is used to load data from XML data stored in a LONGCHAR .
+
+
+
+
+ The structure of the XML data should match that which is accepted by an OpenEdge DATASET
+ or TEMP-TABLE when using the READ-XML method.
+ The method will return TRUE if the data was successfully loaded.
+ It is advised to specify the XML Schema in the XML data in order for data types to be correctly interpreted.
+
+ METHOD PUBLIC LOGICAL FromXMLFile(INPUT path AS CHARACTER):
+ This method is used to load data from XML data stored in a file. The file path should be provided as the
+ INPUT parameter.
+
+
+
+
+ The structure of the XML data in the file should match that which is accepted by an OpenEdge
+ DATASET or TEMP-TABLE when using the
+ READ-XML method.
+ The method will return TRUE if the data was successfully loaded.
+ It is advised to specify the XML Schema in the XML data in order for data types to be correctly interpreted.
+
+ METHOD PUBLIC LOGICAL FromTempTable(INPUT ttSrc AS HANDLE):
+ This method is used to load data from an existing temp-table, via the provided HANDLE INPUT parameter.
+
+
+
+
+ The entire data and metaschema of the temp-table are copied.
+ Data is copied in EMPTY mode
+ The data and metaschema of the provided source temp-table are not affected.
+ The method will return TRUE if the data was successfully loaded.
+
+
+
+
diff --git a/doc/fixtures.html b/doc/fixtures.html
new file mode 100644
index 0000000..ac335a1
--- /dev/null
+++ b/doc/fixtures.html
@@ -0,0 +1,233 @@
+
+
+
+ OEUnit - Fixtures
+
+
+
+
+ Fixtures
+
+ What are Fixtures?
+
+ A fixture is an object that inserts, or creates, data into one or more database tables before
+ a unit test is run. At the end of the test, the fixture data is removed.fixture
+ attribute, supplying the name of a fixture class method as the attribute value.@Fixture
+ annotation, with an optional name attribute. This method returns an object of type
+ OEUnit.Data.Fixture which will contain the data to be loaded into a database when required.
+
+ How to use a Fixture
+
+ 1. Define a test method, using the fixture attribute to specify the name of a class method
+ which will provide a fixture object.
+ ROUTINE-LEVEL ON ERROR UNDO, THROW.
+
+ USING OEUnit.Assertion.Assert.
+ USING OEUnit.Data.Fixture.
+
+ CLASS SimpleTest:
+
+ @Test (fixture=OrderStatusFixture).
+ METHOD PUBLIC VOID AcceptStatusChange():
+ DEFINE VARIABLE result AS LOGICAL NO-UNDO.
+ FIND FIRST Order
+ WHERE Order.Status = "NEW" NO-LOCK NO-ERROR .
+ Order:OpenOrder(Order.OrderNo).
+ result = Order:ChangeStatus(INPUT "ACCEPTED").
+ Assert:AreEqual(result,TRUE ).
+ END METHOD .
+
+ END CLASS .
+
+ @Fixture annotation to indicate that the class is a Fixture method.
+ @Fixture.
+ METHOD PUBLIC Fixture OrderStatusFixture():
+ DEFINE VARIABLE fixture AS Fixture NO-UNDO .
+ fixture = NEW Fixture().
+ fixture:FromJSON("~{ ~"Order~": ["
+ + "~{ ~"OrderNo~": ~"10000~", ~"CustomerNo~": 99000, ~"Status~": ~"COMPLETED~"},"
+ + "~{ ~"OrderNo~": ~"10001~", ~"CustomerNo~": 99001, ~"Status~": ~"CANCELLED~"},"
+ + "~{ ~"OrderNo~": ~"10002~", ~"CustomerNo~": 99002, ~"Status~": ~"COMPLETED~"},"
+ + "~{ ~"OrderNo~": ~"10003~", ~"CustomerNo~": 99000, ~"Status~": ~"NEW~"},
+ + "~{ ~"OrderNo~": ~"10004~", ~"CustomerNo~": 99003, ~"Status~": ~"ACCEPTED~"},"
+ + "~{ ~"OrderNo~": ~"10005~", ~"CustomerNo~": 99004, ~"Status~": ~"PAID~"},"
+ + "]}" ).
+ RETURN fixture.
+ END METHOD .
+
+
+
+ The name of the Fixture class method must match the value of the fixture
+ attribute on the test method, or the @Fixture annotation must
+ have a name attribute which matches the value of the fixture
+ attribute on the test method.
+ Execution of a Fixture method will stop when an assertion fails or a Progress.Lang.Error
+ is thrown.
+ There are no special naming requirements for Fixture methods.
+ Fixture methods must be PUBLIC
+ Fixture methods must accept no parameters.
+ Fixture methods can be STATIC.
+ Fixture methods can be used by more than one test method.
+ A transaction is created before the records provided in the fixture are loaded, and is rolled-back
+ after the test method returns.
+
+
+
+
+
Name Attribute
+
+ Each method annotated with @Fixture can specify a name attribute which is used
+ when searching for a Fixture method, instead of the method name.
+
+
+ Syntax:
+
+
@Fixture[(name="FixtureName ")].
+
+ FixtureName fixture attribute
+
+
+
+
+ @Test (dataProvider=OrderStatusFixture).
+ METHOD PUBLIC VOID AcceptStatusChange():
+ DEFINE VARIABLE result AS LOGICAL NO-UNDO.
+ FIND FIRST Order
+ WHERE Order.Status = "NEW" NO-LOCK NO-ERROR .
+ Order:OpenOrder(Order.OrderNo).
+ result = Order:ChangeStatus(INPUT "ACCEPTED").
+ Assert:AreEqual(result,TRUE ).
+ END METHOD .
+
+ @Fixture (name=OrderStatusFixture).
+ METHOD PUBLIC Fixture myFixture():
+ DEFINE VARIABLE fixture AS Fixture NO-UNDO .
+ fixture = NEW Fixture().
+ fixture:FromJSON("~{ ~"Order~": ["
+ + "~{ ~"OrderNo~": ~"10000~", ~"CustomerNo~": 99000, ~"Status~": ~"COMPLETED~"},"
+ + "~{ ~"OrderNo~": ~"10001~", ~"CustomerNo~": 99001, ~"Status~": ~"CANCELLED~"},"
+ + "~{ ~"OrderNo~": ~"10002~", ~"CustomerNo~": 99002, ~"Status~": ~"COMPLETED~"},"
+ + "~{ ~"OrderNo~": ~"10003~", ~"CustomerNo~": 99000, ~"Status~": ~"NEW~"},"
+ + "~{ ~"OrderNo~": ~"10004~", ~"CustomerNo~": 99003, ~"Status~": ~"ACCEPTED~"},"
+ + "~{ ~"OrderNo~": ~"10005~", ~"CustomerNo~": 99004, ~"Status~": ~"PAID~"},"
+ + "]}" ).
+ RETURN fixture.
+ END METHOD .
+ Fixture Methods
+ The Fixture class provides a range of methods for loading data into the Fixture.
+ Each successive call to one of these methods defines a range of data to be loaded. When
+ the records are loaded, they are done so in the order that they are specified to the Fixture
+ object.
+ METHOD PUBLIC LOGICAL FromJSON(INPUT json AS LONGCHAR)
+ This method is used to load data from JSON text stored in a LONGCHAR .
+
+
+
+
+ The structure of the JSON data should match that which is accepted by an OpenEdge DATASET
+ when using the READ-JSON method.
+ The method will return TRUE if the data was successfully loaded.
+ Only data in the top-level objects in the JSON data will be loaded. Child objects are ignored.
+
+ METHOD PUBLIC LOGICAL FromJSONFile(INPUT path AS CHARACTER):
+ This method is used to load data from JSON text stored in a file. The file path should be provided as the
+ INPUT parameter.
+
+
+
+
+ The structure of the JSON data in the file should match that which is accepted by an OpenEdge
+ DATASET when using the READ-JSON method.
+ The method will return TRUE if the data was successfully loaded.
+ Only data in the top-level objects in the JSON data will be loaded. Child objects are ignored.
+
+ METHOD PUBLIC LOGICAL FromXML(INPUT xml AS LONGCHAR)
+ This method is used to load data from XML data stored in a LONGCHAR .
+
+
+
+
+ The structure of the XML data should match that which is accepted by an OpenEdge DATASET
+ when using the READ-XML method.
+ The method will return TRUE if the data was successfully loaded.
+ It is advised to specify the XML Schema in the XML data in order for data types to be correctly interpreted.
+ Only data in the top-level objects in the XML data will be loaded. Child objects are ignored.
+
+ METHOD PUBLIC LOGICAL FromXMLFile(INPUT path AS CHARACTER):
+ This method is used to load data from XML data stored in a file. The file path should be provided as the
+ INPUT parameter.
+
+
+
+
+ The structure of the XML data in the file should match that which is accepted by an OpenEdge
+ DATASET when using the READ-XML method.
+ The method will return TRUE if the data was successfully loaded.
+ It is advised to specify the XML Schema in the XML data in order for data types to be correctly interpreted.
+ Only data in the top-level objects in the XML data will be loaded. Child objects are ignored.
+
+ METHOD PUBLIC LOGICAL FromTempTable(INPUT ttSrc AS HANDLE):
+ This method is used to load data from an existing temp-table, via the provided HANDLE INPUT parameter.
+
+
+
+
+ The entire data and metaschema of the temp-table are copied.
+ Data is copied in EMPTY mode
+ The data and metaschema of the provided source temp-table are not affected.
+ The method will return TRUE if the data was successfully loaded.
+
+ METHOD PUBLIC LOGICAL FromDataSet(INPUT dsSrc AS HANDLE):
+ This method is used to load data from an existing DataSet, via the provided HANDLE INPUT parameter.
+
+
+
+
+ The entire data and metaschema of the temp-table are copied.
+ Data is copied in EMPTY mode
+ The method will return TRUE if the data was successfully loaded.
+
+
+
+
diff --git a/doc/index.html b/doc/index.html
index 846a450..f711665 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -16,6 +16,8 @@ OEUnit - Unit Testing Framework
Writing a Test Suite Running a Test Reporting Test Results DataProviders Fixtures License Change Log OEUnit - Unit Testing Framework
Writing a Test Suite Running a Test Reporting Test Results DataProviders Fixtures License Change Log OEUnit - Unit Testing Framework
Writing a Test Suite Running a Test Reporting Test Results
+ DataProviders Fixtures License Change Log OEUnit - Unit Testing Framework
Writing a Test Suite Running a Test
Reporting Test Results DataProviders Fixtures License Change Log OEUnit - Unit Testing Framework
Writing a Test Suite Running a Test Reporting Test Results DataProviders Fixtures License Change Log Test Methods
Syntax:
-
@Test[(expected="ErrorTypeName ")].
+ @Test[([expected="ErrorTypeName "][,dataProvider="DataProviderMethod"])].
ErrorTypeName Progress.Lang.Error.
@@ -85,6 +87,11 @@
Test Methods
Test method. If the expected error is thrown, the test passes, otherwise the test
fails.
+ DataProviderMethod Data Providers .
+
Test Methods
If no errors are thrown by while running a Test method, the test is assumed to have
succeeded.
There are no special naming requirements for Test methods.
- Test methods must be PUBLIC and accept no parameters.
+ Test methods must be PUBLIC
+ Test methods must accept no parameters, unless they have been defined with the DataProvider
+ attribute. In which case, the number of parameters, data types, and order must match the order of
+ the data provided in the @DataProvider method. Only the INPUT parameter type is supported. For more
+ infomation on DataProviders, see DataProviders .
Test methods can be STATIC.
Before Methods
diff --git a/doc/testsuite.html b/doc/testsuite.html
index c23c419..12c3785 100644
--- a/doc/testsuite.html
+++ b/doc/testsuite.html
@@ -16,6 +16,8 @@ OEUnit - Unit Testing Framework
Writing a Test Suite
Running a Test Reporting Test Results DataProviders Fixtures License Change Log '
+ + ''
+ + ' NEW '
+ + ' true '
+ + ' '
+ + ''
+ + ' ACCEPTED '
+ + ' true '
+ + ' '
+ + ' ').
+ Assert:AreEqual(dataProvider:Size, 2).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromXML_Reset():
+ dataProvider = NEW DataProvider().
+ dataProvider:FromXML(''
+ + ''
+ + ''
+ + ' NEW '
+ + ' true '
+ + ' '
+ + ''
+ + ' ACCEPTED '
+ + ' true '
+ + ' '
+ + ' ').
+ Assert:AreEqual(dataProvider:Size, 2).
+ dataProvider:FromXML(''
+ + ''
+ + ''
+ + ' NEW '
+ + ' true '
+ + ' '
+ + ''
+ + ' ACCEPTED '
+ + ' true '
+ + ' '
+ + ''
+ + ' PICKING '
+ + ' true '
+ + ' '
+ + ''
+ + ' POSTED '
+ + ' false '
+ + ' '
+ + ' ').
+ Assert:AreEqual(dataProvider:Size, 4).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromTempTable():
+ dataProvider = NEW DataProvider().
+ EMPTY TEMP-TABLE ttTestTable.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "NEW"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "ACCEPTED"
+ ttTestTable.Accepted = TRUE.
+ dataProvider:FromTempTable(TEMP-TABLE ttTestTable:HANDLE).
+ Assert:AreEqual(dataProvider:Size, 2).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromTempTable_Reset():
+ dataProvider = NEW DataProvider().
+ EMPTY TEMP-TABLE ttTestTable.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "NEW"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "ACCEPTED"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "PICKING"
+ ttTestTable.Accepted = FALSE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "POSTED"
+ ttTestTable.Accepted = FALSE.
+ dataProvider:FromTempTable(TEMP-TABLE ttTestTable:HANDLE).
+ Assert:AreEqual(dataProvider:Size, 4).
+ EMPTY TEMP-TABLE ttTestTable.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "NEW"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "ACCEPTED"
+ ttTestTable.Accepted = TRUE.
+ dataProvider:FromTempTable(TEMP-TABLE ttTestTable:HANDLE).
+ Assert:AreEqual(dataProvider:Size, 2).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID MoveFirst():
+ dataProvider = NEW DataProvider().
+
+ /* Object not fully initialise, should return false */
+ Assert:IsFalse(dataProvider:MoveFirst()).
+
+ dataProvider:FromJSON("~{ ~"data~": ["
+ + "~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + "~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0},"
+ + "]}").
+ Assert:IsTrue(dataProvider:MoveFirst()).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID MoveLast():
+ dataProvider = NEW DataProvider().
+
+ /* Object not fully initialise, should return false */
+ Assert:IsFalse(dataProvider:MoveLast()).
+
+ dataProvider:FromJSON("~{ ~"data~": ["
+ + "~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + "~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0},"
+ + "]}").
+ Assert:IsTrue(dataProvider:MoveLast()).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID MoveNext():
+ dataProvider = NEW DataProvider().
+
+ /* Object not fully initialise, should return false */
+ Assert:IsFalse(dataProvider:MoveNext()).
+
+
+ dataProvider:FromJSON("~{ ~"data~": ["
+ + "~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + "~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0},"
+ + "]}").
+ dataProvider:MoveLast().
+ Assert:IsFalse(dataProvider:MoveNext()).
+ dataProvider:MoveFirst().
+ Assert:IsTrue(dataProvider:MoveNext()).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID MovePrev():
+ dataProvider = NEW DataProvider().
+
+ /* Object not fully initialise, should return false */
+ Assert:IsFalse(dataProvider:MovePrev()).
+
+
+ dataProvider:FromJSON("~{ ~"data~": ["
+ + "~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + "~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0},"
+ + "]}").
+ dataProvider:MoveFirst().
+ Assert:IsFalse(dataProvider:MovePrev()).
+ dataProvider:MoveLast().
+ Assert:IsTrue(dataProvider:MovePrev()).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID GetParameterList():
+ DEFINE VARIABLE params AS Progress.Lang.ParameterList NO-UNDO.
+ dataProvider = NEW DataProvider().
+ dataProvider:FromJSON("~{ ~"data~": ["
+ + "~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + "~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0},"
+ + "]}").
+ params = dataProvider:GetParameterList().
+ Assert:IsNotNull(params).
+ Assert:AreEqual(params:NumParameters, 4).
+ DELETE OBJECT params.
+ dataProvider:MoveNext().
+ params = dataProvider:GetParameterList().
+ Assert:IsNotNull(params).
+ Assert:AreEqual(params:NumParameters, 4).
+ DELETE OBJECT params.
+ dataProvider:MoveNext().
+ params = dataProvider:GetParameterList().
+ Assert:IsNull(params).
+ END METHOD.
+
+ @Test(expected="OEUnit.Data.DataProviderError").
+ METHOD PUBLIC VOID GetParameterList_NotInitialised():
+ dataProvider = NEW DataProvider().
+ dataProvider:GetParameterList().
+ END METHOD.
+
+END CLASS.
\ No newline at end of file
diff --git a/src/OEUnit/Tests/Data/FixtureDataSetTest.cls b/src/OEUnit/Tests/Data/FixtureDataSetTest.cls
new file mode 100644
index 0000000..a7ed3e0
--- /dev/null
+++ b/src/OEUnit/Tests/Data/FixtureDataSetTest.cls
@@ -0,0 +1,198 @@
+
+ROUTINE-LEVEL ON ERROR UNDO, THROW.
+
+USING Progress.Lang.*.
+USING OEUnit.Tests.Data.*.
+USING OEUnit.Assertion.Assert.
+USING OEUnit.Data.FixtureDataSet.
+
+CLASS OEUnit.Tests.Data.FixtureDataSetTest:
+
+ DEFINE PROTECTED TEMP-TABLE ttTestTable NO-UNDO
+ FIELD StatusCode AS CHARACTER
+ FIELD Accepted AS LOGICAL
+ INDEX StatusCode IS PRIMARY UNIQUE StatusCode ASCENDING.
+
+ DEFINE VARIABLE fixture AS FixtureDataSet NO-UNDO.
+
+ @After.
+ METHOD PUBLIC VOID DeleteFixtureDataSet():
+ DELETE OBJECT fixture NO-ERROR.
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromJSON():
+ fixture = NEW FixtureDataSet().
+ fixture:FromJSON("~{ ~"FirstTable~": ["
+ + " ~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + " ~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0},"
+ + " ], "
+ + " ~"SecondTable~": ["
+ + " ~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + " ~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0}"
+ + "]}").
+ Assert:AreEqual(fixture:TableCount, 2).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromJSON_Reset():
+ fixture = NEW FixtureDataSet().
+ fixture:FromJSON("~{ ~"FirstTable~": ["
+ + "~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + "~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0},"
+ + "]}").
+ Assert:AreEqual(fixture:TableCount, 1).
+ fixture:FromJSON("~{ ~"FirstTable~": ["
+ + " ~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + " ~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0},"
+ + " ], "
+ + " ~"SecondTable~": ["
+ + " ~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + " ~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0}"
+ + "]}").
+ Assert:AreEqual(fixture:TableCount, 2).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromXML():
+ fixture = NEW FixtureDataSet().
+ fixture:FromXML(''
+ + ''
+ + ''
+ + 'NEW '
+ + 'true '
+ + ' '
+ + ''
+ + 'ACCEPTED '
+ + 'true '
+ + ' '
+ + ''
+ + 'ACCEPTED '
+ + 'true '
+ + ' '
+ + ' ').
+ Assert:AreEqual(fixture:TableCount, 2).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromXML_Reset():
+ fixture = NEW FixtureDataSet().
+ fixture:FromXML(''
+ + ''
+ + ''
+ + 'NEW '
+ + 'true '
+ + ' '
+ + ''
+ + 'ACCEPTED '
+ + 'true '
+ + ' '
+ + ' ').
+ Assert:AreEqual(fixture:TableCount, 1).
+ fixture:FromXML(''
+ + ''
+ + ''
+ + 'NEW '
+ + 'true '
+ + ' '
+ + ''
+ + 'ACCEPTED '
+ + 'true '
+ + ' '
+ + ''
+ + 'ACCEPTED '
+ + 'true '
+ + ' '
+ + ' ').
+ Assert:AreEqual(fixture:TableCount, 2).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromDataSet():
+
+ DEFINE VARIABLE httTest AS HANDLE NO-UNDO.
+ DEFINE VARIABLE hdSet AS HANDLE NO-UNDO.
+ DEFINE VARIABLE htt AS HANDLE NO-UNDO.
+ DEFINE VARIABLE hdSource AS HANDLE NO-UNDO.
+ DEFINE VARIABLE httBuffer AS HANDLE NO-UNDO.
+
+ fixture = NEW FixtureDataSet().
+ EMPTY TEMP-TABLE ttTestTable.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "NEW"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "ACCEPTED"
+ ttTestTable.Accepted = TRUE.
+
+ ASSIGN httTest = TEMP-TABLE ttTestTable:HANDLE.
+
+ CREATE TEMP-TABLE htt.
+ htt:COPY-TEMP-TABLE(httTest, FALSE, TRUE).
+
+ httBuffer = htt:DEFAULT-BUFFER-HANDLE.
+
+ CREATE DATASET hdSet.
+ hdSet:ADD-BUFFER(httBuffer).
+
+ CREATE DATA-SOURCE hdSource.
+ hdSource:ADD-SOURCE-BUFFER(httTest:DEFAULT-BUFFER-HANDLE,?).
+ httBuffer:ATTACH-DATA-SOURCE(hdSource).
+ hdSet:FILL().
+ fixture:FromDataSet(hdSet).
+ Assert:AreEqual(fixture:TableCount, 1).
+
+ END METHOD.
+ /*
+ @Test.
+ METHOD PUBLIC VOID FromTempTable_Reset():
+ fixture = NEW FixtureDataSet().
+ EMPTY TEMP-TABLE ttTestTable.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "NEW"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "ACCEPTED"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "PICKING"
+ ttTestTable.Accepted = FALSE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "POSTED"
+ ttTestTable.Accepted = FALSE.
+ fixture:FromTempTable(TEMP-TABLE ttTestTable:HANDLE).
+ /*Assert:AreEqual(fixture:Size, 4).*/
+ EMPTY TEMP-TABLE ttTestTable.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "NEW"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "ACCEPTED"
+ ttTestTable.Accepted = TRUE.
+ fixture:FromTempTable(TEMP-TABLE ttTestTable:HANDLE).
+ /*Assert:AreEqual(fixture:Size, 2).*/
+ END METHOD.
+ */
+
+ @Test.
+ METHOD PUBLIC VOID FromTempTable():
+
+ DEFINE VARIABLE httTest AS HANDLE NO-UNDO.
+ DEFINE VARIABLE hdSet AS HANDLE NO-UNDO.
+ DEFINE VARIABLE htt AS HANDLE NO-UNDO.
+ DEFINE VARIABLE hdSource AS HANDLE NO-UNDO.
+ DEFINE VARIABLE httBuffer AS HANDLE NO-UNDO.
+
+ fixture = NEW FixtureDataSet().
+ EMPTY TEMP-TABLE ttTestTable.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "NEW"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "ACCEPTED"
+ ttTestTable.Accepted = TRUE.
+
+ fixture:FromTempTable(TEMP-TABLE ttTestTable:HANDLE).
+ Assert:AreEqual(fixture:TableCount,1).
+ END.
+END CLASS.
\ No newline at end of file
diff --git a/src/OEUnit/Tests/Data/FixtureTest.cls b/src/OEUnit/Tests/Data/FixtureTest.cls
new file mode 100644
index 0000000..74c47c8
--- /dev/null
+++ b/src/OEUnit/Tests/Data/FixtureTest.cls
@@ -0,0 +1,250 @@
+
+ROUTINE-LEVEL ON ERROR UNDO, THROW.
+
+USING Progress.Lang.*.
+USING OEUnit.Tests.Data.*.
+USING OEUnit.Assertion.Assert.
+USING OEUnit.Data.Fixture.
+
+CLASS OEUnit.Tests.Data.FixtureTest:
+
+ DEFINE PROTECTED TEMP-TABLE ttTestTable NO-UNDO
+ FIELD StatusCode AS CHARACTER
+ FIELD Accepted AS LOGICAL
+ INDEX StatusCode IS PRIMARY UNIQUE StatusCode ASCENDING.
+
+ DEFINE PROTECTED TEMP-TABLE ttSecondTestTable NO-UNDO
+ LIKE ttTestTable.
+
+ DEFINE VARIABLE fixture AS Fixture NO-UNDO.
+
+ @After.
+ METHOD PUBLIC VOID DeleteFixture():
+ DELETE OBJECT fixture NO-ERROR.
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromJSON():
+ fixture = NEW Fixture().
+ fixture:FromJSON("~{ ~"FirstTable~": ["
+ + " ~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + " ~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0},"
+ + " ], "
+ + " ~"SecondTable~": ["
+ + " ~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + " ~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0}"
+ + "]}").
+ Assert:AreEqual(fixture:TableCount, 2).
+ Assert:AreEqual(fixture:Size, 1).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromJSON_Multiple():
+ fixture = NEW Fixture().
+ fixture:FromJSON("~{ ~"FirstTable~": ["
+ + "~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + "~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0},"
+ + "]}").
+ Assert:AreEqual(fixture:TableCount, 1).
+ Assert:AreEqual(fixture:Size, 1).
+ fixture:FromJSON("~{ ~"FirstTable~": ["
+ + " ~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + " ~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0},"
+ + " ], "
+ + " ~"SecondTable~": ["
+ + " ~{ ~"name~": ~"Char Value~", ~"intvalue~": 0, ~"bool~": true, ~"nullvalue~": null},"
+ + " ~{ ~"name~": ~"Next Value~", ~"intvalue~": 15, ~"bool~": false, ~"nullvalue~": 0}"
+ + "]}").
+ Assert:AreEqual(fixture:TableCount, 3).
+ Assert:AreEqual(fixture:Size, 2).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromXML():
+ fixture = NEW Fixture().
+ fixture:FromXML(''
+ + ''
+ + ''
+ + 'NEW '
+ + 'true '
+ + ' '
+ + ''
+ + 'ACCEPTED '
+ + 'true '
+ + ' '
+ + ''
+ + 'ACCEPTED '
+ + 'true '
+ + ' '
+ + ' ').
+ Assert:AreEqual(fixture:TableCount, 2).
+ Assert:AreEqual(fixture:Size, 1).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromXML_Multiple():
+ fixture = NEW Fixture().
+ fixture:FromXML(''
+ + ''
+ + ''
+ + 'NEW '
+ + 'true '
+ + ' '
+ + ''
+ + 'ACCEPTED '
+ + 'true '
+ + ' '
+ + ' ').
+ Assert:AreEqual(fixture:TableCount, 1).
+ Assert:AreEqual(fixture:Size, 1).
+ fixture:FromXML(''
+ + ''
+ + ''
+ + 'NEW '
+ + 'true '
+ + ' '
+ + ''
+ + 'ACCEPTED '
+ + 'true '
+ + ' '
+ + ''
+ + 'ACCEPTED '
+ + 'true '
+ + ' '
+ + ' ').
+ Assert:AreEqual(fixture:TableCount, 3).
+ Assert:AreEqual(fixture:Size, 2).
+ END METHOD.
+
+ METHOD PROTECTED HANDLE CreateDataSetFromTempTable(INPUT httTest AS HANDLE):
+
+ DEFINE VARIABLE hdSet AS HANDLE NO-UNDO.
+ DEFINE VARIABLE htt AS HANDLE NO-UNDO.
+ DEFINE VARIABLE hdSource AS HANDLE NO-UNDO.
+ DEFINE VARIABLE httBuffer AS HANDLE NO-UNDO.
+ DEFINE VARIABLE httTestBuf AS HANDLE NO-UNDO.
+
+ CREATE TEMP-TABLE htt.
+ htt:COPY-TEMP-TABLE(httTest, FALSE, TRUE).
+
+ /* Create buffers for temp-tables */
+ CREATE BUFFER httBuffer FOR TABLE htt.
+ CREATE BUFFER httTestBuf FOR TABLE httTest.
+
+ CREATE DATASET hdSet.
+ hdSet:ADD-BUFFER(httBuffer).
+
+ CREATE DATA-SOURCE hdSource.
+ hdSource:ADD-SOURCE-BUFFER(httTestBuf,?).
+ httBuffer:ATTACH-DATA-SOURCE(hdSource).
+ hdSet:FILL().
+
+ RETURN hdSet.
+
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromDataSet():
+
+ fixture = NEW Fixture().
+ EMPTY TEMP-TABLE ttTestTable.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "NEW"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "ACCEPTED"
+ ttTestTable.Accepted = TRUE.
+
+ fixture:FromDataSet(CreateDataSetFromTempTable(INPUT TEMP-TABLE ttTestTable:HANDLE)).
+ Assert:AreEqual(fixture:TableCount, 1).
+ Assert:AreEqual(fixture:Size, 1).
+
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromDataSet_Multiple():
+
+ DEFINE BUFFER ttBufTestTable FOR ttTestTable.
+ DEFINE BUFFER ttSecondTestTable FOR ttSecondTestTable.
+
+ fixture = NEW Fixture().
+ EMPTY TEMP-TABLE ttTestTable.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "NEW"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "ACCEPTED"
+ ttTestTable.Accepted = TRUE.
+
+ fixture:FromDataSet(CreateDataSetFromTempTable(INPUT TEMP-TABLE ttBufTestTable:HANDLE)).
+ Assert:AreEqual(fixture:TableCount, 1).
+ Assert:AreEqual(fixture:Size, 1).
+
+ EMPTY TEMP-TABLE ttSecondTestTable.
+ CREATE ttSecondTestTable.
+ ASSIGN ttSecondTestTable.StatusCode = "NEW"
+ ttSecondTestTable.Accepted = TRUE.
+ CREATE ttSecondTestTable.
+ ASSIGN ttSecondTestTable.StatusCode = "ACCEPTED"
+ ttSecondTestTable.Accepted = TRUE.
+
+ fixture:FromDataSet(CreateDataSetFromTempTable(INPUT TEMP-TABLE ttSecondTestTable:HANDLE)).
+ Assert:AreEqual(fixture:TableCount, 2).
+ Assert:AreEqual(fixture:Size, 2).
+
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID FromTempTable():
+
+ DEFINE VARIABLE httTest AS HANDLE NO-UNDO.
+ DEFINE VARIABLE hdSet AS HANDLE NO-UNDO.
+ DEFINE VARIABLE htt AS HANDLE NO-UNDO.
+ DEFINE VARIABLE hdSource AS HANDLE NO-UNDO.
+ DEFINE VARIABLE httBuffer AS HANDLE NO-UNDO.
+
+ fixture = NEW Fixture().
+ EMPTY TEMP-TABLE ttTestTable.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "NEW"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "ACCEPTED"
+ ttTestTable.Accepted = TRUE.
+
+ fixture:FromTempTable(TEMP-TABLE ttTestTable:HANDLE).
+ Assert:AreEqual(fixture:TableCount,1).
+ Assert:AreEqual(fixture:Size, 1).
+ END.
+
+ @Test.
+ METHOD PUBLIC VOID FromTempTable_Multiple():
+ fixture = NEW Fixture().
+ EMPTY TEMP-TABLE ttTestTable.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "NEW"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "ACCEPTED"
+ ttTestTable.Accepted = TRUE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "PICKING"
+ ttTestTable.Accepted = FALSE.
+ CREATE ttTestTable.
+ ASSIGN ttTestTable.StatusCode = "POSTED"
+ ttTestTable.Accepted = FALSE.
+ fixture:FromTempTable(TEMP-TABLE ttTestTable:HANDLE).
+ Assert:AreEqual(fixture:TableCount, 1).
+ Assert:AreEqual(fixture:Size, 1).
+ EMPTY TEMP-TABLE ttSecondTestTable.
+ CREATE ttSecondTestTable.
+ ASSIGN ttSecondTestTable.StatusCode = "NEW"
+ ttSecondTestTable.Accepted = TRUE.
+ CREATE ttSecondTestTable.
+ ASSIGN ttSecondTestTable.StatusCode = "ACCEPTED"
+ ttSecondTestTable.Accepted = TRUE.
+ fixture:FromTempTable(TEMP-TABLE ttSecondTestTable:HANDLE).
+ Assert:AreEqual(fixture:TableCount, 2).
+ Assert:AreEqual(fixture:Size, 2).
+ END METHOD.
+END CLASS.
\ No newline at end of file
diff --git a/src/OEUnit/Tests/Reflection/AnnotationInfoTest.cls b/src/OEUnit/Tests/Reflection/AnnotationInfoTest.cls
index 33aa147..437f788 100644
--- a/src/OEUnit/Tests/Reflection/AnnotationInfoTest.cls
+++ b/src/OEUnit/Tests/Reflection/AnnotationInfoTest.cls
@@ -16,24 +16,50 @@ CLASS OEUnit.Tests.Reflection.AnnotationInfoTest:
METHOD PUBLIC VOID ParseAnnotationNoAttribute():
annotation = NEW AnnotationInfo("Annotation").
Assert:AreEqual(annotation:AnnotationType, "Annotation").
- Assert:AreEqual(annotation:AttributeName, "").
- Assert:AreEqual(annotation:AttributeValue, "").
+ Assert:AreEqual(annotation:Attributes:Size, 0).
END METHOD.
@Test.
METHOD PUBLIC VOID ParseAnnotationWithAttribute():
annotation = NEW AnnotationInfo("Annotation(Attribute=Value)").
Assert:AreEqual(annotation:AnnotationType, "Annotation").
- Assert:AreEqual(annotation:AttributeName, "Attribute").
- Assert:AreEqual(annotation:AttributeValue, "Value").
+ Assert:AreEqual(annotation:Attributes:Size, 1).
+ Assert:IsTrue(annotation:HasAttribute("Attribute")).
+ Assert:AreEqual(annotation:GetAttribute("Attribute"), "Value").
END METHOD.
@Test.
METHOD PUBLIC VOID ParseAnnotationComplexAttribute():
annotation = NEW AnnotationInfo("Annotation(a=5+1=6)").
Assert:AreEqual(annotation:AnnotationType, "Annotation").
- Assert:AreEqual(annotation:AttributeName, "a").
- Assert:AreEqual(annotation:AttributeValue, "5+1=6").
- END METHOD.
+ Assert:AreEqual(annotation:Attributes:Size, 1).
+ Assert:IsTrue(annotation:HasAttribute("a")).
+ Assert:AreEqual(annotation:GetAttribute("a"), "5+1=6").
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID ParseAnnotationMultipleAttributes():
+ annotation = NEW AnnotationInfo("Annotation(Attribute1=Value1,Attribute2=Value2,Attribute3=Value3)").
+ Assert:AreEqual(annotation:Attributes:Size, 3).
+ Assert:IsTrue(annotation:HasAttribute("Attribute1")).
+ Assert:IsTrue(annotation:HasAttribute("Attribute2")).
+ Assert:IsTrue(annotation:HasAttribute("Attribute3")).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID AnnotationHasAttribute():
+ annotation = NEW AnnotationInfo("Annotation(Attribute=Value)").
+ Assert:IsTrue(annotation:HasAttribute("Attribute")).
+ Assert:IsFalse(annotation:HasAttribute("DoesNotExist")).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID AnnotationGetAttribute():
+ annotation = NEW AnnotationInfo("Annotation(Attribute1=Value1,Attribute2=Value2,Attribute3=Value3)").
+ Assert:AreEqual(annotation:GetAttribute("Attribute1"), "Value1").
+ Assert:AreEqual(annotation:GetAttribute("Attribute2"), "Value2").
+ Assert:AreEqual(annotation:GetAttribute("Attribute3"), "Value3").
+ Assert:IsNull(annotation:GetAttribute("Attribute4")).
+ END METHOD.
END CLASS.
\ No newline at end of file
diff --git a/src/OEUnit/Tests/Util/AllTestSuite.cls b/src/OEUnit/Tests/Util/AllTestSuite.cls
index 30f498f..d2043f9 100644
--- a/src/OEUnit/Tests/Util/AllTestSuite.cls
+++ b/src/OEUnit/Tests/Util/AllTestSuite.cls
@@ -8,6 +8,7 @@ CLASS OEUnit.Tests.Util.AllTestSuite INHERITS TestSuite:
CONSTRUCTOR AllTestSuite():
AddTest(NEW ListTest()).
+ AddTest(NEW NamedListTest()).
END CONSTRUCTOR.
END CLASS.
\ No newline at end of file
diff --git a/src/OEUnit/Tests/Util/NamedListTest.cls b/src/OEUnit/Tests/Util/NamedListTest.cls
new file mode 100644
index 0000000..993763b
--- /dev/null
+++ b/src/OEUnit/Tests/Util/NamedListTest.cls
@@ -0,0 +1,101 @@
+
+ROUTINE-LEVEL ON ERROR UNDO, THROW.
+
+USING Progress.Lang.*.
+USING OEUnit.Assertion.Assert.
+USING OEUnit.Util.*.
+USING OEUnit.Tests.Util.*.
+
+CLASS OEUnit.Tests.Util.NamedListTest :
+
+ DEFINE PRIVATE VARIABLE list1 AS NamedList NO-UNDO.
+
+ DEFINE PRIVATE VARIABLE name1 AS CHARACTER NO-UNDO INITIAL "Name1".
+ DEFINE PRIVATE VARIABLE value1 AS CHARACTER NO-UNDO INITIAL "Value1".
+ DEFINE PRIVATE VARIABLE name2 AS CHARACTER NO-UNDO INITIAL "Name2".
+ DEFINE PRIVATE VARIABLE value2 AS CHARACTER NO-UNDO INITIAL "Value2".
+ DEFINE PRIVATE VARIABLE name3 AS CHARACTER NO-UNDO INITIAL "Name3".
+ DEFINE PRIVATE VARIABLE value3 AS CHARACTER NO-UNDO INITIAL "Value3".
+ DEFINE PRIVATE VARIABLE name4 AS CHARACTER NO-UNDO INITIAL "Name4".
+ DEFINE PRIVATE VARIABLE value4 AS CHARACTER NO-UNDO INITIAL "Value4".
+
+ @Before.
+ METHOD PUBLIC VOID CreateList():
+ list1 = NEW NamedList().
+ list1:Add(name1, value1).
+ list1:Add(name2, value2).
+ list1:Add(name3, value3).
+ list1:Add(name4, value4).
+ END METHOD.
+
+ @After.
+ METHOD PUBLIC VOID DeleteList():
+ DELETE OBJECT list1 NO-ERROR.
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID AddDuplicate():
+ list1:Add(name1, value2).
+ Assert:AreEqual(list1:GET(name1), value2).
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID TestMoveAndReset():
+ list1:MoveFirst().
+ Assert:AreEqual(list1:CurrentName, name1).
+ Assert:AreEqual(list1:CurrentValue, value1).
+ list1:MoveNext().
+ Assert:AreEqual(list1:CurrentName, name2).
+ Assert:AreEqual(list1:CurrentValue, value2).
+ list1:Reset().
+ list1:MoveNext().
+ Assert:AreEqual(list1:CurrentName, name1).
+ Assert:AreEqual(list1:CurrentValue, value1).
+ list1:MoveNext().
+ Assert:AreEqual(list1:CurrentName, name2).
+ Assert:AreEqual(list1:CurrentValue, value2).
+ list1:Reset().
+ list1:MovePrevious().
+ Assert:AreEqual(list1:CurrentName, name4).
+ Assert:AreEqual(list1:CurrentValue, value4).
+ list1:MovePrevious().
+ Assert:AreEqual(list1:CurrentName, name3).
+ Assert:AreEqual(list1:CurrentValue, value3).
+ list1:MoveFirst().
+ Assert:AreEqual(list1:CurrentName, name1).
+ Assert:AreEqual(list1:CurrentValue, value1).
+ list1:MoveLast().
+ Assert:AreEqual(list1:CurrentName, name4).
+ Assert:AreEqual(list1:CurrentValue, value4).
+ END METHOD.
+
+ @Test(expected="Progress.Lang.AppError").
+ METHOD PUBLIC VOID Remove():
+ Assert:AreEqual(list1:Get(name1), value1).
+ list1:Remove(name1).
+ list1:Get(name1).
+ END METHOD.
+
+ @Test(expected="Progress.Lang.AppError").
+ METHOD PUBLIC VOID RemoveNonExisting():
+ list1:Remove("does not exist").
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID Get():
+ Assert:AreEqual(list1:Get(name1), value1).
+ END METHOD.
+
+ @Test(expected="Progress.Lang.AppError").
+ METHOD PUBLIC VOID GetNonExisting():
+ list1:Get("does not exist").
+ END METHOD.
+
+ @Test.
+ METHOD PUBLIC VOID HasValue():
+ Assert:IsTrue(list1:HasValue(name1)).
+ Assert:IsFalse(list1:HasValue("does not exist")).
+ END METHOD.
+
+END CLASS.
+
diff --git a/src/OEUnit/UI/ResultsWindowView.cls b/src/OEUnit/UI/ResultsWindowView.cls
index f0851ab..bf1d326 100644
--- a/src/OEUnit/UI/ResultsWindowView.cls
+++ b/src/OEUnit/UI/ResultsWindowView.cls
@@ -2,7 +2,7 @@
File : ResultsWindowView.cls
Package : OEUnit.UI
Description : Results view for windows based user-interfaces (GUI). Displays
- results in a window that can be docked in Progress Developer
+ results in a window that can be docked in Progress Developer
Studio.
------------------------------------------------------------------------------*/
@@ -16,38 +16,43 @@ CLASS OEUnit.UI.ResultsWindowView IMPLEMENTS IResultsView:
/*----------------------------------------------------------------------------
Test Result and Error Temp-Tables
- ----------------------------------------------------------------------------*/
+ ----------------------------------------------------------------------------*/
{OEUnit/UI/ttTestResult.i &access = "STATIC"}
{OEUnit/UI/ttError.i &access = "STATIC"}
/*----------------------------------------------------------------------------
Total number of records in the ttTestResult temp-table.
- ----------------------------------------------------------------------------*/
+ ----------------------------------------------------------------------------*/
DEFINE PRIVATE STATIC VARIABLE testCount AS INTEGER NO-UNDO.
-
+
/*----------------------------------------------------------------------------
Store the details of the last test run - so it may be easily rerun.
- ----------------------------------------------------------------------------*/
+ ----------------------------------------------------------------------------*/
DEFINE PRIVATE STATIC VARIABLE lastClassFile AS CHARACTER NO-UNDO.
DEFINE PRIVATE STATIC VARIABLE lastClassName AS CHARACTER NO-UNDO.
DEFINE PRIVATE STATIC VARIABLE lastMethodName AS CHARACTER NO-UNDO.
-
+
/*----------------------------------------------------------------------------
- Handle to the persistently run ResultsWindow procedure.
+ Handle to the persistently run ResultsWindow procedure.
+ Never directly use this variable, except from GetResultsWindow()
----------------------------------------------------------------------------*/
DEFINE PRIVATE STATIC VARIABLE resultWindow AS HANDLE NO-UNDO.
- DEFINE PRIVATE STATIC PROPERTY ResultsWindow AS HANDLE NO-UNDO
- GET:
+
+ /*----------------------------------------------------------------------------
+ We can't use a property to get the resultWindow, since that somehow triggers
+ a WAIT-FOR condition, which causes errors later on...
+ ----------------------------------------------------------------------------*/
+ METHOD PRIVATE STATIC VOID GetResultsWindow(OUTPUT resultsWindow AS HANDLE):
IF NOT(VALID-HANDLE(resultWindow)) THEN
RUN OEUnit/UI/ResultsWindow.w PERSISTENT SET resultWindow.
- RETURN resultWindow.
- END GET.
+ ASSIGN resultsWindow = resultWindow.
+ END METHOD.
/*----------------------------------------------------------------------------
Run the given file as a test. Must be a valid class file (.cls).
- ----------------------------------------------------------------------------*/
+ ----------------------------------------------------------------------------*/
METHOD PUBLIC STATIC VOID RunAsTest(INPUT classFileName AS CHARACTER):
- ASSIGN
+ ASSIGN
lastClassName = ""
lastMethodName = ""
lastClassFile = classFileName.
@@ -55,16 +60,16 @@ CLASS OEUnit.UI.ResultsWindowView IMPLEMENTS IResultsView:
ResultsPresenter:RunAsTest(classFileName).
CATCH e AS Progress.Lang.Error :
DisplayError(classFileName, e).
- DELETE OBJECT e NO-ERROR.
+ DELETE OBJECT e NO-ERROR.
END CATCH.
END METHOD.
/*----------------------------------------------------------------------------
- Reruns the given test class (must be the full class type-name). Optionally
+ Reruns the given test class (must be the full class type-name). Optionally
specify the name of a test method name to run that method only.
- ----------------------------------------------------------------------------*/
+ ----------------------------------------------------------------------------*/
METHOD PUBLIC STATIC VOID RerunTest(INPUT className AS CHARACTER, INPUT methodName AS CHARACTER):
- ASSIGN
+ ASSIGN
lastClassName = className
lastMethodName = methodName
lastClassFile = "".
@@ -72,13 +77,13 @@ CLASS OEUnit.UI.ResultsWindowView IMPLEMENTS IResultsView:
ResultsPresenter:RerunTest(className, methodName).
CATCH e AS Progress.Lang.Error :
DisplayError(className, e).
- DELETE OBJECT e NO-ERROR.
+ DELETE OBJECT e NO-ERROR.
END CATCH.
END METHOD.
-/*----------------------------------------------------------------------------
- Reruns the last run test class (and filtered method if set)
- ----------------------------------------------------------------------------*/
+ /*----------------------------------------------------------------------------
+ Reruns the last run test class (and filtered method if set)
+ ----------------------------------------------------------------------------*/
METHOD PUBLIC STATIC VOID RerunTest():
IF lastClassFile <> "" THEN
RunAsTest(lastClassFile).
@@ -88,8 +93,9 @@ CLASS OEUnit.UI.ResultsWindowView IMPLEMENTS IResultsView:
/*----------------------------------------------------------------------------
Display the results window and indicate that testing is in progress
- ----------------------------------------------------------------------------*/
- METHOD PRIVATE STATIC LOGICAL DisplayRunning(INPUT className AS CHARACTER):
+ ----------------------------------------------------------------------------*/
+ METHOD PRIVATE STATIC VOID DisplayRunning(INPUT className AS CHARACTER):
+ DEFINE VARIABLE resultsWindow AS HANDLE NO-UNDO.
EMPTY TEMP-TABLE ttTestResult.
EMPTY TEMP-TABLE ttError.
CREATE ttTestResult.
@@ -104,14 +110,16 @@ CLASS OEUnit.UI.ResultsWindowView IMPLEMENTS IResultsView:
ttTestResult.ErrorCount = 0
ttTestResult.IsClass = TRUE
ttTestResult.HasErrors = FALSE.
- RUN setTestResults IN ResultsWindow (INPUT TABLE ttTestResult BIND,
+ GetResultsWindow(OUTPUT resultsWindow).
+ RUN setTestResults IN resultsWindow (INPUT TABLE ttTestResult BIND,
INPUT TABLE ttError BIND, 1, 0, 0, 0, 0).
- END METHOD.
+ END METHOD.
/*----------------------------------------------------------------------------
Display the given error in the results window.
- ----------------------------------------------------------------------------*/
- METHOD PRIVATE STATIC LOGICAL DisplayError(INPUT className AS CHARACTER, INPUT err AS Progress.Lang.Error):
+ ----------------------------------------------------------------------------*/
+ METHOD PRIVATE STATIC VOID DisplayError(INPUT className AS CHARACTER, INPUT err AS Progress.Lang.Error):
+ DEFINE VARIABLE resultsWindow AS HANDLE NO-UNDO.
EMPTY TEMP-TABLE ttTestResult.
EMPTY TEMP-TABLE ttError.
CREATE ttTestResult.
@@ -126,30 +134,33 @@ CLASS OEUnit.UI.ResultsWindowView IMPLEMENTS IResultsView:
ttTestResult.IsClass = TRUE
ttTestResult.HasErrors = TRUE.
AddError(err, 1).
- RUN setTestResults IN ResultsWindow (INPUT TABLE ttTestResult BIND,
+ GetResultsWindow(OUTPUT resultsWindow).
+ RUN setTestResults IN resultsWindow (INPUT TABLE ttTestResult BIND,
INPUT TABLE ttError BIND, 1, 0, 0, 1, 0).
- END METHOD.
+ END METHOD.
/*----------------------------------------------------------------------------
Displays the given test results in the results window.
----------------------------------------------------------------------------*/
METHOD PUBLIC VOID DisplayResults(INPUT results AS TestClassResult):
+ DEFINE VARIABLE resultsWindow AS HANDLE NO-UNDO.
testCount = 0.
EMPTY TEMP-TABLE ttTestResult.
EMPTY TEMP-TABLE ttError.
AddResult(results,"",0).
- RUN setTestResults IN ResultsWindow (INPUT TABLE ttTestResult BIND,
+ GetResultsWindow(OUTPUT resultsWindow).
+ RUN setTestResults IN resultsWindow (INPUT TABLE ttTestResult BIND,
INPUT TABLE ttError BIND, testCount,
- results:CountTestsWithStatus(TestResult:StatusPassed),
- results:CountTestsWithStatus(TestResult:StatusFailed),
- results:CountTestsWithStatus(TestResult:StatusError),
+ results:CountTestsWithStatus(TestResult:StatusPassed),
+ results:CountTestsWithStatus(TestResult:StatusFailed),
+ results:CountTestsWithStatus(TestResult:StatusError),
results:CountTestsWithStatus(TestResult:StatusIgnored)).
END METHOD.
/*----------------------------------------------------------------------------
Add the given test result to the ttTestResult and ttError tables.
- ----------------------------------------------------------------------------*/
- METHOD PRIVATE VOID AddResult(INPUT res AS TestResult, INPUT parentClass AS CHARACTER,
+ ----------------------------------------------------------------------------*/
+ METHOD PRIVATE VOID AddResult(INPUT res AS TestResult, INPUT parentClass AS CHARACTER,
INPUT depth AS INTEGER):
DEFINE VARIABLE testName AS CHARACTER NO-UNDO.
@@ -164,10 +175,10 @@ CLASS OEUnit.UI.ResultsWindowView IMPLEMENTS IResultsView:
ttTestResult.ErrorCount = res:GetErrors():Size
ttTestResult.ResultMessage = res:GetMessage()
ttTestResult.ResultStatus = res:GetStatus()
- ttTestResult.ResultStatusString = CAPS(res:GetStatusAsString()).
-
+ ttTestResult.ResultStatusString = CAPS(res:GetStatusAsString()).
+
AddErrors(res:GetErrors()).
-
+
IF TYPE-OF(res, TestClassResult) THEN DO:
DEFINE VARIABLE classResult AS TestClassResult NO-UNDO.
ASSIGN
@@ -175,15 +186,15 @@ CLASS OEUnit.UI.ResultsWindowView IMPLEMENTS IResultsView:
ttTestResult.IsClass = TRUE
ttTestResult.HasPasses = (res:CountTestsWithStatus(TestResult:StatusPassed) > 0)
ttTestResult.HasFailures = (res:CountTestsWithStatus(TestResult:StatusFailed) > 0)
- ttTestResult.HasErrors = ((res:CountTestsWithStatus(TestResult:StatusError) > 0)
+ ttTestResult.HasErrors = ((res:CountTestsWithStatus(TestResult:StatusError) > 0)
OR (classResult:GetStatus() = TestResult:StatusError)).
- ttTestResult.HasIgnored = ((res:CountTestsWithStatus(TestResult:StatusIgnored) > 0)
- OR (classResult:GetStatus() = TestResult:StatusIgnored)).
- IF classResult:GetMessage() = "" AND classResult:GetStatus() > TestResult:StatusNoTests THEN
+ ttTestResult.HasIgnored = ((res:CountTestsWithStatus(TestResult:StatusIgnored) > 0)
+ OR (classResult:GetStatus() = TestResult:StatusIgnored)).
+ IF classResult:GetMessage() = "" AND classResult:GetStatus() > TestResult:StatusNoTests THEN
ttTestResult.ResultStatusString = "".
-
+
/* Add child results */
- DEFINE VARIABLE i AS INTEGER NO-UNDO.
+ DEFINE VARIABLE i AS INTEGER NO-UNDO.
DO i = 1 TO classResult:resultCount:
AddResult(classResult:GetResult(i), testName, depth + 1).
END.
@@ -194,7 +205,7 @@ CLASS OEUnit.UI.ResultsWindowView IMPLEMENTS IResultsView:
/*----------------------------------------------------------------------------
Add each of the Progress.Lang.Errors in the given list to the ttError table.
- ----------------------------------------------------------------------------*/
+ ----------------------------------------------------------------------------*/
METHOD PRIVATE STATIC VOID AddErrors(INPUT errors AS List):
DEFINE VARIABLE i AS INTEGER NO-UNDO.
DO i = 1 TO errors:Size:
@@ -202,19 +213,19 @@ CLASS OEUnit.UI.ResultsWindowView IMPLEMENTS IResultsView:
END.
END METHOD.
-
+
/*----------------------------------------------------------------------------
Add the given error to ttError.
- ----------------------------------------------------------------------------*/
+ ----------------------------------------------------------------------------*/
METHOD PRIVATE STATIC VOID AddError(INPUT err AS Progress.Lang.Error, INPUT errorId AS INTEGER):
CREATE ttError.
ASSIGN ttError.TestId = ttTestResult.TestId
- ttError.ErrorId = errorId
+ ttError.ErrorId = errorId
ttError.ErrorMessage = Errors:GetMessage(err)
- ttError.CallStack = err:GetClass():TypeName + " at~n"
+ ttError.CallStack = err:GetClass():TypeName + " at~n"
+ Errors:TrimCallStack(err:CallStack).
-
+
END METHOD.
-
+
END CLASS.
\ No newline at end of file
diff --git a/src/OEUnit/Util/NamedList.cls b/src/OEUnit/Util/NamedList.cls
new file mode 100644
index 0000000..92998ee
--- /dev/null
+++ b/src/OEUnit/Util/NamedList.cls
@@ -0,0 +1,168 @@
+ /*------------------------------------------------------------------------------
+ File : NamedList.cls
+ Package : OEUnit.Util
+ Description : Stores a named list of strings. List elements can be accessed
+ by their name only.
+------------------------------------------------------------------------------*/
+
+ROUTINE-LEVEL ON ERROR UNDO, THROW.
+
+USING Progress.Lang.*.
+
+CLASS OEUnit.Util.NamedList:
+
+ DEFINE PRIVATE VARIABLE reset AS LOGICAL NO-UNDO.
+
+ /*----------------------------------------------------------------------------
+ Temp table to store elements (integer-object pairs).
+ ----------------------------------------------------------------------------*/
+ DEFINE PROTECTED TEMP-TABLE element NO-UNDO
+ FIELD name AS CHARACTER
+ FIELD val AS CHARACTER
+ INDEX sequence IS PRIMARY UNIQUE name ASCENDING.
+
+ /*----------------------------------------------------------------------------
+ The number of elements in the list
+ ----------------------------------------------------------------------------*/
+ DEFINE PUBLIC PROPERTY Size AS INTEGER NO-UNDO INIT 0
+ GET.
+ PRIVATE SET.
+
+ /*----------------------------------------------------------------------------
+ Return the name of item in the list that is currently being pointed to.
+ ----------------------------------------------------------------------------*/
+ DEFINE PUBLIC PROPERTY CurrentName AS CHARACTER NO-UNDO
+ GET():
+ IF AVAILABLE(element) THEN
+ RETURN element.name.
+ RETURN ?.
+ END GET.
+ /*SET. */
+
+ /*----------------------------------------------------------------------------
+ Return the value of item in the list that is currently being pointed to.
+ ----------------------------------------------------------------------------*/
+ DEFINE PUBLIC PROPERTY CurrentValue AS CHARACTER NO-UNDO
+ GET():
+ IF AVAILABLE(element) THEN
+ RETURN element.val.
+ RETURN ?.
+ END GET.
+ /*SET. */
+
+ /*----------------------------------------------------------------------------
+ Default Constructor.
+ ----------------------------------------------------------------------------*/
+ CONSTRUCTOR NamedList():
+ END CONSTRUCTOR.
+
+ DESTRUCTOR NamedList():
+ FOR EACH element:
+ DELETE element.
+ END.
+ END DESTRUCTOR.
+
+ /*----------------------------------------------------------------------------
+ Add the name and value pair to the list.
+ ----------------------------------------------------------------------------*/
+ METHOD PUBLIC VOID Add(INPUT nam AS CHARACTER, INPUT val AS CHARACTER):
+ FIND element WHERE element.name = nam NO-ERROR.
+ IF NOT AVAILABLE(element) THEN
+ DO:
+ Size = Size + 1.
+ CREATE element.
+ ASSIGN element.name = nam
+ element.val = val.
+ END.
+ ELSE ASSIGN element.val = val.
+ END METHOD.
+
+ /*----------------------------------------------------------------------------
+ Returns the value matching the given name from the list.
+ ----------------------------------------------------------------------------*/
+ METHOD PUBLIC CHARACTER Get(INPUT name AS CHARACTER):
+ FIND element WHERE element.name = name NO-ERROR.
+ IF AVAILABLE(element) THEN RETURN element.val.
+ RETURN ERROR NEW AppError("Value not found with name: " + name,0).
+ END METHOD.
+
+ /*----------------------------------------------------------------------------
+ Removes the given object from the list.
+ ----------------------------------------------------------------------------*/
+ METHOD PUBLIC VOID Remove(INPUT name AS CHARACTER):
+ FIND element WHERE element.name = name NO-ERROR.
+ IF AVAILABLE(element) THEN
+ RemoveCurrent().
+ ELSE
+ RETURN ERROR NEW AppError("Value not found in list with name: " + name,0).
+ END METHOD.
+
+ /*----------------------------------------------------------------------------
+ Removes the current element from the list.
+ ----------------------------------------------------------------------------*/
+ METHOD PUBLIC VOID RemoveCurrent():
+ IF AVAILABLE(element) THEN DO:
+ DELETE element.
+ Size = Size - 1.
+ END.
+ END METHOD.
+
+ /*----------------------------------------------------------------------------
+ Reset the current pointer position. Calling MoveNext() after calling this
+ method will position the pointer at the first element in the list. Whereas
+ calling MovePrevious() will position the pointer at the last element in the
+ list.
+ ----------------------------------------------------------------------------*/
+ METHOD PUBLIC VOID Reset():
+ reset = TRUE.
+ END METHOD.
+
+ /*----------------------------------------------------------------------------
+ Positions the pointer at the first element in the list. Returns true if exists.
+ ----------------------------------------------------------------------------*/
+ METHOD PUBLIC LOGICAL MoveFirst():
+ FIND FIRST element NO-ERROR.
+ RETURN AVAILABLE(element).
+ END METHOD.
+
+ /*----------------------------------------------------------------------------
+ Positions the pointer at the last element in the list. Returns true if exists.
+ ----------------------------------------------------------------------------*/
+ METHOD PUBLIC LOGICAL MoveLast():
+ FIND LAST element NO-ERROR.
+ RETURN AVAILABLE(element).
+ END METHOD.
+
+ /*----------------------------------------------------------------------------
+ Position the pointer at the next element in the list. Returns true if exists.
+ ----------------------------------------------------------------------------*/
+ METHOD PUBLIC LOGICAL MoveNext():
+ IF reset THEN DO:
+ reset = FALSE.
+ RETURN MoveFirst().
+ END.
+ FIND NEXT element NO-ERROR.
+ RETURN AVAILABLE(element).
+ END METHOD.
+
+ /*----------------------------------------------------------------------------
+ Position the pointer at the previous element in the list. Returns true if
+ exists.
+ ----------------------------------------------------------------------------*/
+ METHOD PUBLIC LOGICAL MovePrevious():
+ IF reset THEN DO:
+ reset = FALSE.
+ RETURN MoveLast().
+ END.
+ FIND PREV element NO-ERROR.
+ RETURN AVAILABLE(element).
+ END METHOD.
+
+ /*----------------------------------------------------------------------------
+ Return true is a list element with the given name is in the list.
+ ----------------------------------------------------------------------------*/
+ METHOD PUBLIC LOGICAL HasValue(INPUT name AS CHARACTER):
+ RETURN CAN-FIND(FIRST element WHERE element.name = name).
+ END METHOD.
+
+END CLASS.
\ No newline at end of file