svn commit: r515391 - /ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java

[jonesde]

Author: jonesde
Date: Tue Mar  6 16:22:35 2007
New Revision: 515391

URL: http://svn.apache.org/viewvc?view=rev&rev=515391
Log:
A couple of refinements based on conversation with Joe about this new implementation

Modified:
    ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java

Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java?view=diff&rev=515391&r1=515390&r2=515391
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java Tue Mar  6 16:22:35 2007
@@ -38,7 +38,6 @@
     public static final String module = ServiceTest.class.getName();
 
     protected String entityXmlUrlString;
-    protected int testCaseCount;
 
     /**
      * @param modelTestSuite
@@ -46,26 +45,22 @@
     public EntityXmlAssertTest(String caseName, ModelTestSuite modelTestSuite, Element mainElement) {
         super(caseName, modelTestSuite);
         this.entityXmlUrlString = mainElement.getAttribute("entity-xml-url");
-        this.testCaseCount = 0;
+    }
+
+    public int countTestCases() {
+        int testCaseCount = 0;
         try {
             URL entityXmlURL = FlexibleLocation.resolveLocation(entityXmlUrlString);
             List checkValueList = modelTestSuite.getDelegator().readXmlDocument(entityXmlURL);
-            this.testCaseCount = checkValueList.size();
+            testCaseCount = checkValueList.size();
         } catch (Exception e) {
             Debug.logError(e, "Error getting test case count", module);
         }
-    }
-
-    public int countTestCases() {
-        return this.testCaseCount;
+        return testCaseCount;
     }
 
     public void run(TestResult result) {
-
-        result.startTest(this);
-
         try {
-
             URL entityXmlURL = FlexibleLocation.resolveLocation(entityXmlUrlString);
             GenericDelegator delegator = modelTestSuite.getDelegator();
             List errorMessages = new ArrayList();
@@ -73,16 +68,14 @@
             EntityDataAssert.assertData(entityXmlURL, delegator, errorMessages);
 
             if (UtilValidate.isNotEmpty(errorMessages)) {
-                for (Iterator failureIterator = errorMessages.iterator(); failureIterator.hasNext();) {
+                Iterator failureIterator = errorMessages.iterator();
+                while (failureIterator.hasNext()) {
                     String failureMessage = (String) failureIterator.next();
                     result.addFailure(this, new AssertionFailedError(failureMessage));
                 }
             }
-
         } catch (Exception e) {
             result.addError(this, e);
         }
-
-        result.endTest(this);
     }
 }