Revision: 489 http://cishell.svn.sourceforge.net/cishell/?rev=489&view=rev Author: mwlinnem Date: 2007-08-20 10:13:04 -0700 (Mon, 20 Aug 2007) Log Message: ----------- Updated warning message. Modified Paths: -------------- trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java Modified: trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java =================================================================== --- trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2007-08-20 16:18:19 UTC (rev 488) +++ trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2007-08-20 17:13:04 UTC (rev 489) @@ -53,12 +53,11 @@ public Data[] execute() { - this.log.log(LogService.LOG_WARNING, - "-------NOTICE-------" + "\n" + + this.log.log(LogService.LOG_INFO, + "-------NOTICE-------" + "\n" + "The Converter Tester will take " + - "approximately 30 seconds to run all the tests, and around " + - "20 seconds to display all the results. Thank you for " + - "waiting :)" + "\n" + + "approximately 30 seconds to run all the tests. \n" + + "Thank you for waiting :)" + "\n" + "-----END NOTICE-----"); Data[] returnDM; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 499 http://cishell.svn.sourceforge.net/cishell/?rev=499&view=rev Author: mwlinnem Date: 2007-08-30 12:09:19 -0700 (Thu, 30 Aug 2007) Log Message: ----------- Major refactoring. Many little changes. Modified Paths: -------------- trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java Modified: trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java =================================================================== --- trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2007-08-30 19:08:56 UTC (rev 498) +++ trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2007-08-30 19:09:19 UTC (rev 499) @@ -52,13 +52,13 @@ } public Data[] execute() { - this.log.log(LogService.LOG_INFO, - "-------NOTICE-------" + "\n" + + "\r\n" + + "-------NOTICE-------" + "\r\n" + "The Converter Tester will take " + - "approximately 30 seconds to run all the tests. \n" + - "Thank you for waiting :)" + "\n" + - "-----END NOTICE-----"); + "approximately 30 seconds to run all the tests. \r\n" + + "Thank you for waiting :)" + "\r\n" + + "-----END NOTICE----- \r\n"); Data[] returnDM; @@ -107,22 +107,18 @@ //get all the converters ServiceReference[] convRefs = getConverterReferences(); - //generate converter paths inside converter graph, for use in executing the test - ConverterGraph converterGraph = new ConverterGraph(convRefs, bContext, log); + - //extract converter graph in nwb file format. - File nwbGraph = converterGraph.asNWB(); - //initialize all the report generators AllTestsReportGenerator allGen = new AllTestsReportGenerator(this.log); AllConvsReportGenerator allConvGen = new AllConvsReportGenerator(this.log); - GraphReportGenerator graphGen = new GraphReportGenerator(nwbGraph, this.log); + GraphReportGenerator graphGen = new GraphReportGenerator(this.log); ReadMeReportGenerator readmeGen = new ReadMeReportGenerator(); //execute the tests, and provide the results to the report generators ConverterTester2 ct = new ConverterTester2(log); - ct.execute(converterGraph, + ct.execute(convRefs, new ReportGenerator[] {allGen, allConvGen, graphGen, readmeGen}, cContext, bContext); @@ -184,6 +180,7 @@ addReturn(graphReport); } catch (Exception e) { this.log.log(LogService.LOG_ERROR, "Converter Tester Failed.", e); + e.printStackTrace(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 511 http://cishell.svn.sourceforge.net/cishell/?rev=511&view=rev Author: mwlinnem Date: 2007-09-10 09:43:04 -0700 (Mon, 10 Sep 2007) Log Message: ----------- Changed the order reports are shown in (all tests report isn't as friendly as the converter report, so best to put the converter report at the top). Modified Paths: -------------- trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java Modified: trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java =================================================================== --- trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2007-09-10 16:38:02 UTC (rev 510) +++ trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2007-09-10 16:43:04 UTC (rev 511) @@ -151,26 +151,6 @@ readmeReport.getName(), null); addReturn(readMeData); - //return all tests report - - AllTestsReport allReport = allGen.getAllTestsReport(); - File allReportFile = allReport.getAllTestsReport(); - Data allReportData = createReportData(allReportFile, - allReport.getName() , null); - addReturn(allReportData); - - TestReport[] sTestReports = - allReport.getSuccessfulTestReports(); - addFilePasses(sTestReports, allReportData); - - TestReport[] ppTestReports = - allReport.getPartialSuccessTestReports(); - addFilePasses(ppTestReports, allReportData); - - TestReport[] fTestReports = - allReport.getFailedTestReports(); - addFilePasses(fTestReports, allReportData); - //return all converters report AllConvsReport allConvReport = @@ -196,6 +176,26 @@ addFilePasses(trs, convReportData); } + //return all tests report + + AllTestsReport allReport = allGen.getAllTestsReport(); + File allReportFile = allReport.getAllTestsReport(); + Data allReportData = createReportData(allReportFile, + allReport.getName() , null); + addReturn(allReportData); + + TestReport[] sTestReports = + allReport.getSuccessfulTestReports(); + addFilePasses(sTestReports, allReportData); + + TestReport[] ppTestReports = + allReport.getPartialSuccessTestReports(); + addFilePasses(ppTestReports, allReportData); + + TestReport[] fTestReports = + allReport.getFailedTestReports(); + addFilePasses(fTestReports, allReportData); + //return all errors report AllErrorReport allErrorReport = @@ -205,6 +205,7 @@ allErrorReport.getName(), null); addReturn(allErrReport); + //return annotated graph report File graphReportFile = graphGen.getGraphReport(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 526 http://cishell.svn.sourceforge.net/cishell/?rev=526&view=rev Author: mwlinnem Date: 2007-09-17 10:25:54 -0700 (Mon, 17 Sep 2007) Log Message: ----------- Removed System.out.printlns. Modified Paths: -------------- trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java Modified: trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java =================================================================== --- trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2007-09-17 17:19:02 UTC (rev 525) +++ trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2007-09-17 17:25:54 UTC (rev 526) @@ -328,8 +328,9 @@ return refs; } catch (InvalidSyntaxException e) { - System.out.println("OOPS!"); - System.out.println(e); + this.log.log(LogService.LOG_ERROR, "Invalid syntax '" + filter + + "' for filtering service references. Attempted to " + + "obtain all converter references.", e); return null; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 532 http://cishell.svn.sourceforge.net/cishell/?rev=532&view=rev Author: mwlinnem Date: 2007-09-20 14:15:45 -0700 (Thu, 20 Sep 2007) Log Message: ----------- Removed slowness warning. Modified Paths: -------------- trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java Modified: trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java =================================================================== --- trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2007-09-20 21:07:14 UTC (rev 531) +++ trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2007-09-20 21:15:45 UTC (rev 532) @@ -68,13 +68,13 @@ } public Data[] execute() { - this.log.log(LogService.LOG_INFO, - "\r\n" + - "-------NOTICE-------" + "\r\n" + - "The Converter Tester will take " + - "some time to run all the tests. \r\n" + - "Thank you for waiting :)" + "\r\n" + - "-----END NOTICE----- \r\n"); +// this.log.log(LogService.LOG_INFO, +// "\r\n" + +// "-------NOTICE-------" + "\r\n" + +// "The Converter Tester will take " + +// "some time to run all the tests. \r\n" + +// "Thank you for waiting :)" + "\r\n" + +// "-----END NOTICE----- \r\n"); Data[] returnDM; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 723 http://cishell.svn.sourceforge.net/cishell/?rev=723&view=rev Author: mwlinnem Date: 2008-03-26 14:12:15 -0700 (Wed, 26 Mar 2008) Log Message: ----------- Change metadata line. Modified Paths: -------------- trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java Modified: trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java =================================================================== --- trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2008-03-26 20:46:09 UTC (rev 722) +++ trunk/testing/org.cishell.testing.convertertester.algorithm/src/org/cishell/testing/convertertester/algorithm/ConverterTesterAlgorithm.java 2008-03-26 21:12:15 UTC (rev 723) @@ -361,7 +361,7 @@ private Data createReportData(Object report, String label, Data parent, String format, String type) { Data reportData = new BasicData(report, format); - Dictionary metadata = reportData.getMetaData(); + Dictionary metadata = reportData.getMetadata(); if (label == null) { label = "no label"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |