Permalink
Browse files

Get tests working (adjust file structure, remove broken/duplicative A…

…llTests.php [use "pear run-tests -r tests" instead]) (bug #19174). Also fix bugs in package.php.

git-svn-id: http://svn.php.net/repository/pear/packages/XML_Util/trunk@321545 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
1 parent ead043e commit e1aff921cc30af0f989542f10ba7ce274ef9bb21 Daniel Convissor committed Dec 30, 2011
Showing with 5 additions and 137 deletions.
  1. 0 { → XML}/Util.php
  2. +5 −5 package.php
  3. +0 −132 tests/AllTests.php
File renamed without changes.
View
@@ -20,15 +20,15 @@
$package = PEAR_PackageFileManager2::importOptions(
'package.xml',
array(
- 'filelistgenerator' => 'cvs',
+ 'filelistgenerator' => 'svn',
'changelogoldtonew' => false,
'simpleoutput' => true,
'baseinstalldir' => 'XML',
'packagefile' => 'package.xml',
'packagedirectory' => '.'));
-if (PEAR::isError($result)) {
- echo $result->getMessage();
+if (PEAR::isError($package)) {
+ echo $package->getMessage();
die();
}
@@ -49,10 +49,10 @@
$package->setPearinstallerDep('1.4.3');
$package->addExtensionDep('required', 'pcre');
$package->addIgnore(array('package.php', 'package.xml'));
-$package->addReplacement('Util.php', 'package-info', '@version@', 'version');
+$package->addReplacement('XML/Util.php', 'package-info', '@version@', 'version');
$package->generateContents();
-if ($_SERVER['argv'][1] == 'make') {
+if (@$_SERVER['argv'][1] == 'make') {
$result = $package->writePackageFile();
} else {
$result = $package->debugPackageFile();
View
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * Master Unit Test Suite file for XML_Util
- *
- * This top-level test suite file organizes
- * all class test suite files,
- * so that the full suite can be run
- * by PhpUnit or via "pear run-tests -u".
- *
- * PHP version 5
- *
- * @category XML
- * @package XML_Util
- * @subpackage UnitTesting
- * @author Chuck Burgess <ashnazg@php.net>
- * @license http://www.opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
- * @link http://pear.php.net/package/XML_Util
- * @since 1.2.0a1
- */
-
-
-/**
- * Check PHP version... PhpUnit v3+ requires at least PHP v5.1.4
- */
-if (version_compare(PHP_VERSION, "5.1.4") < 0) {
- // Cannnot run test suites
- echo 'Cannot run test suite via PhpUnit... requires at least PHP v5.1.4.' . PHP_EOL;
- echo 'Use "pear run-tests -p xml_util" to run the PHPT tests directly.' . PHP_EOL
-;
- exit(1);
-}
-
-
-/**
- * Derive the "main" method name
- * @internal PhpUnit would have to rename PHPUnit_MAIN_METHOD to PHPUNIT_MAIN_METHOD
- * to make this usage meet the PEAR CS... we cannot rename it here.
- */
-if (!defined('PHPUnit_MAIN_METHOD')) {
- define('PHPUnit_MAIN_METHOD', 'XML_Util_AllTests::main');
-}
-
-
-/*
- * Files needed by PhpUnit
- */
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-require_once 'PHPUnit/Extensions/PhptTestSuite.php';
-
-/*
- * You must add each additional class-level test suite file here
- */
-// there are no PhpUnit test files... only PHPTs.. so nothing is listed here
-
-/**
- * directory where PHPT tests are located
- */
-define('XML_UTIL_DIR_PHPT', dirname(__FILE__));
-
-/**
- * Master Unit Test Suite class for XML_Util
- *
- * This top-level test suite class organizes
- * all class test suite files,
- * so that the full suite can be run
- * by PhpUnit or via "pear run-tests -up xml_util".
- *
- * @category XML
- * @package XML_Util
- * @subpackage UnitTesting
- * @author Chuck Burgess <ashnazg@php.net>
- * @license http://www.opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: @package_version@
- * @link http://pear.php.net/package/XML_Util
- * @since 1.2.0a1
- */
-class XML_Util_AllTests
-{
-
- /**
- * Launches the TextUI test runner
- *
- * @return void
- * @uses PHPUnit_TextUI_TestRunner
- */
- public static function main()
- {
- PHPUnit_TextUI_TestRunner::run(self::suite());
- }
-
-
- /**
- * Adds all class test suites into the master suite
- *
- * @return PHPUnit_Framework_TestSuite a master test suite
- * containing all class test suites
- * @uses PHPUnit_Framework_TestSuite
- */
- public static function suite()
- {
- $suite = new PHPUnit_Framework_TestSuite(
- 'XML_Util Full Suite of Unit Tests');
-
- /*
- * You must add each additional class-level test suite name here
- */
- // there are no PhpUnit test files... only PHPTs.. so nothing is listed here
-
- /*
- * add PHPT tests
- */
- $phpt = new PHPUnit_Extensions_PhptTestSuite(XML_UTIL_DIR_PHPT);
- $suite->addTestSuite($phpt);
-
- return $suite;
- }
-}
-
-/**
- * Call the main method if this file is executed directly
- * @internal PhpUnit would have to rename PHPUnit_MAIN_METHOD to PHPUNIT_MAIN_METHOD
- * to make this usage meet the PEAR CS... we cannot rename it here.
- */
-if (PHPUnit_MAIN_METHOD == 'XML_Util_AllTests::main') {
- XML_Util_AllTests::main();
-}
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-?>

0 comments on commit e1aff92

Please sign in to comment.