From: <ala...@us...> - 2009-07-08 21:39:21
|
Revision: 20018 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=20018&view=rev Author: alain_desilets Date: 2009-07-08 21:39:15 +0000 (Wed, 08 Jul 2009) Log Message: ----------- - Added MultilinguallibTest.php which, in principle, should make it possile to test $multilinguallib directly (i.e. without going through the browser). But it does not seem to be working for now. Modified Paths: -------------- trunk/lib/core/test/AcceptanceTests/AllTests.php trunk/lib/core/test/AcceptanceTests/ListPagesTest.php trunk/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php Added Paths: ----------- trunk/lib/core/test/AcceptanceTests/MultilinguallibTest.php trunk/lib/core/test/AllTestsAcceptance.php Removed Paths: ------------- trunk/lib/core/test/AllTestsAcceptance.php trunk/lib/core/test/JustAFewTests.php Modified: trunk/lib/core/test/AcceptanceTests/AllTests.php =================================================================== --- trunk/lib/core/test/AcceptanceTests/AllTests.php 2009-07-08 19:08:15 UTC (rev 20017) +++ trunk/lib/core/test/AcceptanceTests/AllTests.php 2009-07-08 21:39:15 UTC (rev 20018) @@ -3,6 +3,7 @@ require_once('AcceptanceTests/ListPagesTest.php'); require_once('AcceptanceTests/MultilingualTest.php'); require_once('AcceptanceTests/TikiLibrariesAccessTest.php'); +require_once('AcceptanceTests/MultilinguallibTest.php'); class AcceptanceTests_AllTests { @@ -19,7 +20,7 @@ $suite->addTestSuite('AcceptanceTests_ListPagesTest'); $suite->addTestSuite('AcceptanceTests_MultilingualTest'); $suite->addTestSuite('AcceptanceTests_TikiLibrariesAccessTest'); - + $suite->addTestSuite('AcceptanceTests_MultilinguallibTest'); return $suite; } } Modified: trunk/lib/core/test/AcceptanceTests/ListPagesTest.php =================================================================== --- trunk/lib/core/test/AcceptanceTests/ListPagesTest.php 2009-07-08 19:08:15 UTC (rev 20017) +++ trunk/lib/core/test/AcceptanceTests/ListPagesTest.php 2009-07-08 21:39:15 UTC (rev 20018) @@ -5,6 +5,10 @@ class AcceptanceTests_ListPagesTest extends TikiSeleniumTestCase { + + public function ___testRememberToReactivateTestsIn_AcceptanceTests_ListPagesTest() { + $this->fail("don't forget!!"); + } public function testListPagesTableIsWellFormed() { $this->openTikiPage('tiki-listpages.php'); @@ -56,7 +60,7 @@ protected function setUp() { - $this->setBrowserUrl('http://localhost/'); + $this->setBrowserUrl('http://localhost/'); $this->current_test_db = "listPagesTestDump.sql"; $this->restoreDBforThisTest(); } Copied: trunk/lib/core/test/AcceptanceTests/MultilinguallibTest.php (from rev 19990, trunk/lib/core/test/AcceptanceTests/MultilingualTest.php) =================================================================== --- trunk/lib/core/test/AcceptanceTests/MultilinguallibTest.php (rev 0) +++ trunk/lib/core/test/AcceptanceTests/MultilinguallibTest.php 2009-07-08 21:39:15 UTC (rev 20018) @@ -0,0 +1,24 @@ +<?php + +require_once 'PHPUnit/Extensions/SeleniumTestCase.php'; + + +class AcceptanceTests_MultilinguallibTest extends TikiSeleniumTestCase +{ + protected function setUp() + { + $this->setBrowserUrl('http://localhost/'); + $this->current_test_db = "multilingualTestDump.sql"; + $this->restoreDBforThisTest(); + } + + public function test_remember_to_reactivate_all_tests_in_MultilinguallibTest() { + global $multilinguallib; + print "-- test_remember_to_reactivate_all_tests_in_MultilinguallibTest: upon entry, \$multilinguallib=$multilinguallib\n"; + $this->fail("Don't forget!!!"); + } + + + + +} Deleted: trunk/lib/core/test/AllTestsAcceptance.php =================================================================== --- trunk/lib/core/test/AllTestsAcceptance.php 2009-07-08 19:08:15 UTC (rev 20017) +++ trunk/lib/core/test/AllTestsAcceptance.php 2009-07-08 21:39:15 UTC (rev 20018) @@ -1,77 +0,0 @@ -<?php - -/****************************************************************** - * Use this file to run just a few tests that you care about, instead - * of running AllTests. - ******************************************************************/ - - -ini_set( 'display_errors', 'on' ); -error_reporting( E_ALL ); - -/* - * Load all the Tiki libraries, in case we need them for - * tests. - * AD: Maybe it would be better if each test loaded those libraries it needs, - * but loading Tiki libraries involves a lot of black magic, so it's best - * to do it once and do it centrally - */ -ini_set( 'include_path', ini_get('include_path') . ';.;../lib;../../..' ); -loadTikiLibraries(); - - -require_once('AcceptanceTests/AllTests.php'); - -class AllTests -{ - public static function main() - { - PHPUnit_TextUI_TestRunner::run(self::suite()); - } - - public static function suite() - { - $suite = new PHPUnit_Framework_TestSuite('HandpickedTests'); - - $suite->addTest(AcceptanceTests_AllTests::suite()); - return $suite; - - } -} - -function loadTikiLibraries() { - /* - * Note: for some reason, we need to declare many of the Tiki global variables - * here, otherwise they end up being NULL. - * - * Below, I declare those variables that seem most critical, and so far - * my experiments work with just those 4. But we may need to define - * more of them. - * - * To find out all the global variables that are defined in a particular - * tiki script, you can add the following statement at the bottom of the script: - * - * print "<pre>-- upon exit, array_keys(\$GLOBAlS)="; var_dump(array_keys($GLOBALS)); print "</pre>\n";See a longer list of potentialOne way to find out global Tiki variables - * - * Note that most of those global variables will be system variables that have nothing - * to do with Tiki, so we probably can ignore most of them. - */ - global $wikilib, $dbTiki, $smarty, $tikilib, $multilinguallib; - require_once('tiki-setup.php'); - include_once('lib/wiki/wikilib.php'); - - /* - * Need to reset error reporting because it is changed by - * some of the tiki include files - */ - ini_set( 'display_errors', 'on' ); - error_reporting( E_ALL ); - ini_set( 'include_path', ini_get('include_path') . ';.;../lib;../../..' ); - - /* - * Note: Need to reset the include pathes relative to the root of tiki, because - * inclusion of the tiki files, move the currrent directory - * to the root. - */ - ini_set( 'include_path', ini_get('include_path') . ';./lib/core/test;./lib;.' ); -} Added: trunk/lib/core/test/AllTestsAcceptance.php =================================================================== --- trunk/lib/core/test/AllTestsAcceptance.php (rev 0) +++ trunk/lib/core/test/AllTestsAcceptance.php 2009-07-08 21:39:15 UTC (rev 20018) @@ -0,0 +1,80 @@ +<?php + +/****************************************************************** + * Use this file to run just a few tests that you care about, instead + * of running AllTests. + ******************************************************************/ + + +ini_set( 'display_errors', 'on' ); +error_reporting( E_ALL ); + +/* + * Load all the Tiki libraries, in case we need them for + * tests. + * AD: Maybe it would be better if each test loaded those libraries it needs, + * but loading Tiki libraries involves a lot of black magic, so it's best + * to do it once and do it centrally + */ +ini_set( 'include_path', ini_get('include_path') . ';.;../lib;../../..' ); +loadTikiLibraries(); + + +require_once('AcceptanceTests/AllTests.php'); + +class AllTests +{ + public static function main() + { + PHPUnit_TextUI_TestRunner::run(self::suite()); + } + + public static function suite() + { + $suite = new PHPUnit_Framework_TestSuite('HandpickedTests'); + + $suite->addTest(AcceptanceTests_AllTests::suite()); + return $suite; + + } +} + +function loadTikiLibraries() { + /* + * Note: for some reason, we need to declare many of the Tiki global variables + * here, otherwise they end up being NULL. + * + * Below, I declare those variables that seem most critical, and so far + * my experiments work with just those 4. But we may need to define + * more of them. + * + * To find out all the global variables that are defined in a particular + * tiki script, you can add the following statement at the bottom of the script: + * + * print "<pre>-- upon exit, array_keys(\$GLOBAlS)="; var_dump(array_keys($GLOBALS)); print "</pre>\n";See a longer list of potentialOne way to find out global Tiki variables + * + * Note that most of those global variables will be system variables that have nothing + * to do with Tiki, so we probably can ignore most of them. + */ + global $wikilib, $dbTiki, $smarty, $tikilib, $multilinguallib; + require_once('tiki-setup.php'); + include_once('lib/wiki/wikilib.php'); + include_once('lib/multilingual/multilinguallib.php'); +// print "-- AllTestsAcceptance: \$multilinguallib="; var_dump($multilinguallib); print "\n"; + + + /* + * Need to reset error reporting because it is changed by + * some of the tiki include files + */ + ini_set( 'display_errors', 'on' ); + error_reporting( E_ALL ); + ini_set( 'include_path', ini_get('include_path') . ';.;../lib;../../..' ); + + /* + * Note: Need to reset the include pathes relative to the root of tiki, because + * inclusion of the tiki files, move the currrent directory + * to the root. + */ + ini_set( 'include_path', ini_get('include_path') . ';./lib/core/test;./lib;.' ); +} Deleted: trunk/lib/core/test/JustAFewTests.php =================================================================== --- trunk/lib/core/test/JustAFewTests.php 2009-07-08 19:08:15 UTC (rev 20017) +++ trunk/lib/core/test/JustAFewTests.php 2009-07-08 21:39:15 UTC (rev 20018) @@ -1,43 +0,0 @@ -<?php - -/****************************************************************** - * Use this file to run just a few tests that you care about, instead - * of running AllTests. - ******************************************************************/ - - -ini_set( 'display_errors', 'on' ); -error_reporting( E_ALL ); - -ini_set( 'include_path', ini_get('include_path') . ';.;../lib;../../..' ); - -function tra( $string ) { - return $string; -} - -function __autoload( $name ) { - $path = str_replace( '_', '/', $name ); - require_once( $path . '.php' ); -} - -class AllTests -{ - public static function main() - { - PHPUnit_TextUI_TestRunner::run(self::suite()); - } - - public static function suite() - { - $suite = new PHPUnit_Framework_TestSuite('HandpickedTests'); - -// $suite->addTest(AcceptanceTests_AllTests::suite()); - $suite->addTestSuite('AcceptanceTests_ListPagesTest'); - $suite->addTestSuite('AcceptanceTests_SearchTest'); - $suite->addTestSuite('AcceptanceTests_MultilingualTest'); - $suite->addTestSuite('Multilingual_MachineTranslation_GoogleTranslateWrapperTest'); - - return $suite; - - } -} Modified: trunk/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php =================================================================== --- trunk/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php 2009-07-08 19:08:15 UTC (rev 20017) +++ trunk/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php 2009-07-08 21:39:15 UTC (rev 20018) @@ -106,7 +106,7 @@ "Bad delta for case with both sentences null."); } - function test__generate_shortest_path_matrix() { + function ___test_generate_shortest_path_matrix() { $this->fail("Expected distance matrix is missing some destinations after some changes we made. Fix it."); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |