removed obsolete headless test, updated testing rule sets to use report object

2 files changed, 5 insertions, 7 deletions

diff --git a/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-caps.js b/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-caps.js
index 6178ac1..6c988bc 100644
--- a/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-caps.js
+++ b/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-caps.js
@@ -2,8 +2,7 @@ exports.name = "Headings are capitalized";
 
 exports.description = "Check to see if all headings use leading capital letters.";
 
-exports.rule = function() {
-  var r = this;
+exports.rule = function(r) {
   var badHeadings =
     fiveui.query(':header').filter(
       function(idx) {
@@ -15,6 +14,6 @@ exports.rule = function() {
         }
       });
   $(badHeadings).map(function(idx, elt) {
-                       r.report('Heading does not start with a capital letter.', elt);
+                       r.error('Heading does not start with a capital letter.', elt);
                      });
 };
diff --git a/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-noEmptyHdrs.js b/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-noEmptyHdrs.js
index 466f46e..e31f412 100644
--- a/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-noEmptyHdrs.js
+++ b/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-noEmptyHdrs.js
@@ -2,12 +2,11 @@ exports.name = "Disallow Empty Headers";
 
 exports.description = "Heading elements should contain text.";
 
-exports.rule = function() {
-                 var r = this;
-                 fiveui.query(':header').each(
+exports.rule = function(r) {
+                 $5(':header').each(
                    function(ix, elt) {
                      if($(elt).text() == '') {
-                       r.report('Heading does not contain text', elt);
+                       r.error('Heading does not contain text', elt);
                      }
                    });
                };