Skip to content

Commit

Permalink
Item12952: Get ConfigureTests running
Browse files Browse the repository at this point in the history
Changed from "use" to "require" so that the tests dependent on the new
configure still fail, but other tests can run.

git-svn-id: http://svn.foswiki.org/trunk@17893 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
GeorgeClark authored and GeorgeClark committed Aug 11, 2014
1 parent 3cbdf96 commit 18e67e3
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion UnitTestContrib/test/unit/ConfigureTests.pm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use FindBin;
use File::Path qw(mkpath rmtree);

use Foswiki::Configure::Util ();
use Foswiki::Configure::FoswikiCfg ();
use Foswiki::Configure::Root ();
use Foswiki::Configure::Valuer ();
use Foswiki::Configure::UI ();
Expand Down Expand Up @@ -151,6 +150,7 @@ EXAMPLE
$defaultCfg{$k} = $cfg{$k};
}

require Foswiki::Configure::FoswikiCfg;
Foswiki::Configure::FoswikiCfg::_parse( $fhname, $root, 1 );

# nothing should have changed
Expand Down Expand Up @@ -205,6 +205,7 @@ $Foswiki::cfg{One} = 'One';
1;
EXAMPLE
$f1->close();
require Foswiki::Configure::FoswikiCfg;
Foswiki::Configure::FoswikiCfg::_parse( $f1name, $root );

$this->assert_not_null( $root->getValueObject('{One}') );
Expand Down Expand Up @@ -241,6 +242,7 @@ $Foswiki::cfg{Plugins}{CommentPlugin}{Enabled} = 0;
1;
EXAMPLE
$f1->close();
require Foswiki::Configure::FoswikiCfg;
Foswiki::Configure::FoswikiCfg::_parse( $f1name, $root );
my $vo = $root->getValueObject('{Plugins}{CommentPlugin}{Enabled}');
$this->assert_not_null($vo);
Expand Down Expand Up @@ -269,6 +271,7 @@ $Foswiki::cfg{Two} = 'One';
1;
EXAMPLE
$f1->close();
require Foswiki::Configure::FoswikiCfg;
Foswiki::Configure::FoswikiCfg::_parse( $f1name, $root );

my $vo = $root->getValueObject('{One}');
Expand Down Expand Up @@ -330,6 +333,7 @@ $cfg{Three} = 'Three';
1;
EXAMPLE
$f1->close();
require Foswiki::Configure::FoswikiCfg;
Foswiki::Configure::FoswikiCfg::_parse( $f1name, $root, 1 );
foreach my $k ( keys %cfg ) {
$defaultCfg{$k} = $cfg{$k};
Expand Down

0 comments on commit 18e67e3

Please sign in to comment.