From cf7e63f7a885aabbe9ce13bf6ab3698215ef742d Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Thu, 01 Feb 2007 20:44:15 +0000
Subject: [PATCH] Corrected a bug where the parsing tool was only parsing one line for the #@TestResult tag.
---
opends/tests/functional-tests/shared/java/parsingtool/ParseData.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/opends/tests/functional-tests/shared/java/parsingtool/ParseData.java b/opends/tests/functional-tests/shared/java/parsingtool/ParseData.java
index 1d3c1e3..0c7a767 100644
--- a/opends/tests/functional-tests/shared/java/parsingtool/ParseData.java
+++ b/opends/tests/functional-tests/shared/java/parsingtool/ParseData.java
@@ -179,10 +179,25 @@
}
else if(tmpStr.indexOf("#@TestResult") >= 0)
{
- arrayData.setTestResult(StripSubstring(tmpStr, "#@TestResult"));
-
- if(fileFormat.startsWith("java"))
+ if(fileFormat.startsWith("xml"))
{
+ String currTestResult = StripSubstring(tmpStr, "#@TestResult");
+ fin.mark(1000);
+
+ String oneMoLine = new String(fin.readLine().trim());
+ while((oneMoLine.indexOf("#@") < 0) && (oneMoLine.indexOf("-->") < 0))
+ {
+ currTestResult = currTestResult + " " + oneMoLine;
+ oneMoLine = new String(fin.readLine().trim());
+ }
+
+ arrayData.setTestResult(currTestResult);
+ fin.reset();
+ }
+ else if(fileFormat.startsWith("java"))
+ {
+ arrayData.setTestResult(StripSubstring(tmpStr, "#@TestResult"));
+
// parse test purpose from java doc comments
fin.mark(1000);
String oneMoLine = new String(fin.readLine().trim());
--
Gitblit v1.10.0