[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[43890] trunk/lib/test/core/JisonParser

[<rob...@us...>]

Revision: 43890
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43890&view=rev
Author:   robertplummer
Date:     2012-11-10 22:41:43 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
[FIX] Turn verbose off

Modified Paths:
--------------
    trunk/lib/test/core/JisonParser/Abstract.php
    trunk/lib/test/core/JisonParser/HtmlToWikiTest.php

Modified: trunk/lib/test/core/JisonParser/Abstract.php
===================================================================
--- trunk/lib/test/core/JisonParser/Abstract.php	2012-11-10 22:06:13 UTC (rev 43889)
+++ trunk/lib/test/core/JisonParser/Abstract.php	2012-11-10 22:41:43 UTC (rev 43890)
@@ -7,7 +7,7 @@
 
 class JisonParser_Abstract extends TikiTestCase
 {
-	public $verbose = false;
+	static $verbose = false;
 	public $called;
 	public $parser;
 	public $syntaxSets = array();
@@ -56,7 +56,7 @@
 				$syntax = $customHandled['syntax'];
 			}
 
-			if ($this->verbose == true) {
+			if (self::$verbose == true) {
 				echo $syntaxName . ":\n";
 				echo '"' . $parsed . '"' . "\n\n\n\n";
 			}

Modified: trunk/lib/test/core/JisonParser/HtmlToWikiTest.php
===================================================================
--- trunk/lib/test/core/JisonParser/HtmlToWikiTest.php	2012-11-10 22:06:13 UTC (rev 43889)
+++ trunk/lib/test/core/JisonParser/HtmlToWikiTest.php	2012-11-10 22:41:43 UTC (rev 43890)
@@ -2,7 +2,7 @@
 
 class JisonParser_HtmlToWikiTest extends JisonParser_OutputTest
 {
-	public $verbose = false;
+	static $verbose = false;
 	public static $htmlToWikiParser;
 
 	function setUp()
@@ -16,10 +16,14 @@
 
 	static function assertEquals($expected, $actual, $syntaxName, $syntax)
 	{
-		$actual = self::$htmlToWikiParser->parse($actual);
-		echo "\n\nReversal: '" . $actual . "'";
-		echo "\n\nExpected: '" . $syntax . "'";
+		$parsed = self::$htmlToWikiParser->parse($actual);
 
-		return parent::assertEquals($syntax, $actual, $syntaxName, $actual);
+		if (self::$verbose) {
+			echo "\n\nWiki: '" . $actual . "'";
+			echo "\n\nReversal: '" . $parsed . "'";
+			echo "\n\nExpected: '" . $syntax . "'";
+		}
+
+		return parent::assertEquals($syntax, $parsed, $syntaxName, $actual);
 	}
 }
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.