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

4
t/Asset/Asset.t
View file

@ -810,10 +810,6 @@ END {
if defined $origExtras;
$session->config->set( 'uploadsURL', $origUploads)
if defined $origUploads;
$session->setting->set('urlExtension', $origUrlExtension)
if defined $origUrlExtension;
$session->setting->set('notFoundPage', $origNotFoundPage)
if defined $origNotFoundPage;
if (defined $originalAssetOverrides) {
$session->config->set('assets', $originalAssetOverrides);
}

2
t/Asset/AssetMetaData.t
View file

@ -195,7 +195,6 @@ cmp_deeply(
#
####################################################
my $origMetaEnabled = $session->setting->get("metaDataEnabled");
$session->setting->set("metaDataEnabled", 1);
# add another field for comparison
@ -236,6 +235,5 @@ END {
$tag->rollback;
}
}
$session->setting->set("metaDataEnabled", $origMetaEnabled);
}

7
t/Asset/Event/edit.t
View file

@ -30,11 +30,8 @@ my $node = WebGUI::Asset->getImportNode( $session );
my @versionTags = ( WebGUI::VersionTag->getWorking( $session ) );
# Override some settings to make things easier to test
my %oldSettings;
# userFunctionStyleId
$oldSettings{ userFunctionStyleId } = $session->setting->get( 'userFunctionStyleId' );
$session->setting->set( 'userFunctionStyleId', 'PBtmpl0000000000000132' );
$oldSettings{ defaultVersionTagWorkflow } = $session->setting->get( 'defaultVersionTagWorkflow' );
$session->setting->set( 'defaultVersionTagWorkflow', 'pbworkflow000000000003' );
# Create a user for testing purposes
@ -173,10 +170,6 @@ END {
}
$user->delete;
for my $key ( keys %oldSettings ) {
$session->setting->set( $key, $oldSettings{ $key } );
}
}
#----------------------------------------------------------------------------

6
t/Asset/File/GalleryFile/Photo/edit.t
View file

@ -27,12 +27,9 @@ my $node = WebGUI::Asset->getImportNode( $session );
my @versionTags = ( WebGUI::VersionTag->getWorking( $session ) );
# Override some settings to make things easier to test
my %oldSettings;
# userFunctionStyleId
$oldSettings{ userFunctionStyleId } = $session->setting->get( 'userFunctionStyleId' );
$session->setting->set( 'userFunctionStyleId', 'PBtmpl0000000000000132' );
# specialState
$oldSettings{ specialState } = $session->setting->get( 'specialState' );
$session->setting->set( 'specialState', '' );
# Create a user for testing purposes
@ -141,9 +138,6 @@ END {
$user->delete;
for my $key ( keys %oldSettings ) {
$session->setting->set( $key, $oldSettings{ $key } );
}
}
#----------------------------------------------------------------------------

7
t/Asset/Redirect/mech.t
View file

@ -29,12 +29,9 @@ my $node = WebGUI::Asset->getImportNode( $session );
my @versionTags = ( WebGUI::VersionTag->getWorking( $session ) );
# Override some settings to make things easier to test
my %oldSettings;
# userFunctionStyleId
$oldSettings{ userFunctionStyleId } = $session->setting->get( 'userFunctionStyleId' );
$session->setting->set( 'userFunctionStyleId', 'PBtmpl0000000000000132' );
# specialState
$oldSettings{ specialState } = $session->setting->get( 'specialState' );
$session->setting->set( 'specialState', '' );
# Create a user for testing purposes
@ -180,8 +177,4 @@ END {
}
$user->delete;
for my $key ( keys %oldSettings ) {
$session->setting->set( $key, $oldSettings{ $key } );
}
}

7
t/Asset/Wobject/GalleryAlbum/edit.t
View file

