oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change tests to use the automatic backup of Settings in END blocks.

Browse source
This commit is contained in:
Colin Kuskie 2009-03-30 20:41:02 +00:00
parent 6f3aae261b
commit 4e78593395
23 changed files with 13 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

8
t/Session/ErrorHandler.t
View file

@ -149,8 +149,6 @@ is($eh->canShowBasedOnIP(''), 0, 'canShowBasedOnIP: must send IP setting');
#
####################################################
my $origDebugIp = $session->setting->get('debugIp');
my $origShowDebug = $session->setting->get('showDebug');
$session->setting->set('showDebug', 0);
delete $eh->{_canShowDebug};
@ -183,8 +181,6 @@ ok($eh->canShowDebug, 'canShowDebug: returns 1 if debugIp is set and IP address
#
####################################################
my $origShowPerf = $session->setting->get('showPerformanceIndicators');
$session->setting->set('showPerformanceIndicators', 0);
is($eh->canShowPerformanceIndicators, 0, 'canShowPerformanceIndicators: returns 0 if not enabled');
@ -243,8 +239,4 @@ TODO: {
}
END {
$session->setting->set('debugIp', $origDebugIp);
$session->setting->set('showDebug', $origShowDebug);
$session->setting->set('showPerformanceIndicators', $origShowPerf);
}

2
t/Session/Http.t
View file

@ -199,7 +199,6 @@ $session->{_asset} = $sessionAsset;
####################################################
##Force settings
my $origPreventProxyCache = $session->setting->get('preventProxyCache');
$session->setting->set('preventProxyCache', 0);
##Clear request object for next two tests
@ -432,5 +431,4 @@ sub deltaHttpTimes {
END {
$session->setting->set('preventProxyCache', $origPreventProxyCache);
}

2
t/Session/Privilege.t
View file

@ -77,7 +77,6 @@ my ($versionTag, $userTemplate) = setup_assets($session);
isa_ok($privilege, 'WebGUI::Session::Privilege', 'session has correct object type');
##Override the original user style template to make verification easier
my $origUserStyle = $session->setting->get('userFunctionStyleId');
$session->setting->set('userFunctionStyleId', $userTemplate->getId);
#One of the tests has different behavior depending on how it is called.
@ -147,7 +146,6 @@ sub setup_assets {
END {
$session->setting->set('userFunctionStyleId', $origUserStyle);
if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
$versionTag->rollback;
}

2
t/Session/Style.t
View file

@ -558,8 +558,6 @@ sub setup_assets {
}
END {
$session->setting->set('preventProxyCache', $origPreventProxyCache);
$session->setting->set('userFunctionStyleId', $origUserStyle);
if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
$versionTag->rollback;
}

5
t/Session/Url.t
View file

@ -62,7 +62,7 @@ $session->{_request} = $pseudoRequest;
#disable caching
my $preventProxyCache = $session->setting->get('preventProxyCache');
$session->setting->set('preventProxyCache', 0) if ($preventProxyCache);
$session->setting->set('preventProxyCache', 0);
#######################################
#
@ -462,9 +462,6 @@ END { ##Always clean-up
$session->config->set('extrasURL', $origExtras);
$session->config->set('sslEnabled', $origSSLEnabled) if defined $origSSLEnabled;
$session->setting->set('hostToUse', $setting_hostToUse);
$session->setting->set('preventProxyCache', $preventProxyCache);
if ($config_port) {
$session->config->set($config_port);
}