From edf2251aca60a970e822079d23933e5b70b26571 Mon Sep 17 00:00:00 2001 From: ctrlaltca <> Date: Wed, 2 Jan 2013 14:42:24 +0000 Subject: backported all related changes up to 3229 to branch/3.2 --- buildscripts/phing/etc/VERSION.TXT | 2 +- buildscripts/phing/etc/coverage-frames.xsl | 536 ++- buildscripts/phing/etc/log.xsl | 2 +- buildscripts/phing/etc/phing-grammar.rng | 5015 +++++++++++++++++++++++ buildscripts/phing/etc/phpunit-frames.xsl | 694 ++++ buildscripts/phing/etc/phpunit-noframes.xsl | 448 ++ buildscripts/phing/etc/phpunit2-frames.xsl | 677 --- buildscripts/phing/etc/phpunit2-noframes.xsl | 436 -- buildscripts/phing/etc/str.replace.function.xsl | 0 9 files changed, 6626 insertions(+), 1184 deletions(-) mode change 100644 => 100755 buildscripts/phing/etc/coverage-frames.xsl mode change 100644 => 100755 buildscripts/phing/etc/log.xsl create mode 100644 buildscripts/phing/etc/phing-grammar.rng create mode 100755 buildscripts/phing/etc/phpunit-frames.xsl create mode 100755 buildscripts/phing/etc/phpunit-noframes.xsl delete mode 100644 buildscripts/phing/etc/phpunit2-frames.xsl delete mode 100644 buildscripts/phing/etc/phpunit2-noframes.xsl mode change 100644 => 100755 buildscripts/phing/etc/str.replace.function.xsl (limited to 'buildscripts/phing/etc') diff --git a/buildscripts/phing/etc/VERSION.TXT b/buildscripts/phing/etc/VERSION.TXT index 00fa3b83..321d7fe1 100644 --- a/buildscripts/phing/etc/VERSION.TXT +++ b/buildscripts/phing/etc/VERSION.TXT @@ -1 +1 @@ -Phing 2.2 BRANCH (SVN) \ No newline at end of file +Phing 2.4.12 \ No newline at end of file diff --git a/buildscripts/phing/etc/coverage-frames.xsl b/buildscripts/phing/etc/coverage-frames.xsl old mode 100644 new mode 100755 index 5e8d8e3e..251faff6 --- a/buildscripts/phing/etc/coverage-frames.xsl +++ b/buildscripts/phing/etc/coverage-frames.xsl @@ -1,3 +1,4 @@ + + @author Michiel Rook @author Stephane Bailliez --> + + - + @@ -68,6 +71,9 @@ + + + - Coverage Results. + <xsl:value-of select="$document.title"/> Coverage Results @@ -98,6 +104,11 @@ ======================================================================= --> + + .sortable th { + cursor: pointer; + } + .bannercell { border: 0px; padding: 0px; @@ -155,6 +166,41 @@ .small { font-size: 9px; } + td.legendItem { + font-weight: bold; + padding-bottom: 2px; + padding-right: 6px; + padding-top: 6px; + text-align: right; + } + td.legendValue { + color: #2E3436; + font-weight: bold; + padding-bottom: 2px; + padding-top: 6px; + text-align: left; + } + span.LegendCovered { + background-color: #8AE234; + margin-right: 2px; + padding-left: 10px; + padding-right: 10px; + text-align: center; + } + span.LegendUncovered { + background-color: #F0C8C8; + margin-right: 2px; + padding-left: 10px; + padding-right: 10px; + text-align: center; + } + span.LegendDeadCode { + background-color: #D3D7CF; + margin-right: 2px; + padding-left: 10px; + padding-right: 10px; + text-align: center; + } TD.empty { FONT-SIZE: 2px; BACKGROUND: #c0c0c0; BORDER:#9c9c9c 1px solid; color: #c0c0c0; @@ -174,22 +220,41 @@ TD.uncovered { PRE.srcLine { BACKGROUND: #ffffff; MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px; } + PRE.srcLineUncovered { + BACKGROUND: #F0C8C8; MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px; +} + PRE.srcLineCovered { + BACKGROUND: #8AE234; MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px; + } + PRE.srcLineDeadCode { + BACKGROUND: #D3D7CF; MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px; + } td.lineCount, td.coverageCount { BACKGROUND: #F0F0F0; PADDING-RIGHT: 3px; text-align: right; } -td.lineCountHighlight { - background: #C8C8F0; PADDING-RIGHT: 3px; + td.lineCountCovered, td.coverageCountCovered { + background: #8AE234; PADDING-RIGHT: 3px; text-align: right; } -td.coverageCountHighlight { + td.srcLineCovered { + background: #8AE234; + } + td.lineCountUncovered, td.coverageCountUncovered { background: #F0C8C8; PADDING-RIGHT: 3px; text-align: right; } -span.srcLineHighlight { + td.srcLineUncovered { background: #F0C8C8; } -span.srcLine { + td.lineCountDeadCode, td.coverageCountDeadCode { + background: #D3D7CF; PADDING-RIGHT: 3px; + text-align: right; + } + td.srcLineDeadCode { + background: #D3D7CF; + } +td.srcLine { background: #C8C8F0; } TD.srcLineClassStart { @@ -230,7 +295,7 @@ TD.srcLineClassStart { - / + / .html @@ -247,6 +312,33 @@ TD.srcLineClassStart { + + + + + + + / + + + / + + .html + + + + + + + (-) + + + () + + + + + @@ -266,7 +358,7 @@ TD.srcLineClassStart { - + @@ -281,6 +373,10 @@ TD.srcLineClassStart { + Coverage Results Overview + +