@ -28,12 +28,9 @@ my $node = WebGUI::Asset->getImportNode( $session );
my @versionTags = ( WebGUI::VersionTag->getWorking( $session ) );
# Override some settings to make things easier to test
my %oldSettings;
# userFunctionStyleId
$oldSettings{ userFunctionStyleId } = $session->setting->get( 'userFunctionStyleId' );
$session->setting->set( 'userFunctionStyleId', 'PBtmpl0000000000000132' );
# specialState
$oldSettings{ specialState } = $session->setting->get( 'specialState' );
$session->setting->set( 'specialState', '' );
# Create a user for testing purposes
@ -120,10 +117,6 @@ END {
}
$user->delete;
for my $key ( keys %oldSettings ) {
$session->setting->set( $key, $oldSettings{ $key } );
}
}
#----------------------------------------------------------------------------

6
t/Asset/Wobject/GalleryAlbum/rss.t
View file

@ -65,12 +65,9 @@ for my $i ( 0 .. 5 ) {
$versionTag->commit;
# Override some settings to make things easier to test
my %oldSettings;
# userFunctionStyleId
$oldSettings{ userFunctionStyleId } = $session->setting->get( 'userFunctionStyleId' );
$session->setting->set( 'userFunctionStyleId', 'PBtmpl0000000000000132' );
# specialState
$oldSettings{ specialState } = $session->setting->get( 'specialState' );
$session->setting->set( 'specialState', '' );
my ( $mech );
@ -122,7 +119,4 @@ cmp_deeply(
# Cleanup
END {
$versionTag->rollback();
for my $key ( keys %oldSettings ) {
$session->setting->set( $key, $oldSettings{ $key } );
}
}

7
t/Auth/mech.t
View file

@ -34,12 +34,9 @@ my $node = WebGUI::Asset->getImportNode( $session );
my @versionTags = ( WebGUI::VersionTag->getWorking( $session ) );
# Override some settings to make things easier to test
my %oldSettings;
# userFunctionStyleId
$oldSettings{ userFunctionStyleId } = $session->setting->get( 'userFunctionStyleId' );
$session->setting->set( 'userFunctionStyleId', 'PBtmpl0000000000000132' );
# specialState
$oldSettings{ specialState } = $session->setting->get( 'specialState' );
$session->setting->set( 'specialState', '' );
# Create a user for testing purposes
@ -280,8 +277,4 @@ $mech->base_is( $assetUrl, "We don't get redirected" );
# Cleanup
END {
$user->delete;
for my $key ( keys %oldSettings ) {
$session->setting->set( $key, $oldSettings{ $key } );
}
}

2
t/Group.t
View file

@ -452,7 +452,7 @@ is_deeply(
my $defaultKarmaSetting = $session->setting->get('useKarma');
$session->setting->set('useKarma', 0) if $defaultKarmaSetting;
$session->setting->set('useKarma', 0);
is_deeply(
[ (map { $_->isInGroup($gK->getId) } @chameleons) ],

3
t/Macro/L_loginBox.t
View file

@ -45,8 +45,6 @@ plan tests => $numTests;
my $macro = 'WebGUI::Macro::L_loginBox';
my $loaded = use_ok($macro);
my $originalEncryptLogin = $session->setting->get('encryptLogin');
SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
@ -245,5 +243,4 @@ END { ##Clean-up after yourself, always
if (defined $versionTag and ref $versionTag eq 'WebGUI::VersionTag') {
$versionTag->rollback;
}
$session->setting->set("encryptLogin", $originalEncryptLogin);
}

5
t/Macro/PageUrl.t
View file

@ -25,8 +25,6 @@ $numTests += 1; #For the use_ok
plan tests => $numTests;
my $preventProxyCache = $session->setting->get('preventProxyCache');
my $macro = 'WebGUI::Macro::PageUrl';
my $loaded = use_ok($macro);
@ -34,7 +32,7 @@ SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
$session->setting->set('preventProxyCache', 0) if ($preventProxyCache);
$session->setting->set('preventProxyCache', 0);
my $homeAsset = WebGUI::Asset->getDefault($session);
@ -70,5 +68,4 @@ like($output, qr{/sub/page\?noCache=\d+:\d+;query=this$}, 'checking that the que
END {
# See note in the Slash_gateway macro test about this.
$session->setting->set("preventProxyCache", $preventProxyCache);
}

9
t/Macro/Slash_gatewayUrl.t
View file

@ -29,8 +29,6 @@ $numTests += 1; #For the use_ok
plan tests => $numTests;
my $preventProxyCache = $session->setting->get('preventProxyCache');
my $macro = 'WebGUI::Macro::Slash_gatewayUrl';
my $loaded = use_ok($macro);
@ -38,7 +36,7 @@ SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
$session->setting->set('preventProxyCache', 0) if ($preventProxyCache);
$session->setting->set('preventProxyCache', 0);
my $output;
@ -61,9 +59,4 @@ $session->setting->set('preventProxyCache', 0);
}
END {
#
# Not sure we should be doing this. I understand we want to leave things as we found them, however if this is set, a lot of tests after this one will fail.
# Perhaps we should set it to 0 always, regardless of their setting?
#
$session->setting->set('preventProxyCache', $preventProxyCache);
}

1
t/Macro/c_companyName.t
View file

@ -43,5 +43,4 @@ is($output, q|Gooey's Consulting, LLC|, "Testing companyName with embedd
}
END {
$session->setting->set('companyName', $originalCompanyName);
}

6
t/Mail/Send.t
View file

@ -37,11 +37,10 @@ BEGIN {
}
# See if we have an SMTP server to use
my ( $smtpd, %oldSettings );
my ( $smtpd );
my $SMTP_HOST = 'localhost';
my $SMTP_PORT = '54921';
if ($hasServer) {
$oldSettings{ smtpServer } = $session->setting->get('smtpServer');
$session->setting->set( 'smtpServer', $SMTP_HOST . ':' . $SMTP_PORT );
}
@ -174,9 +173,6 @@ SKIP: {
#----------------------------------------------------------------------------
# Cleanup
END {
for my $name ( keys %oldSettings ) {
$session->setting->set( $name, $oldSettings{ $name } );
}
}
#----------------------------------------------------------------------------

2
t/PassiveProfiling.t
View file

@ -28,7 +28,6 @@ my $startingTime = $session->datetime->time();
my $numTests = 5; # increment this value for each test you create
plan tests => 1 + $numTests;
my $origPassiveProfiling = $session->setting->get('passiveProfilingEnabled');
my $loaded = use_ok('WebGUI::PassiveProfiling');
my $versionTag = WebGUI::VersionTag->getWorking($session);
@ -122,7 +121,6 @@ cmp_bag(
}
END {
$session->setting->set('passiveProfilingEnabled', $origPassiveProfiling);
$session->db->write('delete from passiveProfileLog where dateOfEntry >= ?',[$startingTime-1]);
$versionTag->rollback;
}

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);
}

3
t/Storage/Image.t
View file

@ -259,8 +259,6 @@ foreach my $testImage (@testImages) {
);
}
use Data::Dumper;
$session->setting->set('maxImageSize', $resizeTarget );
foreach my $testImage (@testImages) {
my $filename = $testImage->{ filename };
@ -286,5 +284,4 @@ END {
) {
ref $stor eq "WebGUI::Storage" and $stor->delete;
}
$session->setting->set('maxImageSize', $origMaxImageSize );
}

1
t/Workflow/Activity/DeleteExpiredSessions.t
View file

@ -115,5 +115,4 @@ foreach my $testSession (@sessions) {
END {
$workflow->delete;
$session->setting->set('sessionTimeout', $origSessionTimeout );
}

9
t/lib/WebGUI/Test.pm
View file

@ -48,7 +48,8 @@ our $logger_debug;
our $logger_info;
our $logger_error;
my %originalConfig = ();
my %originalConfig;
my $originalSetting;
BEGIN {
@ -128,6 +129,8 @@ BEGIN {
$SESSION = WebGUI::Session->open( $WEBGUI_ROOT, $CONFIG_FILE );
$SESSION->{_request} = $pseudoRequest;
$originalSetting = clone $SESSION->setting;
}
END {
@ -146,6 +149,10 @@ END {
$SESSION->config->delete($key);
}
}
my $settings = $originalSetting->get();
while (my ($param, $value) = each %{ $settings }) {
$SESSION->setting->set($param, $value);
}
$SESSION->var->end;
$SESSION->close if defined $SESSION;
}