Merge commit 'haarg/bart-i18n'
This commit is contained in:
Colin Kuskie
commit
25083b27e3
12 changed files with 507 additions and 3 deletions
55
t/Content/SetLanguage.t
Normal file
55
t/Content/SetLanguage.t
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
#-------------------------------------------------------------------
|
||||
# WebGUI is Copyright 2001-2009 Plain Black Corporation.
|
||||
#-------------------------------------------------------------------
|
||||
# Please read the legal notices (docs/legal.txt) and the license
|
||||
# (docs/license.txt) that came with this distribution before using
|
||||
# this software.
|
||||
#-------------------------------------------------------------------
|
||||
# http://www.plainblack.com info@plainblack.com
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
use FindBin;
|
||||
use strict;
|
||||
use lib "$FindBin::Bin/../lib";
|
||||
use WebGUI::Test;
|
||||
use WebGUI::Session;
|
||||
use WebGUI::Content::SetLanguage;
|
||||
|
||||
# load your modules here
|
||||
|
||||
use Test::More tests => 5; # increment this value for each test you create
|
||||
|
||||
my $session = WebGUI::Test->session;
|
||||
|
||||
# put your tests here
|
||||
my $formvariables = {
|
||||
'op' =>'setLanguage',
|
||||
'language' => 'English'
|
||||
};
|
||||
#test 1
|
||||
$session->request->setup_body($formvariables);
|
||||
WebGUI::Content::SetLanguage::handler($session);
|
||||
is($session->scratch->getLanguageOverride, 'English', 'the language was not set');
|
||||
#test2
|
||||
$formvariables->{'language'} = 'delete';
|
||||
$session->request->setup_body($formvariables);
|
||||
WebGUI::Content::SetLanguage::handler($session);
|
||||
is($session->scratch->getLanguageOverride, undef, 'language delete should remove the scratch variable');
|
||||
#test3
|
||||
$formvariables->{'op'} = 'SetLanguage';
|
||||
$formvariables->{'language'} = 'English';
|
||||
$session->request->setup_body($formvariables);
|
||||
WebGUI::Content::SetLanguage::handler($session);
|
||||
is($session->scratch->getLanguageOverride, undef, 'Naming the method wrongly should not change anything');
|
||||
#test4
|
||||
$formvariables->{'op'} = 'setLanguage';
|
||||
$formvariables->{'language'} = 'MyImaginaryLanguageThatIsNotInstalled';
|
||||
$session->request->setup_body($formvariables);
|
||||
WebGUI::Content::SetLanguage::handler($session);
|
||||
is($session->scratch->getLanguageOverride, undef, 'Giving a non installed language should not change anything');
|
||||
#test5
|
||||
$formvariables->{'language'} = undef;
|
||||
$session->request->setup_body($formvariables);
|
||||
WebGUI::Content::SetLanguage::handler($session);
|
||||
is($session->scratch->getLanguageOverride, undef, 'Passing an empty language variable should return undef');
|
||||
|
||||
|
|
@ -16,12 +16,13 @@ use WebGUI::Session;
|
|||
use Test::More; # increment this value for each test you create
|
||||
use File::Copy;
|
||||
use File::Spec;
|
||||
use WebGUI::Content::SetLanguage;
|
||||
|
||||
my $session = WebGUI::Test->session;
|
||||
|
||||
my $numTests = 1; ##For conditional load check
|
||||
my $langTests = 4; ##For language look-up tests
|
||||
$numTests += 12 + $langTests;
|
||||
$numTests += 20 + $langTests;
|
||||
|
||||
plan tests => $numTests;
|
||||
|
||||
|
|
@ -50,6 +51,16 @@ is($i18n->get('topicName', 'WebGUI'), 'WebGUI', 'get: test manual namespace over
|
|||
|
||||
installPigLatin();
|
||||
|
||||
#tests for sub new
|
||||
my $i18nNew1 = WebGUI::International->new($session);
|
||||
is($i18nNew1->{_language}, 'English', 'Calling new without parameters should return object with language English');
|
||||
is($i18nNew1->{_namespace}, 'WebGUI', 'Calling without parameters should give namespace WebgUI');
|
||||
my $i18nNew2 = WebGUI::International->new($session, 'WebGUI::Asset');
|
||||
is($i18nNew2->{_language}, 'English', 'Calling new with only namespace parameter should return object with language English');
|
||||
is($i18nNew2->{_namespace}, 'WebGUI::Asset', 'Calling with only parameter namespace should give requested namespace');
|
||||
my $i18nNew3 = WebGUI::International->new($session, undef , 'PigLatin');
|
||||
is($i18nNew3->{_language}, 'PigLatin', 'Calling new with only language parameter should return object with language PigLatin');
|
||||
is($i18nNew3->{_namespace}, 'WebGUI', 'Calling with only parameter namespace should give WebGUI ');
|
||||
my $languages = $i18n->getLanguages();
|
||||
|
||||
my $gotPigLatin = exists $languages->{PigLatin};
|
||||
|
|
@ -102,6 +113,24 @@ sub installPigLatin {
|
|||
);
|
||||
}
|
||||
|
||||
#test for sub new with language overridden by scratch
|
||||
my $formvariables = {
|
||||
'op' =>'setLanguage',
|
||||
'language' => 'PigLatin'
|
||||
};
|
||||
$session->request->setup_body($formvariables);
|
||||
WebGUI::Content::SetLanguage::handler($session);
|
||||
my $newi18n = WebGUI::International->new($session);
|
||||
is(
|
||||
$newi18n->get('webgui','WebGUI','PigLatin'),
|
||||
'ebGUIWay',
|
||||
'if the piglatin language is in the scratch that messages should be retrieved'
|
||||
);
|
||||
is(
|
||||
$newi18n->get('104','Asset','PigLatin'),
|
||||
$newi18n->get('104', 'WebGUI', 'English'),
|
||||
'Language check after SetLanguage contentHandler : key from missing file return English key'
|
||||
);
|
||||
END {
|
||||
unlink File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n PigLatin WebGUI.pm/);
|
||||
unlink File::Spec->catfile(WebGUI::Test->lib, qw/WebGUI i18n PigLatin.pm/);
|
||||
|
|
|
|||
125
t/Macro/PickLanguage.t
Normal file
125
t/Macro/PickLanguage.t
Normal file
|
|
@ -0,0 +1,125 @@
|
|||
#-------------------------------------------------------------------
|
||||
# WebGUI is Copyright 2001-2009 Plain Black Corporation.
|
||||
#-------------------------------------------------------------------
|
||||
# Please read the legal notices (docs/legal.txt) and the license
|
||||
# (docs/license.txt) that came with this distribution before using
|
||||
# this software.
|
||||
#-------------------------------------------------------------------
|
||||
# http://www.plainblack.com info@plainblack.com
|
||||
#-------------------------------------------------------------------
|
||||
use FindBin;
|
||||
use strict;
|
||||
use lib "$FindBin::Bin/../lib";
|
||||
|
||||
use WebGUI::Test;
|
||||
use WebGUI::Session;
|
||||
use WebGUI::Asset::Template;
|
||||
|
||||
use Test::More; # increment this value for each test you create
|
||||
use Test::Deep;
|
||||
use Test::MockObject;
|
||||
use Test::MockObject::Extends;
|
||||
|
||||
my $session = WebGUI::Test->session;
|
||||
|
||||
my $numTests = 3;
|
||||
|
||||
$numTests += 1; #For the use_ok
|
||||
|
||||
plan tests => $numTests;
|
||||
|
||||
my $macro = 'WebGUI::Macro::PickLanguage';
|
||||
my $loaded = use_ok($macro);
|
||||
|
||||
my $macroMock = Test::MockObject->new({});
|
||||
$macroMock->set_isa('WebGUI::Macro::PickLanguage');
|
||||
$macroMock->set_true('process');
|
||||
|
||||
#test for normal use
|
||||
|
||||
my $templateId = 'PICKLANGUAGE_TEMPLATE_';
|
||||
|
||||
my $templateMock = Test::MockObject->new({});
|
||||
$templateMock->set_isa('WebGUI::Asset::Template');
|
||||
$templateMock->set_always('getId', $templateId);
|
||||
my $templateVars;
|
||||
$templateMock->mock('process', sub { $templateVars = $_[1]; } );
|
||||
|
||||
|
||||
{
|
||||
WebGUI::Test->mockAssetId($templateId, $templateMock);
|
||||
WebGUI::Macro::PickLanguage::process($session,$templateMock->getId);
|
||||
|
||||
cmp_deeply(
|
||||
$templateVars,
|
||||
{
|
||||
lang_loop => [
|
||||
{ 'language_url' => '?op=setLanguage;language=English',
|
||||
'language_lang' => 'English',
|
||||
'language_langAbbr' => 'en',
|
||||
'language_langAbbrLoc' => 'US',
|
||||
'language_langEng' => 'English'
|
||||
},
|
||||
],
|
||||
},
|
||||
'some template variables are created'
|
||||
);
|
||||
WebGUI::Test->unmockAssetId($templateId);
|
||||
}
|
||||
|
||||
#test when template Id is left empty
|
||||
|
||||
$templateId = '';
|
||||
my $templateNoId = $templateMock->mock('process','');
|
||||
$templateMock->set_always('getId', $templateId);
|
||||
$templateMock->mock('process', sub { $templateVars = $_[1]; } );
|
||||
|
||||
{
|
||||
|
||||
WebGUI::Test->mockAssetId($templateId, $templateMock);
|
||||
WebGUI::Macro::PickLanguage::process($session,$templateMock->getId);
|
||||
|
||||
cmp_deeply(
|
||||
$templateVars,
|
||||
{
|
||||
lang_loop => [
|
||||
{ 'language_url' => '?op=setLanguage;language=English',
|
||||
'language_lang' => 'English',
|
||||
'language_langAbbr' => 'en',
|
||||
'language_langAbbrLoc' => 'US',
|
||||
'language_langEng' => 'English'
|
||||
},
|
||||
],
|
||||
},
|
||||
'some template variables are created, when no templateId is passed on with the macro'
|
||||
);
|
||||
WebGUI::Test->unmockAssetId($templateId);
|
||||
}
|
||||
|
||||
|
||||
#{
|
||||
# WebGUI::Test->mockAssetId($templateNoId, $templateMock);
|
||||
# $error = WebGUI::Macro::PickLanguage::process($session,$templateMock->getId);
|
||||
#
|
||||
# is($error,'Could not instanciate template with id []',"Empty template Id should return error");
|
||||
#
|
||||
# WebGUI::Test->unmockAssetId($templateNoId);
|
||||
#}
|
||||
|
||||
#test for an incorrect template Id
|
||||
|
||||
$templateId = '1234567890123456789012';
|
||||
my $templateWrongId = $templateMock->mock('process','');
|
||||
$templateMock->set_always('getId', $templateId);
|
||||
$templateMock->mock('process', sub { $templateVars = $_[1]; } );
|
||||
my $error;
|
||||
|
||||
|
||||
{
|
||||
WebGUI::Test->mockAssetId($templateWrongId, $templateMock);
|
||||
$error = WebGUI::Macro::PickLanguage::process($session,$templateMock->getId);
|
||||
|
||||
is($error,'Could not instanciate template with id [1234567890123456789012]',"Template from the wrong namespace should not be initiated");
|
||||
WebGUI::Test->unmockAssetId($templateWrongId);
|
||||
}
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ use lib "$FindBin::Bin/../lib";
|
|||
use WebGUI::Test;
|
||||
use WebGUI::Session;
|
||||
|
||||
use Test::More tests => 58; # increment this value for each test you create
|
||||
use Test::More tests => 62; # increment this value for each test you create
|
||||
use Test::Deep;
|
||||
|
||||
my $session = WebGUI::Test->session;
|
||||
|
|
@ -117,6 +117,16 @@ is($sessionBank[0]->scratch->deleteNameByValue('',''), undef, 'deleteNameByValue
|
|||
is($sessionBank[3]->scratch->deleteNameByValue('falseValue','0'), 1, 'deleteNameByValue will delete values that are false (0)');
|
||||
is($sessionBank[2]->scratch->deleteNameByValue('falseValue',''), 1, "deleteNameByValue will delete values that are false ('')");
|
||||
|
||||
$scratch->setLanguageOverride('English');
|
||||
is($scratch->getLanguageOverride, 'English', 'session scratch language is not correctly set');
|
||||
$scratch->removeLanguageOverride;
|
||||
is($scratch->getLanguageOverride, undef, 'The session scratch variable language is not removed');
|
||||
$scratch->setLanguageOverride('myimmaginarylanguagethatisnotinstalled');
|
||||
is($scratch->getLanguageOverride, undef, 'A non-existing language is set');
|
||||
$scratch->setLanguageOverride('English');
|
||||
$scratch->setLanguageOverride();
|
||||
is($scratch->getLanguageOverride, 'English', 'A empty string is falsely recognised as a language');
|
||||
|
||||
END {
|
||||
$session->scratch->deleteAll;
|
||||
foreach my $wgSess ($newSession, @sessionBank) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue