Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 52631 invoked from network); 7 Dec 2005 20:14:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Dec 2005 20:14:35 -0000 Received: (qmail 23356 invoked by uid 500); 7 Dec 2005 20:14:34 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 23318 invoked by uid 500); 7 Dec 2005 20:14:33 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 23296 invoked by uid 99); 7 Dec 2005 20:14:33 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2005 12:14:33 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 07 Dec 2005 12:14:32 -0800 Received: (qmail 52319 invoked by uid 65534); 7 Dec 2005 20:14:12 -0000 Message-ID: <20051207201412.52317.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r354842 - /geronimo/gbuild/trunk/gbuild-report/src/main/java/org/apache/geronimo/gbuild/report/SummaryReportUtil.java Date: Wed, 07 Dec 2005 20:14:11 -0000 To: scm@geronimo.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: dblevins Date: Wed Dec 7 12:14:07 2005 New Revision: 354842 URL: http://svn.apache.org/viewcvs?rev=354842&view=rev Log: Added better exception handling around parsing Modified: geronimo/gbuild/trunk/gbuild-report/src/main/java/org/apache/geronimo/gbuild/report/SummaryReportUtil.java Modified: geronimo/gbuild/trunk/gbuild-report/src/main/java/org/apache/geronimo/gbuild/report/SummaryReportUtil.java URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-report/src/main/java/org/apache/geronimo/gbuild/report/SummaryReportUtil.java?rev=354842&r1=354841&r2=354842&view=diff ============================================================================== --- geronimo/gbuild/trunk/gbuild-report/src/main/java/org/apache/geronimo/gbuild/report/SummaryReportUtil.java (original) +++ geronimo/gbuild/trunk/gbuild-report/src/main/java/org/apache/geronimo/gbuild/report/SummaryReportUtil.java Wed Dec 7 12:14:07 2005 @@ -39,8 +39,11 @@ Map.Entry entry = (Map.Entry) caseIterator.next(); String storeName = (String) entry.getKey(); String storeValue = (String) entry.getValue(); + TestCase testCase = createTestcase(storeName, storeValue, newResult, reportFileLocator); - testcases.add(testCase); + if (testCase != null) { + testcases.add(testCase); + } } return testcases; } @@ -55,37 +58,42 @@ } private static TestCase createTestcase(String storeName, String storeValue, boolean newResult, ReportFileLocator reportFileLocator) { - int index = storeName.lastIndexOf('#'); - String name = storeName.substring(index + 1); - String classname = storeName.substring(0, index); - String reportFile = reportFileLocator.getReportFile(classname, name); + try { + int index = storeName.lastIndexOf('#'); + String name = storeName.substring(index + 1); + String classname = storeName.substring(0, index); + String reportFile = reportFileLocator.getReportFile(classname, name); - char flag = storeValue.charAt(0); - index = storeValue.indexOf(')'); - long time = Long.parseLong(storeValue.substring(3, index)); - boolean failed; - boolean error; - String msg; - if (flag == 'P') { - failed = false; - error = false; - msg = ""; - } else { - if (flag == 'F') { - failed = true; - error = false; - } else { + char flag = storeValue.charAt(0); + index = storeValue.indexOf(')'); + long time = Long.parseLong(storeValue.substring(3, index)); + boolean failed; + boolean error; + String msg; + if (flag == 'P') { failed = false; - error = true; - } - if (storeValue.length() >= index + 2) { - msg = storeValue.substring(index + 2); - } else { + error = false; msg = ""; + } else { + if (flag == 'F') { + failed = true; + error = false; + } else { + failed = false; + error = true; + } + if (storeValue.length() >= index + 2) { + msg = storeValue.substring(index + 2); + } else { + msg = ""; + } } - } - return new TestCase(name, classname, reportFile, time, failed, error, msg, newResult); + return new TestCase(name, classname, reportFile, time, failed, error, msg, newResult); + } catch (NumberFormatException e) { + System.out.println("FAILED TO PARSE - "+storeName +" = "+storeValue); + return null; + } } private static String getStoreName(TestCase testCase) {