From: <dgr...@us...> - 2009-05-04 18:21:08
|
Revision: 15679 http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15679&view=rev Author: dgrove-oss Date: 2009-05-04 18:20:58 +0000 (Mon, 04 May 2009) Log Message: ----------- When importing the test run from an xml file, unnormalize the output element before storing it in the database. Modified Paths: -------------- cattrack/trunk/app/services/test_run_builder.rb Modified: cattrack/trunk/app/services/test_run_builder.rb =================================================================== --- cattrack/trunk/app/services/test_run_builder.rb 2009-05-04 18:16:41 UTC (rev 15678) +++ cattrack/trunk/app/services/test_run_builder.rb 2009-05-04 18:20:58 UTC (rev 15679) @@ -84,7 +84,7 @@ build_configuration.test_run_id = test_run_id build_configuration.time = xml.elements['duration'].text.to_i build_configuration.result = xml.elements['result'].text - build_configuration.output = xml.elements['output'].text + build_configuration.output = REXML::Text.unnormalize(xml.elements['output'].text) logger.debug("Processing build configuration '#{build_configuration.name}'.") save!(build_configuration) @@ -146,7 +146,7 @@ test_case_compilation.test_case_id = test_case_id test_case_compilation.time = xml.elements['duration'].text.to_i - test_case_compilation.output = xml.elements['output'].text || "" + test_case_compilation.output = REXML::Text.unnormalize(xml.elements['output'].text) || "" save!(test_case_compilation) end @@ -160,7 +160,7 @@ test_case_execution.time = xml.elements['duration'].text.to_i test_case_execution.result = xml.elements['result'].text test_case_execution.result_explanation = xml.elements['result-explanation'].text || "" - test_case_execution.output = xml.elements['output'].text || "" + test_case_execution.output = REXML::Text.unnormalize(xml.elements['output'].text) || "" xml.elements.each("statistics/statistic") do |p_xml| v = p_xml.attributes['value'] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dgr...@us...> - 2009-08-12 18:36:58
|
Revision: 15766 http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15766&view=rev Author: dgrove-oss Date: 2009-08-12 18:36:49 +0000 (Wed, 12 Aug 2009) Log Message: ----------- Defensive programming. If the output element of a test_case_execution is missing, don't try to denormalize it. Modified Paths: -------------- cattrack/trunk/app/services/test_run_builder.rb Modified: cattrack/trunk/app/services/test_run_builder.rb =================================================================== --- cattrack/trunk/app/services/test_run_builder.rb 2009-08-11 14:38:29 UTC (rev 15765) +++ cattrack/trunk/app/services/test_run_builder.rb 2009-08-12 18:36:49 UTC (rev 15766) @@ -160,7 +160,12 @@ test_case_execution.time = xml.elements['duration'].text.to_i test_case_execution.result = xml.elements['result'].text test_case_execution.result_explanation = xml.elements['result-explanation'].text || "" - test_case_execution.output = REXML::Text.unnormalize(xml.elements['output'].text) || "" + test_output = xml.elements['output'].text; + if (test_output != nil) + test_case_execution.output = REXML::Text.unnormalize(test_output) + else + test_case_execution.output = "" + end xml.elements.each("statistics/statistic") do |p_xml| v = p_xml.attributes['value'] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |