[Fusionforge-commits] r9069 - in trunk: gforge/common/include tests tests/unit tests/unit/config
Roland Mas
lolando at libremir.placard.fr.eu.org
Mon Mar 15 14:04:05 CET 2010
Author: lolando
Date: 2010-03-15 14:04:04 +0100 (Mon, 15 Mar 2010)
New Revision: 9069
Added:
trunk/tests/unit/config/
trunk/tests/unit/config/AllTests.php
trunk/tests/unit/config/ConfigTests.php
Modified:
trunk/gforge/common/include/config.php
trunk/tests/AllTests.php
trunk/tests/unit/AllTests.php
Log:
Added unit tests for the config system (and fixed bugs detected by it :-)
Modified: trunk/gforge/common/include/config.php
===================================================================
--- trunk/gforge/common/include/config.php 2010-03-15 13:03:57 UTC (rev 9068)
+++ trunk/gforge/common/include/config.php 2010-03-15 13:04:04 UTC (rev 9069)
@@ -34,32 +34,32 @@
}
public function get_value ($section, $var) {
- if (!isset ($settings[$section])
- || !isset ($settings[$section][$var])) {
+ if (!isset (self::$instance->settings[$section])
+ || !isset (self::$instance->settings[$section][$var])) {
return NULL ;
}
- return $settings[$section][$var] ;
+ return self::$instance->settings[$section][$var] ;
}
public function set_value ($section, $var, $value) {
- if (!isset ($settings[$section])) {
- $settings[$section] = array () ;
+ if (!isset (self::$instance->settings[$section])) {
+ self::$instance->settings[$section] = array () ;
}
- if (!isset ($settings[$section][$var])) {
- $settings[$section][$var] = $value ;
+ if (!isset (self::$instance->settings[$section][$var])) {
+ self::$instance->settings[$section][$var] = $value ;
}
}
- function fusionforge_read_config_file ($file) {
+ function read_config_file ($file) {
$sections = parse_ini_file ($file, true) ;
- foreach ($sections as $sectname => $options) {
- if (!isset ($settings[$section]))
+ foreach ($sections as $section => $options) {
+ if (!isset (self::$instance->settings[$section]))
continue ;
- foreach ($options as $key => $value) {
- if (!isset ($settings[$section][$var]))
+ foreach ($options as $var => $value) {
+ if (!isset (self::$instance->settings[$section][$var]))
continue ;
- $settings[$sectname][$key] = $value ;
+ self::$instance->settings[$section][$var] = $value ;
}
}
return ;
Modified: trunk/tests/AllTests.php
===================================================================
--- trunk/tests/AllTests.php 2010-03-15 13:03:57 UTC (rev 9068)
+++ trunk/tests/AllTests.php 2010-03-15 13:04:04 UTC (rev 9069)
@@ -8,6 +8,7 @@
// Unit tests
require_once 'unit/utils/AllTests.php';
+require_once 'unit/config/AllTests.php';
//require_once 'ACL/AllTests.php';
// Code tests
@@ -40,6 +41,7 @@
// Unit tests
$suite->addTest(Utils_AllTests::suite());
// $suite->addTest(ACL_AllTests::suite());
+ $suite->addTest(Config_AllTests::suite());
// Code tests
$suite->addTest(Syntax_AllTests::suite());
Modified: trunk/tests/unit/AllTests.php
===================================================================
--- trunk/tests/unit/AllTests.php 2010-03-15 13:03:57 UTC (rev 9068)
+++ trunk/tests/unit/AllTests.php 2010-03-15 13:04:04 UTC (rev 9069)
@@ -8,6 +8,7 @@
// Unit tests
require_once 'utils/AllTests.php';
+require_once 'config/AllTests.php';
class AllTests
{
@@ -22,6 +23,7 @@
// Unit tests
$suite->addTest(Utils_AllTests::suite());
+ $suite->addTest(Config_AllTests::suite());
return $suite;
}
Added: trunk/tests/unit/config/AllTests.php
===================================================================
--- trunk/tests/unit/config/AllTests.php (rev 0)
+++ trunk/tests/unit/config/AllTests.php 2010-03-15 13:04:04 UTC (rev 9069)
@@ -0,0 +1,17 @@
+<?php
+
+require_once 'PHPUnit/Framework.php';
+require_once dirname(__FILE__).'/ConfigTests.php';
+
+class Config_AllTests
+{
+ public static function suite()
+ {
+ $suite = new PHPUnit_Framework_TestSuite('PHPUnit Framework');
+
+ $suite->addTestSuite('Config_Tests');
+
+ return $suite;
+ }
+}
+?>
Added: trunk/tests/unit/config/ConfigTests.php
===================================================================
--- trunk/tests/unit/config/ConfigTests.php (rev 0)
+++ trunk/tests/unit/config/ConfigTests.php 2010-03-15 13:04:04 UTC (rev 9069)
@@ -0,0 +1,33 @@
+<?php
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once dirname(__FILE__) . '/../../../gforge/common/include/config.php';
+
+/**
+ * Simple tests for the config library.
+ *
+ * @package Tests
+ * @author Roland Mas <lolando at debian.org>
+ * @copyright 2009 Roland Mas
+ * @license GPL License
+ */
+class Config_Tests extends PHPUnit_Framework_TestCase
+{
+ /**
+ * test basic config getting
+ */
+ public function testBasicConfig()
+ {
+ $c = FusionForgeConfig::get_instance () ;
+ fusionforge_define_config_item ('forge_name', 'core', 'default') ;
+
+ $this->assertEquals('default', fusionforge_get_config ('forge_name'));
+ $this->assertEquals('default', fusionforge_get_config ('forge_name', 'core'));
+
+ fusionforge_read_config_file (dirname(__FILE__) . '/../../../gforge/etc/fusionforge.ini') ;
+
+ $this->assertEquals('FusionForge', fusionforge_get_config ('forge_name'));
+ $this->assertEquals('FusionForge', fusionforge_get_config ('forge_name', 'core'));
+ }
+
+}
More information about the Fusionforge-commits
mailing list