[otrs-cvs] GeneralCatalog/scripts/test GeneralCatalog.t,1.15,1.16
cvs-log at otrs.org
cvs-log at otrs.org
Wed Mar 19 13:23:36 GMT 2008
Comments:
Update of /home/cvs/GeneralCatalog/scripts/test
In directory lancelot:/tmp/cvs-serv18174/scripts/test
Modified Files:
GeneralCatalog.t
Log Message:
Improved unittests.
Author: mh
Index: GeneralCatalog.t
===================================================================
RCS file: /home/cvs/GeneralCatalog/scripts/test/GeneralCatalog.t,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** GeneralCatalog.t 11 Mar 2008 10:51:33 -0000 1.15
--- GeneralCatalog.t 19 Mar 2008 13:23:31 -0000 1.16
***************
*** 22,60 ****
$Self->{UserObject} = Kernel::System::User->new( %{$Self} );
! # disable email checks to create new user
! my $CheckEmailAddressesOrg = $Self->{ConfigObject}->Get('CheckEmailAddresses') || 1;
! $Self->{ConfigObject}->Set(
! Key => 'CheckEmailAddresses',
! Value => 0,
! );
! # create new users for the tests
! my $UserID1 = $Self->{UserObject}->UserAdd(
! UserFirstname => 'GeneralCatalog1',
! UserLastname => 'UnitTest',
! UserLogin => 'UnitTest-GeneralCatalog-1' . int( rand(1_000_000) ),
! UserEmail => 'UnitTest-GeneralCatalog-1 at localhost',
! ValidID => 1,
! ChangeUserID => 1,
! );
! my $UserID2 = $Self->{UserObject}->UserAdd(
! UserFirstname => 'GeneralCatalog2',
! UserLastname => 'UnitTest',
! UserLogin => 'UnitTest-GeneralCatalog-2' . int( rand(1_000_000) ),
! UserEmail => 'UnitTest-GeneralCatalog-2 at localhost',
! ValidID => 1,
! ChangeUserID => 1,
! );
! # restore original email check param
! $Self->{ConfigObject}->Set(
! Key => 'CheckEmailAddresses',
! Value => $CheckEmailAddressesOrg,
! );
! # create some random numbers for the classes
! my $ClassRand1 = int( rand(1_000_000) );
! my $ClassRand2 = int( rand(1_000_000) );
! my $ClassRand3 = int( rand(1_000_000) );
my $ItemData = [
--- 22,73 ----
$Self->{UserObject} = Kernel::System::User->new( %{$Self} );
! # ------------------------------------------------------------ #
! # make preparations
! # ------------------------------------------------------------ #
! # create needed users
! my @UserIDs;
! {
! # disable email checks to create new user
! my $CheckEmailAddressesOrg = $Self->{ConfigObject}->Get('CheckEmailAddresses') || 1;
! $Self->{ConfigObject}->Set(
! Key => 'CheckEmailAddresses',
! Value => 0,
! );
! for my $Counter ( 1 .. 2 ) {
!
! # create new users for the tests
! my $UserID = $Self->{UserObject}->UserAdd(
! UserFirstname => 'GeneralCatalog' . $Counter,
! UserLastname => 'UnitTest',
! UserLogin => 'UnitTest-GeneralCatalog-' . $Counter . int rand 1_000_000,
! UserEmail => 'UnitTest-GeneralCatalog-' . $Counter . '@localhost',
! ValidID => 1,
! ChangeUserID => 1,
! );
!
! push @UserIDs, $UserID;
! }
!
! # restore original email check param
! $Self->{ConfigObject}->Set(
! Key => 'CheckEmailAddresses',
! Value => $CheckEmailAddressesOrg,
! );
! }
!
! # create needed random classes
! my @ClassRand;
!
! for my $Counter ( 1 .. 3 ) {
!
! push @ClassRand, int rand 1_000_000;
! }
!
! # ------------------------------------------------------------ #
! # define general tests
! # ------------------------------------------------------------ #
my $ItemData = [
***************
*** 72,76 ****
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand1,
ValidID => 1,
UserID => 1,
--- 85,89 ----
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand[0],
ValidID => 1,
UserID => 1,
***************
*** 81,85 ****
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand1,
Name => 'TestItem2',
UserID => 1,
--- 94,98 ----
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand[0],
Name => 'TestItem2',
UserID => 1,
***************
*** 90,94 ****
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand1,
Name => 'TestItem3',
ValidID => 1,
--- 103,107 ----
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand[0],
Name => 'TestItem3',
ValidID => 1,
***************
*** 99,103 ****
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand1,
Name => 'TestItem4',
ValidID => 1,
--- 112,116 ----
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand[0],
Name => 'TestItem4',
ValidID => 1,
***************
*** 105,109 ****
},
AddGet => {
! Class => 'UnitTest::TestClass' . $ClassRand1,
Name => 'TestItem4',
Functionality => '',
--- 118,122 ----
},
AddGet => {
! Class => 'UnitTest::TestClass' . $ClassRand[0],
Name => 'TestItem4',
Functionality => '',
***************
*** 118,122 ****
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand1,
Name => 'TestItem4',
ValidID => 1,
--- 131,135 ----
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand[0],
Name => 'TestItem4',
ValidID => 1,
***************
*** 130,135 ****
Name => 'TestItem4UPDATE1',
Functionality => 'Test',
! ValidID => $UserID1,
! UserID => $UserID1,
},
},
--- 143,148 ----
Name => 'TestItem4UPDATE1',
Functionality => 'Test',
! ValidID => $UserIDs[0],
! UserID => $UserIDs[0],
},
},
***************
*** 138,142 ****
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand1,
Name => 'TestItem5',
Functionality => 'Test1',
--- 151,155 ----
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand[0],
Name => 'TestItem5',
Functionality => 'Test1',
***************
*** 145,149 ****
},
AddGet => {
! Class => 'UnitTest::TestClass' . $ClassRand1,
Name => 'TestItem5',
Functionality => 'Test1',
--- 158,162 ----
},
AddGet => {
! Class => 'UnitTest::TestClass' . $ClassRand[0],
Name => 'TestItem5',
Functionality => 'Test1',
***************
*** 158,163 ****
{
Update => {
! ValidID => $UserID1,
! UserID => $UserID1,
},
},
--- 171,176 ----
{
Update => {
! ValidID => $UserIDs[0],
! UserID => $UserIDs[0],
},
},
***************
*** 167,171 ****
Update => {
Name => 'TestItem5UPDATE1',
! UserID => $UserID1,
},
},
--- 180,184 ----
Update => {
Name => 'TestItem5UPDATE1',
! UserID => $UserIDs[0],
},
},
***************
*** 175,179 ****
Update => {
Functionality => 'Test1',
! ValidID => $UserID1,
},
},
--- 188,192 ----
Update => {
Functionality => 'Test1',
! ValidID => $UserIDs[0],
},
},
***************
*** 183,188 ****
Update => {
Name => 'TestItem5',
! ValidID => $UserID1,
! UserID => $UserID1,
},
},
--- 196,201 ----
Update => {
Name => 'TestItem5',
! ValidID => $UserIDs[0],
! UserID => $UserIDs[0],
},
},
***************
*** 193,198 ****
Name => 'TestItem5',
Functionality => 'Test2',
! ValidID => $UserID1,
! UserID => $UserID1,
},
},
--- 206,211 ----
Name => 'TestItem5',
Functionality => 'Test2',
! ValidID => $UserIDs[0],
! UserID => $UserIDs[0],
},
},
***************
*** 203,216 ****
Name => 'TestItem5UPDATE2',
Functionality => 'Test1',
! ValidID => $UserID1,
! UserID => $UserID1,
},
UpdateGet => {
Name => 'TestItem5UPDATE2',
Functionality => 'Test1',
! ValidID => $UserID1,
Comment => '',
CreateBy => 1,
! ChangeBy => $UserID1,
},
},
--- 216,229 ----
Name => 'TestItem5UPDATE2',
Functionality => 'Test1',
! ValidID => $UserIDs[0],
! UserID => $UserIDs[0],
},
UpdateGet => {
Name => 'TestItem5UPDATE2',
Functionality => 'Test1',
! ValidID => $UserIDs[0],
Comment => '',
CreateBy => 1,
! ChangeBy => $UserIDs[0],
},
},
***************
*** 237,241 ****
{
Add => {
! Class => " \t \n \r Unit Test :: Test Class \t \n \r " . $ClassRand1,
Name => " \t \n \r Test Item \t \n \r ",
Functionality => " \t \n \r Test Functionality \t \n \r ",
--- 250,254 ----
{
Add => {
! Class => " \t \n \r Unit Test :: Test Class \t \n \r " . $ClassRand[0],
Name => " \t \n \r Test Item \t \n \r ",
Functionality => " \t \n \r Test Functionality \t \n \r ",
***************
*** 245,249 ****
},
AddGet => {
! Class => 'UnitTest::TestClass' . $ClassRand1,
Name => 'Test Item',
Functionality => 'TestFunctionality',
--- 258,262 ----
},
AddGet => {
! Class => 'UnitTest::TestClass' . $ClassRand[0],
Name => 'Test Item',
Functionality => 'TestFunctionality',
***************
*** 260,274 ****
Name => " \t \n \r Test Item UPDATE1 \t \n \r ",
Functionality => " \t \n \r Test Func tiona lity \t \n \r ",
! ValidID => $UserID1,
Comment => " \t \n \r Test Comment UPDATE1 \t \n \r ",
! UserID => $UserID1,
},
UpdateGet => {
Name => 'Test Item UPDATE1',
Functionality => 'TestFunctionality',
! ValidID => $UserID1,
Comment => 'Test Comment UPDATE1',
CreateBy => 1,
! ChangeBy => $UserID1,
},
},
--- 273,287 ----
Name => " \t \n \r Test Item UPDATE1 \t \n \r ",
Functionality => " \t \n \r Test Func tiona lity \t \n \r ",
! ValidID => $UserIDs[0],
Comment => " \t \n \r Test Comment UPDATE1 \t \n \r ",
! UserID => $UserIDs[0],
},
UpdateGet => {
Name => 'Test Item UPDATE1',
Functionality => 'TestFunctionality',
! ValidID => $UserIDs[0],
Comment => 'Test Comment UPDATE1',
CreateBy => 1,
! ChangeBy => $UserIDs[0],
},
},
***************
*** 277,281 ****
{
Add => {
! Class => 'UnitTest::TestClass©' . $ClassRand2,
Name => ' Ï’ Ï¡ Test Item Æ© Ïž ',
Functionality => ' Ñ Ñ¤ TestFunctionality Ï Î© ',
--- 290,294 ----
{
Add => {
! Class => 'UnitTest::TestClass©' . $ClassRand[1],
Name => ' Ï’ Ï¡ Test Item Æ© Ïž ',
Functionality => ' Ñ Ñ¤ TestFunctionality Ï Î© ',
***************
*** 285,289 ****
},
AddGet => {
! Class => 'UnitTest::TestClass©' . $ClassRand2,
Name => 'Ï’ Ï¡ Test Item Æ© Ïž',
Functionality => 'Ñ Ñ¤TestFunctionalityÏ Î©',
--- 298,302 ----
},
AddGet => {
! Class => 'UnitTest::TestClass©' . $ClassRand[1],
Name => 'Ï’ Ï¡ Test Item Æ© Ïž',
Functionality => 'Ñ Ñ¤TestFunctionalityÏ Î©',
***************
*** 300,314 ****
Name => 'Test Item Ʃ ɤ UPDATE1',
Functionality => ' Ñ Ñ¤ TestFunctionality Ï Î© ',
! ValidID => $UserID2,
Comment => ' Test Comment Ñ™ Ñ’ UPDATE1 ',
! UserID => $UserID2,
},
UpdateGet => {
Name => 'Test Item Ʃ ɤ UPDATE1',
Functionality => 'Ñ Ñ¤TestFunctionalityÏ Î©',
! ValidID => $UserID2,
Comment => 'Test Comment Ñ™ Ñ’ UPDATE1',
CreateBy => 1,
! ChangeBy => $UserID2,
},
},
--- 313,327 ----
Name => 'Test Item Ʃ ɤ UPDATE1',
Functionality => ' Ñ Ñ¤ TestFunctionality Ï Î© ',
! ValidID => $UserIDs[1],
Comment => ' Test Comment Ñ™ Ñ’ UPDATE1 ',
! UserID => $UserIDs[1],
},
UpdateGet => {
Name => 'Test Item Ʃ ɤ UPDATE1',
Functionality => 'Ñ Ñ¤TestFunctionalityÏ Î©',
! ValidID => $UserIDs[1],
Comment => 'Test Comment Ñ™ Ñ’ UPDATE1',
CreateBy => 1,
! ChangeBy => $UserIDs[1],
},
},
***************
*** 317,321 ****
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand1,
Name => 'TestItem6',
Functionality => 'Test1',
--- 330,334 ----
{
Add => {
! Class => 'UnitTest::TestClass' . $ClassRand[0],
Name => 'TestItem6',
Functionality => 'Test1',
***************
*** 324,328 ****
},
AddGet => {
! Class => 'UnitTest::TestClass' . $ClassRand1,
Name => 'TestItem6',
Functionality => 'Test1',
--- 337,341 ----
},
AddGet => {
! Class => 'UnitTest::TestClass' . $ClassRand[0],
Name => 'TestItem6',
Functionality => 'Test1',
***************
*** 355,359 ****
{
Add => {
! Class => 'UnitTest::TestClass[test]%*\\' . $ClassRand2,
Name => ' [test]%*\\ Test Item [test]%*\\ ',
Functionality => ' [test]%*\\ TestFunctionality [test]%*\\ ',
--- 368,372 ----
{
Add => {
! Class => 'UnitTest::TestClass[test]%*\\' . $ClassRand[1],
Name => ' [test]%*\\ Test Item [test]%*\\ ',
Functionality => ' [test]%*\\ TestFunctionality [test]%*\\ ',
***************
*** 363,367 ****
},
AddGet => {
! Class => 'UnitTest::TestClass[test]%*\\' . $ClassRand2,
Name => '[test]%*\\ Test Item [test]%*\\',
Functionality => '[test]%*\\TestFunctionality[test]%*\\',
--- 376,380 ----
},
AddGet => {
! Class => 'UnitTest::TestClass[test]%*\\' . $ClassRand[1],
Name => '[test]%*\\ Test Item [test]%*\\',
Functionality => '[test]%*\\TestFunctionality[test]%*\\',
***************
*** 378,396 ****
Name => ' [test]%*\\ Test Item UPDATE1 [test]%*\\ ',
Functionality => ' [test]%*\\ TestFunctionality [test]%*\\ ',
! ValidID => $UserID2,
Comment => ' [test]%*\\ Test Comment UPDATE1 [test]%*\\ ',
! UserID => $UserID2,
},
UpdateGet => {
Name => '[test]%*\\ Test Item UPDATE1 [test]%*\\',
Functionality => '[test]%*\\TestFunctionality[test]%*\\',
! ValidID => $UserID2,
Comment => '[test]%*\\ Test Comment UPDATE1 [test]%*\\',
CreateBy => 1,
! ChangeBy => $UserID2,
},
},
];
my $TestCount = 1;
my $LastAddedItemID;
--- 391,413 ----
Name => ' [test]%*\\ Test Item UPDATE1 [test]%*\\ ',
Functionality => ' [test]%*\\ TestFunctionality [test]%*\\ ',
! ValidID => $UserIDs[1],
Comment => ' [test]%*\\ Test Comment UPDATE1 [test]%*\\ ',
! UserID => $UserIDs[1],
},
UpdateGet => {
Name => '[test]%*\\ Test Item UPDATE1 [test]%*\\',
Functionality => '[test]%*\\TestFunctionality[test]%*\\',
! ValidID => $UserIDs[1],
Comment => '[test]%*\\ Test Comment UPDATE1 [test]%*\\',
CreateBy => 1,
! ChangeBy => $UserIDs[1],
},
},
];
+ # ------------------------------------------------------------ #
+ # run general tests
+ # ------------------------------------------------------------ #
+
my $TestCount = 1;
my $LastAddedItemID;
***************
*** 495,498 ****
--- 512,519 ----
}
+ # ------------------------------------------------------------ #
+ # make preparations for later tests
+ # ------------------------------------------------------------ #
+
# create needed arrays
my %ExistingClassesTmp;
***************
*** 514,518 ****
--- 535,542 ----
my @NonExistingClasses = ( 'UnitTest::NoExistingClass1', 'UnitTest::NoExistingClass2' );
+ # ------------------------------------------------------------ #
# ClassList test 1
+ # ------------------------------------------------------------ #
+
my $ClassList1 = $Self->{GeneralCatalogObject}->ClassList();
***************
*** 533,537 ****
--- 557,564 ----
}
+ # ------------------------------------------------------------ #
# ItemList test 1
+ # ------------------------------------------------------------ #
+
for my $Class (@NonExistingClasses) {
***************
*** 549,553 ****
--- 576,583 ----
}
+ # ------------------------------------------------------------ #
# ItemList test 2
+ # ------------------------------------------------------------ #
+
for my $Class (@ExistingClasses) {
***************
*** 571,575 ****
--- 601,608 ----
}
+ # ------------------------------------------------------------ #
# FunctionalityList test 1
+ # ------------------------------------------------------------ #
+
my %FunctionalityList1;
map { $FunctionalityList1{$_} = 1 } @ExistingFunctionalities;
***************
*** 600,604 ****
--- 633,640 ----
$TestCount++;
+ # ------------------------------------------------------------ #
# ClassRename test 1 (check normal rename)
+ # ------------------------------------------------------------ #
+
CLASS:
for my $Class (@ExistingClasses) {
***************
*** 662,666 ****
--- 698,705 ----
}
+ # ------------------------------------------------------------ #
# ClassRename test 2 (check string cleaner function)
+ # ------------------------------------------------------------ #
+
CLASS:
for my $Class (@ExistingClasses) {
***************
*** 724,728 ****
--- 763,770 ----
}
+ # ------------------------------------------------------------ #
# ClassRename test 2 (identical name test)
+ # ------------------------------------------------------------ #
+
for my $Class (@ExistingClasses) {
***************
*** 740,746 ****
}
# ClassRename test 3 (new class name already exists)
$Self->{GeneralCatalogObject}->ItemAdd(
! Class => 'UnitTest::TestClass' . $ClassRand3,
Name => 'Dummy',
Functionality => '',
--- 782,791 ----
}
+ # ------------------------------------------------------------ #
# ClassRename test 3 (new class name already exists)
+ # ------------------------------------------------------------ #
+
$Self->{GeneralCatalogObject}->ItemAdd(
! Class => 'UnitTest::TestClass' . $ClassRand[2],
Name => 'Dummy',
Functionality => '',
***************
*** 753,757 ****
my $Success = $Self->{GeneralCatalogObject}->ClassRename(
ClassOld => $Class . 'RENAME2',
! ClassNew => 'UnitTest::TestClass' . $ClassRand3,
);
--- 798,802 ----
my $Success = $Self->{GeneralCatalogObject}->ClassRename(
ClassOld => $Class . 'RENAME2',
! ClassNew => 'UnitTest::TestClass' . $ClassRand[2],
);
***************
*** 764,778 ****
}
! # clean the general catalog table
! $Self->{DBObject}->Do(
! SQL => "DELETE FROM general_catalog WHERE general_catalog_class LIKE 'UnitTest%'",
! );
!
! # clean the system user table
! my $UserTable = $Self->{ConfigObject}->Get('DatabaseUserTable') || 'system_user';
!
! $Self->{DBObject}->Do(
! SQL => "DELETE FROM $UserTable WHERE login LIKE 'UnitTest-GeneralCatalog-%'",
! );
!
! 1;
--- 809,811 ----
}
! 1;
\ No newline at end of file
More information about the cvs-log
mailing list