[otrs-cvs] ITSMChangeManagement/scripts/test ITSMChange.t, 1.195, 1.196 ITSMTemplate.t, 1.9, 1.10 ITSMCondition.t, 1.61, 1.62
"CVS commits notifications of OTRS.org" <[email protected]> Fri, 28 Jun 2013 14:39:21 +0000
| Newsgroups | gmane.comp.otrs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Comments:
Update of /home/cvs/ITSMChangeManagement/scripts/test
In directory lancelot:/tmp/cvs-serv9207/scripts/test
Modified Files:
ITSMChange.t ITSMTemplate.t ITSMCondition.t
Log Message:
Create some objects as local variables to prevent error messages about missing LogObject during event transaction mode in object destruction.
Author: ub
Index: ITSMChange.t
===================================================================
RCS file: /home/cvs/ITSMChangeManagement/scripts/test/ITSMChange.t,v
retrieving revision 1.195
retrieving revision 1.196
diff -2 -u -d -r1.195 -r1.196
--- ITSMChange.t 14 Nov 2012 14:07:29 -0000 1.195
+++ ITSMChange.t 28 Jun 2013 14:39:16 -0000 1.196
@@ -1,5 +1,5 @@
# --
# ITSMChange.t - change tests
-# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
# --
# $Id$
@@ -41,17 +41,20 @@
$Self->{ValidObject} = Kernel::System::Valid->new( %{$Self} );
$Self->{GeneralCatalogObject} = Kernel::System::GeneralCatalog->new( %{$Self} );
-$Self->{ChangeObject} = Kernel::System::ITSMChange->new( %{$Self} );
$Self->{CIPAllocateObject} = Kernel::System::ITSMChange::ITSMChangeCIPAllocate->new( %{$Self} );
-$Self->{WorkOrderObject} = Kernel::System::ITSMChange::ITSMWorkOrder->new( %{$Self} );
$Self->{HistoryObject} = Kernel::System::ITSMChange::History->new( %{$Self} );
$Self->{CacheObject} = Kernel::System::Cache->new( %{$Self} );
+# create change and workorder objects as local variables to prevent error messages
+# about missing LogObject during event transaction mode in object destruction.
+my $WorkOrderObject = Kernel::System::ITSMChange::ITSMWorkOrder->new( %{$Self} );
+my $ChangeObject = Kernel::System::ITSMChange->new( %{$Self} );
+
# test if change object was created successfully
$Self->True(
- $Self->{ChangeObject},
+ $ChangeObject,
"Test " . $TestCount++ . ' - construction of change object',
);
$Self->Is(
- ref $Self->{ChangeObject},
+ ref $ChangeObject,
'Kernel::System::ITSMChange',
"Test " . $TestCount++ . ' - class of change object',
@@ -185,5 +188,5 @@
for my $ObjectMethod (@ObjectMethods) {
$Self->True(
- $Self->{ChangeObject}->can($ObjectMethod),
+ $ChangeObject->can($ObjectMethod),
"Test " . $TestCount++ . " - check 'can $ObjectMethod'",
);
@@ -234,5 +237,5 @@
# look up the state name
- my $LookedUpStateID = $Self->{ChangeObject}->ChangeStateLookup(
+ my $LookedUpStateID = $ChangeObject->ChangeStateLookup(
ChangeState => $State,
);
@@ -245,5 +248,5 @@
# do the reverse lookup
- my $LookedUpState = $Self->{ChangeObject}->ChangeStateLookup(
+ my $LookedUpState = $ChangeObject->ChangeStateLookup(
ChangeStateID => $LookedUpStateID,
);
@@ -257,5 +260,5 @@
# now some param checks for ChangeStateLookup
-my $LookupOk = $Self->{ChangeObject}->ChangeStateLookup();
+my $LookupOk = $ChangeObject->ChangeStateLookup();
$Self->False(
@@ -264,5 +267,5 @@
);
-$LookupOk = $Self->{ChangeObject}->ChangeStateLookup(
+$LookupOk = $ChangeObject->ChangeStateLookup(
ChangeState => 'approved',
ChangeStateID => 2,
@@ -274,5 +277,5 @@
);
-$LookupOk = $Self->{ChangeObject}->ChangeStateLookup(
+$LookupOk = $ChangeObject->ChangeStateLookup(
State => 'approved',
);
@@ -283,5 +286,5 @@
);
-$LookupOk = $Self->{ChangeObject}->ChangeStateLookup(
+$LookupOk = $ChangeObject->ChangeStateLookup(
StateID => 2,
);
@@ -406,5 +409,5 @@
);
- my $CategoryID = $Self->{ChangeObject}->ChangeCIPLookup(
+ my $CategoryID = $ChangeObject->ChangeCIPLookup(
Type => 'Category',
CIP => $CIPValue,
@@ -421,5 +424,5 @@
);
- my $ImpactID = $Self->{ChangeObject}->ChangeCIPLookup(
+ my $ImpactID = $ChangeObject->ChangeCIPLookup(
Type => 'Impact',
CIP => $CIPValue,
@@ -436,5 +439,5 @@
);
- my $PriorityID = $Self->{ChangeObject}->ChangeCIPLookup(
+ my $PriorityID = $ChangeObject->ChangeCIPLookup(
Type => 'Priority',
CIP => $CIPValue,
@@ -2499,5 +2502,5 @@
# add the change
- $ChangeID = $Self->{ChangeObject}->ChangeAdd(
+ $ChangeID = $ChangeObject->ChangeAdd(
%{ $SourceData->{ChangeAdd} }
);
@@ -2559,5 +2562,5 @@
# update the change
- my $ChangeUpdateSuccess = $Self->{ChangeObject}->ChangeUpdate(
+ my $ChangeUpdateSuccess = $ChangeObject->ChangeUpdate(
ChangeID => $ChangeID,
%{ $SourceData->{ChangeUpdate} },
@@ -2591,5 +2594,5 @@
if ( $SourceData->{ChangeCABUpdate} && $ChangeID ) {
- my $CABUpdateSuccess = $Self->{ChangeObject}->ChangeCABUpdate(
+ my $CABUpdateSuccess = $ChangeObject->ChangeCABUpdate(
%{ $SourceData->{ChangeCABUpdate} },
ChangeID => $ChangeID,
@@ -2622,5 +2625,5 @@
# test void context
$Self->False(
- $Self->{ChangeObject}->ChangeCABDelete() || 0,
+ $ChangeObject->ChangeCABDelete() || 0,
"Test $TestCount: |- ChangeCABDelete",
);
@@ -2632,5 +2635,5 @@
for my $FailTest (@DeleteTests) {
$Self->False(
- $Self->{ChangeObject}->ChangeCABDelete( %{$FailTest} ) || 0,
+ $ChangeObject->ChangeCABDelete( %{$FailTest} ) || 0,
"Test $TestCount: |- ChangeCABDelete",
);
@@ -2641,5 +2644,5 @@
# Delete with all params
$Self->True(
- $Self->{ChangeObject}->ChangeCABDelete(%CABDeleteParams),
+ $ChangeObject->ChangeCABDelete(%CABDeleteParams),
"Test $TestCount: |- ChangeCABDelete",
);
@@ -2649,5 +2652,5 @@
# add a workorder
if ( $SourceData->{WorkOrderAdd} ) {
- my $WorkOrderID = $Self->{WorkOrderObject}->WorkOrderAdd(
+ my $WorkOrderID = $WorkOrderObject->WorkOrderAdd(
%{ $SourceData->{WorkOrderAdd} },
ChangeID => $ChangeID,
@@ -2665,5 +2668,5 @@
my $ChangeGetReferenceData = $ReferenceData->{ChangeGet};
- my $ChangeData = $Self->{ChangeObject}->ChangeGet(
+ my $ChangeData = $ChangeObject->ChangeGet(
ChangeID => $ChangeID,
UserID => 1,
@@ -2718,5 +2721,5 @@
if ( $ReferenceData->{ChangeCABGet} ) {
- my $CABData = $Self->{ChangeObject}->ChangeCABGet(
+ my $CABData = $ChangeObject->ChangeCABGet(
%{ $ReferenceData->{ChangeCABGet} },
UserID => 1,
@@ -2807,5 +2810,5 @@
# add a new change with CABCustomer $CustomerUserIDs[2]
- my $ChangeID = $Self->{ChangeObject}->ChangeAdd(
+ my $ChangeID = $ChangeObject->ChangeAdd(
ChangeTitle => 'ABC',
Description => 'DEF',
@@ -2828,5 +2831,5 @@
# search for the change ids
- my $ChangeIDs = $Self->{ChangeObject}->ChangeSearch(
+ my $ChangeIDs = $ChangeObject->ChangeSearch(
CABCustomers => [ $CustomerUserIDs[2] ],
OrderByDirection => ['Up'],
@@ -2861,5 +2864,5 @@
# delete the Change
- my $DeleteSuccess = $Self->{ChangeObject}->ChangeDelete(
+ my $DeleteSuccess = $ChangeObject->ChangeDelete(
ChangeID => $ChangeID,
UserID => 1,
@@ -2884,10 +2887,10 @@
if ($ChangeLookupTestChangeID) {
- my $ChangeData = $Self->{ChangeObject}->ChangeGet(
+ my $ChangeData = $ChangeObject->ChangeGet(
ChangeID => $ChangeLookupTestChangeID,
UserID => 1,
);
- my $ChangeID = $Self->{ChangeObject}->ChangeLookup(
+ my $ChangeID = $ChangeObject->ChangeLookup(
ChangeNumber => $ChangeData->{ChangeNumber},
);
@@ -2900,5 +2903,5 @@
);
- my $ChangeNumber = $Self->{ChangeObject}->ChangeLookup(
+ my $ChangeNumber = $ChangeObject->ChangeLookup(
ChangeID => $ChangeLookupTestChangeID,
);
@@ -2913,5 +2916,5 @@
# now some param checks for ChangeLookup()
- my $LookupOk = $Self->{ChangeObject}->ChangeLookup( UserID => 1 );
+ my $LookupOk = $ChangeObject->ChangeLookup( UserID => 1 );
$Self->False(
@@ -2920,5 +2923,5 @@
);
- $LookupOk = $Self->{ChangeObject}->ChangeLookup();
+ $LookupOk = $ChangeObject->ChangeLookup();
$Self->False(
@@ -2927,5 +2930,5 @@
);
- $LookupOk = $Self->{ChangeObject}->ChangeLookup(
+ $LookupOk = $ChangeObject->ChangeLookup(
ChangeID => $ChangeLookupTestChangeID,
ChangeNumber => $ChangeData->{ChangeNumber},
@@ -2942,5 +2945,5 @@
# we cannot test for a specific number as these tests can be run in existing environments
# where other changes already exist
-my $ChangeList = $Self->{ChangeObject}->ChangeList( UserID => 1 ) || [];
+my $ChangeList = $ChangeObject->ChangeList( UserID => 1 ) || [];
my %ChangeListMap = map { $_ => 1 } @{$ChangeList};
@@ -3889,5 +3892,5 @@
if ($SearchTestChangeID) {
- my $SearchTestChange = $Self->{ChangeObject}->ChangeGet(
+ my $SearchTestChange = $ChangeObject->ChangeGet(
ChangeID => $SearchTestChangeID,
UserID => 1,
@@ -4118,5 +4121,5 @@
# get a ref to an array of found ids
- my $ChangeIDs = $Self->{ChangeObject}->ChangeSearch(
+ my $ChangeIDs = $ChangeObject->ChangeSearch(
%{ $Test->{SearchData} },
Result => 'ARRAY',
@@ -4125,5 +4128,5 @@
# get a count of found ids
- my $CountChangeIDs = $Self->{ChangeObject}->ChangeSearch(
+ my $CountChangeIDs = $ChangeObject->ChangeSearch(
%{ $Test->{SearchData} },
Result => 'COUNT',
@@ -4210,5 +4213,5 @@
for my $ChangeIDForOrderByTests (@OrderBySearchTestChangeIDs) {
- my $ChangeData = $Self->{ChangeObject}->ChangeGet(
+ my $ChangeData = $ChangeObject->ChangeGet(
ChangeID => $ChangeIDForOrderByTests,
UserID => 1,
@@ -4264,5 +4267,5 @@
my $ReferenceList = Data::Dumper::Dumper( \@SortedIDs );
- my $SearchResult = $Self->{ChangeObject}->ChangeSearch(
+ my $SearchResult = $ChangeObject->ChangeSearch(
ChangeTitle => 'OrderByChange - Title - ' . $UniqueSignature,
OrderBy => [$OrderByColumn],
@@ -4300,5 +4303,5 @@
my $ReferenceListDown = Data::Dumper::Dumper( \@SortedIDsDown );
- my $SearchResultDown = $Self->{ChangeObject}->ChangeSearch(
+ my $SearchResultDown = $ChangeObject->ChangeSearch(
ChangeTitle => 'OrderByChange - Title - ' . $UniqueSignature,
OrderBy => [$OrderByColumn],
@@ -4316,5 +4319,5 @@
# check if ITSMChange.pm handles non-existent OrderByDirection criteria correct
- my $SearchResultSideways = $Self->{ChangeObject}->ChangeSearch(
+ my $SearchResultSideways = $ChangeObject->ChangeSearch(
ChangeTitle => 'OrderByChange - Title - ' . $UniqueSignature,
OrderBy => [$OrderByColumn],
@@ -4334,5 +4337,5 @@
# check for 'OrderBy' with non-existent column
- my $SearchResultFooBarColumn = $Self->{ChangeObject}->ChangeSearch(
+ my $SearchResultFooBarColumn = $ChangeObject->ChangeSearch(
ChangeTitle => 'OrderByChange - Title - ' . $UniqueSignature,
OrderBy => ['FooBar'],
@@ -4347,5 +4350,5 @@
# check for 'OrderBy' with non-existent column
- my $SearchResultFooBarColumnDirection = $Self->{ChangeObject}->ChangeSearch(
+ my $SearchResultFooBarColumnDirection = $ChangeObject->ChangeSearch(
ChangeTitle => 'OrderByChange - Title - ' . $UniqueSignature,
OrderBy => ['FooBar'],
@@ -4361,5 +4364,5 @@
# check for 'OrderBy' with non-existent column
- my $SearchResultFooBarDoubleColumn = $Self->{ChangeObject}->ChangeSearch(
+ my $SearchResultFooBarDoubleColumn = $ChangeObject->ChangeSearch(
ChangeTitle => 'OrderByChange - Title - ' . $UniqueSignature,
OrderBy => [ 'ChangeID', 'ChangeID' ],
@@ -4384,5 +4387,5 @@
my @ChangesForSecondOrderByTests;
for my $ChangeIDForSecondOrderByTests (@OrderBySearchTestChangeIDs) {
- my $ChangeData = $Self->{ChangeObject}->ChangeGet(
+ my $ChangeData = $ChangeObject->ChangeGet(
ChangeID => $ChangeIDForSecondOrderByTests,
UserID => 1,
@@ -4409,5 +4412,5 @@
local $Data::Dumper::Useqq = 1;
- my $SearchResult = $Self->{ChangeObject}->ChangeSearch(
+ my $SearchResult = $ChangeObject->ChangeSearch(
ChangeTitle => 'OrderByChange - Title - ' . $UniqueSignature,
OrderBy => [ 'CreateTime', 'ChangeID' ],
@@ -4862,5 +4865,5 @@
if ( $SourceData->{ChangeAdd} ) {
- $ChangeID = $Self->{ChangeObject}->ChangeAdd(
+ $ChangeID = $ChangeObject->ChangeAdd(
%{ $SourceData->{ChangeAdd} },
);
@@ -4878,5 +4881,5 @@
if ( $SourceData->{WorkOrderAdd} ) {
- $WorkOrderID = $Self->{WorkOrderObject}->WorkOrderAdd(
+ $WorkOrderID = $WorkOrderObject->WorkOrderAdd(
%{ $SourceData->{WorkOrderAdd} },
ChangeID => $ChangeID,
@@ -4893,5 +4896,5 @@
my $SearchResult;
if ( $SourceData->{ChangeSearch} ) {
- $SearchResult = $Self->{ChangeObject}->ChangeSearch(
+ $SearchResult = $ChangeObject->ChangeSearch(
%{ $SourceData->{ChangeSearch} },
);
@@ -4950,5 +4953,5 @@
for my $ChangeIDForOrderByCIPTests (@OrderByCIPChangeIDs) {
- my $ChangeData = $Self->{ChangeObject}->ChangeGet(
+ my $ChangeData = $ChangeObject->ChangeGet(
ChangeID => $ChangeIDForOrderByCIPTests,
UserID => 1,
@@ -4981,5 +4984,5 @@
my $ReferenceList = Data::Dumper::Dumper( \@SortedIDs );
- my $SearchResult = $Self->{ChangeObject}->ChangeSearch(
+ my $SearchResult = $ChangeObject->ChangeSearch(
ChangeTitle => '%CIP%' . $UniqueSignature,
OrderBy => [$CIPColumn],
@@ -5008,5 +5011,5 @@
my $ReferenceListDown = Data::Dumper::Dumper( \@SortedIDsDown );
- my $SearchResultDown = $Self->{ChangeObject}->ChangeSearch(
+ my $SearchResultDown = $ChangeObject->ChangeSearch(
ChangeTitle => '%CIP%' . $UniqueSignature,
OrderBy => [$CIPColumn],
@@ -5024,5 +5027,5 @@
# check if ITSMChange.pm handles non-existent OrderByDirection criteria correct
- my $SearchResultSideways = $Self->{ChangeObject}->ChangeSearch(
+ my $SearchResultSideways = $ChangeObject->ChangeSearch(
ChangeTitle => '%CIP%' . $UniqueSignature,
OrderBy => [$CIPColumn],
@@ -5177,5 +5180,5 @@
if ( $SourceData->{ChangeAdd} ) {
- $ChangeID = $Self->{ChangeObject}->ChangeAdd(
+ $ChangeID = $ChangeObject->ChangeAdd(
%{ $SourceData->{ChangeAdd} },
);
@@ -5193,5 +5196,5 @@
if ( $SourceData->{WorkOrderAdd} ) {
- $WorkOrderID = $Self->{WorkOrderObject}->WorkOrderAdd(
+ $WorkOrderID = $WorkOrderObject->WorkOrderAdd(
%{ $SourceData->{WorkOrderAdd} },
ChangeID => $ChangeID,
@@ -5208,5 +5211,5 @@
my $SearchResult;
if ( $SourceData->{ChangeSearch} ) {
- $SearchResult = $Self->{ChangeObject}->ChangeSearch(
+ $SearchResult = $ChangeObject->ChangeSearch(
%{ $SourceData->{ChangeSearch} },
);
@@ -5258,5 +5261,5 @@
# each of the changes should have one workorder
for my $ChangeID (@WOSTChangeIDs) {
- my $ChangeData = $Self->{ChangeObject}->ChangeGet(
+ my $ChangeData = $ChangeObject->ChangeGet(
ChangeID => $ChangeID,
UserID => 1,
@@ -5362,5 +5365,5 @@
if ( $SourceData->{ChangeAdd} ) {
- $ChangeID = $Self->{ChangeObject}->ChangeAdd(
+ $ChangeID = $ChangeObject->ChangeAdd(
%{ $SourceData->{ChangeAdd} },
);
@@ -5379,5 +5382,5 @@
if ( $SourceData->{WorkOrderAdd} ) {
- $WorkOrderID = $Self->{WorkOrderObject}->WorkOrderAdd(
+ $WorkOrderID = $WorkOrderObject->WorkOrderAdd(
%{ $SourceData->{WorkOrderAdd} },
ChangeID => $ChangeID,
@@ -5394,5 +5397,5 @@
my $SearchResult;
if ( $SourceData->{ChangeSearch} ) {
- $SearchResult = $Self->{ChangeObject}->ChangeSearch(
+ $SearchResult = $ChangeObject->ChangeSearch(
%{ $SourceData->{ChangeSearch} },
);
@@ -5432,5 +5435,5 @@
# each of the changes should have one workorder
for my $ChangeID (@WOStateTestChangeIDs) {
- my $ChangeData = $Self->{ChangeObject}->ChangeGet(
+ my $ChangeData = $ChangeObject->ChangeGet(
ChangeID => $ChangeID,
UserID => 1,
@@ -5717,6 +5720,6 @@
my $Privs = $ReferenceData->{Permissions}->{$UserIndex};
for my $Type ( keys %{$Privs} ) {
- $Self->{ChangeObject}->{Debug} = 10;
- my $Access = $Self->{ChangeObject}->Permission(
+ $ChangeObject->{Debug} = 10;
+ my $Access = $ChangeObject->Permission(
Type => $Type,
ChangeID => $PermissionTestChangeID,
@@ -5752,5 +5755,5 @@
# When no ChangeID is given ChangePossibleStatesGet() returns a list of all states.
-my $PossibleStates = $Self->{ChangeObject}->ChangePossibleStatesGet(
+my $PossibleStates = $ChangeObject->ChangePossibleStatesGet(
# ChangeID => $PossibleStatesTestChangeID,
@@ -5826,10 +5829,10 @@
# Create a change object...
-my $ChangeIDForChangePossibleStateGet = $Self->{ChangeObject}->ChangeAdd(
+my $ChangeIDForChangePossibleStateGet = $ChangeObject->ChangeAdd(
UserID => 1,
);
# Get posssible states...
-my $PossibleStatesUsingChangeID = $Self->{ChangeObject}->ChangePossibleStatesGet(
+my $PossibleStatesUsingChangeID = $ChangeObject->ChangePossibleStatesGet(
ChangeID => $ChangeIDForChangePossibleStateGet,
UserID => 1,
@@ -5846,5 +5849,5 @@
# Change the state
-my $ChangeUpdateSuccess = $Self->{ChangeObject}->ChangeUpdate(
+my $ChangeUpdateSuccess = $ChangeObject->ChangeUpdate(
ChangeID => $ChangeIDForChangePossibleStateGet,
ChangeState => 'pending approval',
@@ -5860,5 +5863,5 @@
# Get posssible states...
-$PossibleStatesUsingChangeID = $Self->{ChangeObject}->ChangePossibleStatesGet(
+$PossibleStatesUsingChangeID = $ChangeObject->ChangePossibleStatesGet(
ChangeID => $ChangeIDForChangePossibleStateGet,
UserID => 1,
@@ -5873,5 +5876,5 @@
# Change the state
-$ChangeUpdateSuccess = $Self->{ChangeObject}->ChangeUpdate(
+$ChangeUpdateSuccess = $ChangeObject->ChangeUpdate(
ChangeID => $ChangeIDForChangePossibleStateGet,
ChangeState => 'approved',
@@ -5887,5 +5890,5 @@
# Get posssible states...
-$PossibleStatesUsingChangeID = $Self->{ChangeObject}->ChangePossibleStatesGet(
+$PossibleStatesUsingChangeID = $ChangeObject->ChangePossibleStatesGet(
ChangeID => $ChangeIDForChangePossibleStateGet,
UserID => 1,
@@ -5900,5 +5903,5 @@
# Change the state
-$ChangeUpdateSuccess = $Self->{ChangeObject}->ChangeUpdate(
+$ChangeUpdateSuccess = $ChangeObject->ChangeUpdate(
ChangeID => $ChangeIDForChangePossibleStateGet,
ChangeState => 'in progress',
@@ -5914,5 +5917,5 @@
# Get posssible states...
-$PossibleStatesUsingChangeID = $Self->{ChangeObject}->ChangePossibleStatesGet(
+$PossibleStatesUsingChangeID = $ChangeObject->ChangePossibleStatesGet(
ChangeID => $ChangeIDForChangePossibleStateGet,
UserID => 1,
@@ -5927,5 +5930,5 @@
# Delete the Change
-$Self->{ChangeObject}->ChangeDelete(
+$ChangeObject->ChangeDelete(
ChangeID => $ChangeIDForChangePossibleStateGet,
UserID => 1,
@@ -6043,5 +6046,5 @@
# ------------------------------------------------------------ #
-$LookupOk = $Self->{ChangeObject}->ChangeCIPLookup(
+$LookupOk = $ChangeObject->ChangeCIPLookup(
CIP => '1 very high',
Type => 'non-existent',
@@ -6053,5 +6056,5 @@
);
-$LookupOk = $Self->{ChangeObject}->ChangeCIPLookup(
+$LookupOk = $ChangeObject->ChangeCIPLookup(
CIP => '1 very high',
);
@@ -6062,5 +6065,5 @@
);
-$LookupOk = $Self->{ChangeObject}->ChangeCIPLookup(
+$LookupOk = $ChangeObject->ChangeCIPLookup(
Type => 'Priority',
);
@@ -6071,5 +6074,5 @@
);
-$LookupOk = $Self->{ChangeObject}->ChangeCIPLookup(
+$LookupOk = $ChangeObject->ChangeCIPLookup(
Type => 'Priority',
CIP => '1 very high',
@@ -6086,5 +6089,5 @@
# ------------------------------------------------------------ #
-my $PossibleCIPGetOk = $Self->{ChangeObject}->ChangePossibleCIPGet(
+my $PossibleCIPGetOk = $ChangeObject->ChangePossibleCIPGet(
Type => 'non-existent',
UserID => 1,
@@ -6096,5 +6099,5 @@
);
-$PossibleCIPGetOk = $Self->{ChangeObject}->ChangePossibleCIPGet(
+$PossibleCIPGetOk = $ChangeObject->ChangePossibleCIPGet(
UserID => 1,
);
@@ -6108,5 +6111,5 @@
my $PossibleCIPReference = join ', ', @CIPValues;
for my $Type (qw(Category Impact Priority)) {
- my $PossibleCIPs = $Self->{ChangeObject}->ChangePossibleCIPGet(
+ my $PossibleCIPs = $ChangeObject->ChangePossibleCIPGet(
Type => $Type,
UserID => 1,
@@ -6133,5 +6136,5 @@
# verify that initialy no attachment exists
-my @AttachmentList = $Self->{ChangeObject}->ChangeAttachmentList(
+my @AttachmentList = $ChangeObject->ChangeAttachmentList(
ChangeID => $AttachmentTestChangeID,
);
@@ -6161,5 +6164,5 @@
$FileCount++;
- my $AddOk = $Self->{ChangeObject}->ChangeAttachmentAdd(
+ my $AddOk = $ChangeObject->ChangeAttachmentAdd(
%{$TestFile},
ChangeID => $AttachmentTestChangeID,
@@ -6171,5 +6174,5 @@
);
- my @AttachmentList = $Self->{ChangeObject}->ChangeAttachmentList(
+ my @AttachmentList = $ChangeObject->ChangeAttachmentList(
ChangeID => $AttachmentTestChangeID,
UserID => 1,
@@ -6189,5 +6192,5 @@
# get the attachment
- my $Attachment = $Self->{ChangeObject}->ChangeAttachmentGet(
+ my $Attachment = $ChangeObject->ChangeAttachmentGet(
ChangeID => $AttachmentTestChangeID,
Filename => $TestFile->{Filename},
@@ -6208,5 +6211,5 @@
# check existence of attachment
- my $AttachmentExists = $Self->{ChangeObject}->ChangeAttachmentExists(
+ my $AttachmentExists = $ChangeObject->ChangeAttachmentExists(
ChangeID => $AttachmentTestChangeID,
Filename => $TestFile->{Filename},
@@ -6227,5 +6230,5 @@
$FileCount++;
- my $DeleteOk = $Self->{ChangeObject}->ChangeAttachmentDelete(
+ my $DeleteOk = $ChangeObject->ChangeAttachmentDelete(
ChangeID => $AttachmentTestChangeID,
Filename => $TestFile->{Filename},
@@ -6237,5 +6240,5 @@
);
- my @AttachmentList = $Self->{ChangeObject}->ChangeAttachmentList(
+ my @AttachmentList = $ChangeObject->ChangeAttachmentList(
ChangeID => $AttachmentTestChangeID,
UserID => 1,
@@ -6248,5 +6251,5 @@
);
- my $AttachmentExists = $Self->{ChangeObject}->ChangeAttachmentExists(
+ my $AttachmentExists = $ChangeObject->ChangeAttachmentExists(
Filename => $TestFile->{Filename},
ChangeID => $AttachmentTestChangeID,
@@ -6273,5 +6276,5 @@
# add a new test change
- my $ChangeID = $Self->{ChangeObject}->ChangeAdd(
+ my $ChangeID = $ChangeObject->ChangeAdd(
%OldValues,
UserID => 1,
@@ -6289,5 +6292,5 @@
# update the change
- my $Success = $Self->{ChangeObject}->ChangeUpdate(
+ my $Success = $ChangeObject->ChangeUpdate(
%NewValues,
ChangeID => $ChangeID,
@@ -6364,5 +6367,5 @@
for my $ChangeID ( keys %TestedChangeID ) {
- my $DeleteOk = $Self->{ChangeObject}->ChangeDelete(
+ my $DeleteOk = $ChangeObject->ChangeDelete(
ChangeID => $ChangeID,
UserID => 1,
@@ -6374,5 +6377,5 @@
# double check if change is really deleted
- my $ChangeData = $Self->{ChangeObject}->ChangeGet(
+ my $ChangeData = $ChangeObject->ChangeGet(
ChangeID => $ChangeID,
UserID => 1,
Author: ub
Index: ITSMTemplate.t
===================================================================
RCS file: /home/cvs/ITSMChangeManagement/scripts/test/ITSMTemplate.t,v
retrieving revision 1.9
retrieving revision 1.10
diff -2 -u -d -r1.9 -r1.10
--- ITSMTemplate.t 4 Mar 2011 14:27:48 -0000 1.9
+++ ITSMTemplate.t 28 Jun 2013 14:39:16 -0000 1.10
@@ -1,5 +1,5 @@
# --
# ITSMTemplate.t - change tests
-# Copyright (C) 2001-2011 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
# --
# $Id$
@@ -42,11 +42,14 @@
$Self->{UserObject} = Kernel::System::User->new( %{$Self} );
$Self->{GroupObject} = Kernel::System::Group->new( %{$Self} );
-$Self->{ChangeObject} = Kernel::System::ITSMChange->new( %{$Self} );
-$Self->{ConditionObject} = Kernel::System::ITSMChange::ITSMCondition->new( %{$Self} );
$Self->{CustomerUserObject} = Kernel::System::CustomerUser->new( %{$Self} );
-$Self->{WorkOrderObject} = Kernel::System::ITSMChange::ITSMWorkOrder->new( %{$Self} );
-$Self->{TemplateObject} = Kernel::System::ITSMChange::Template->new( %{$Self} );
$Self->{ValidObject} = Kernel::System::Valid->new( %{$Self} );
+# create some objects as local variables to prevent error messages
+# about missing LogObject during event transaction mode in object destruction.
+my $ChangeObject = Kernel::System::ITSMChange->new( %{$Self} );
+my $ConditionObject = Kernel::System::ITSMChange::ITSMCondition->new( %{$Self} );
+my $WorkOrderObject = Kernel::System::ITSMChange::ITSMWorkOrder->new( %{$Self} );
+my $TemplateObject = Kernel::System::ITSMChange::Template->new( %{$Self} );
+
# create local objects that don't clobber $Self
my $HTMLUtilsObject = Kernel::System::HTMLUtils->new( %{$Self} );
@@ -54,9 +57,9 @@
# test if change object was created successfully
$Self->True(
- $Self->{TemplateObject},
+ $TemplateObject,
"Test " . $TestCount++ . ' - construction of template object',
);
$Self->Is(
- ref $Self->{TemplateObject},
+ ref $TemplateObject,
'Kernel::System::ITSMChange::Template',
"Test " . $TestCount++ . ' - class of template object',
@@ -117,5 +120,5 @@
for my $ObjectMethod (@ObjectMethods) {
$Self->True(
- $Self->{TemplateObject}->can($ObjectMethod),
+ $TemplateObject->can($ObjectMethod),
"Test " . $TestCount++ . " - check 'can $ObjectMethod'",
);
@@ -138,5 +141,5 @@
# look up the state name
- my $LookedUpTypeID = $Self->{TemplateObject}->TemplateTypeLookup(
+ my $LookedUpTypeID = $TemplateObject->TemplateTypeLookup(
TemplateType => $Type,
);
@@ -148,5 +151,5 @@
# do the reverse lookup
- my $LookedUpType = $Self->{TemplateObject}->TemplateTypeLookup(
+ my $LookedUpType = $TemplateObject->TemplateTypeLookup(
TemplateTypeID => $LookedUpTypeID,
);
@@ -160,5 +163,5 @@
# now some param checks for ChangeStateLookup
-my $LookupOk = $Self->{TemplateObject}->TemplateTypeLookup();
+my $LookupOk = $TemplateObject->TemplateTypeLookup();
$Self->False(
@@ -167,5 +170,5 @@
);
-$LookupOk = $Self->{TemplateObject}->TemplateTypeLookup(
+$LookupOk = $TemplateObject->TemplateTypeLookup(
TemplateType => 'approved',
TemplateTypeID => 2,
@@ -177,5 +180,5 @@
);
-$LookupOk = $Self->{TemplateObject}->TemplateTypeLookup(
+$LookupOk = $TemplateObject->TemplateTypeLookup(
TemplateTypes => 'ITSMAnything',
);
@@ -269,5 +272,5 @@
for my $ChangeName ( keys %ChangeDefinitions ) {
- $CreatedChangeID{$ChangeName} = $Self->{ChangeObject}->ChangeAdd(
+ $CreatedChangeID{$ChangeName} = $ChangeObject->ChangeAdd(
%{ $ChangeDefinitions{$ChangeName} },
UserID => 1,
@@ -288,5 +291,5 @@
);
- my $Change = $Self->{ChangeObject}->ChangeGet(
+ my $Change = $ChangeObject->ChangeGet(
ChangeID => $CreatedChangeID{$ChangeName},
UserID => 1,
@@ -338,5 +341,5 @@
# add workorder
- $CreatedWorkOrderID{$WorkOrderName} = $Self->{WorkOrderObject}->WorkOrderAdd(
+ $CreatedWorkOrderID{$WorkOrderName} = $WorkOrderObject->WorkOrderAdd(
%{ $WorkOrderDefinitions{$WorkOrderName} },
UserID => 1,
@@ -346,5 +349,5 @@
# get workorder
- my $WorkOrder = $Self->{WorkOrderObject}->WorkOrderGet(
+ my $WorkOrder = $WorkOrderObject->WorkOrderGet(
WorkOrderID => $WorkOrderID,
UserID => 1,
@@ -442,5 +445,5 @@
for my $ConditionName ( keys %ConditionDefinitions ) {
my $ConditionData = $ConditionDefinitions{$ConditionName}->{ConditionAdd};
- my $ConditionID = $Self->{ConditionObject}->ConditionAdd(
+ my $ConditionID = $ConditionObject->ConditionAdd(
%{$ConditionData},
);
@@ -534,5 +537,5 @@
# create simple change template
$TemplateDefinitions{$TemplateDefinitionName}->{Content} =
- $Self->{TemplateObject}->TemplateSerialize(
+ $TemplateObject->TemplateSerialize(
%{ $TemplateDefinitions{$TemplateDefinitionName} },
TemplateType => $TemplateDefinitions{$TemplateDefinitionName}->{Type},
@@ -546,5 +549,5 @@
# add template
- $TestedTemplateID{$TemplateDefinitionName} = $Self->{TemplateObject}->TemplateAdd(
+ $TestedTemplateID{$TemplateDefinitionName} = $TemplateObject->TemplateAdd(
%{ $TemplateDefinitions{$TemplateDefinitionName} },
TemplateType => $TemplateDefinitions{$TemplateDefinitionName}->{Type},
@@ -560,5 +563,5 @@
# get created template
- my $Template = $Self->{TemplateObject}->TemplateGet(
+ my $Template = $TemplateObject->TemplateGet(
TemplateID => $TemplateID,
UserID => 1,
@@ -589,5 +592,5 @@
# deserialize template
- my $ChangeID = $Self->{TemplateObject}->TemplateDeSerialize(
+ my $ChangeID = $TemplateObject->TemplateDeSerialize(
TemplateID => $TemplateID,
UserID => 1,
@@ -601,5 +604,5 @@
# get change data
- my $Change = $Self->{ChangeObject}->ChangeGet(
+ my $Change = $ChangeObject->ChangeGet(
ChangeID => $ChangeID,
UserID => 1,
@@ -661,5 +664,5 @@
# deserialize template
- my $WorkOrderID = $Self->{TemplateObject}->TemplateDeSerialize(
+ my $WorkOrderID = $TemplateObject->TemplateDeSerialize(
TemplateID => $TemplateID,
ChangeID => $CreatedChangeID{TargetChange},
@@ -674,5 +677,5 @@
# get workorder data
- my $WorkOrder = $Self->{WorkOrderObject}->WorkOrderGet(
+ my $WorkOrder = $WorkOrderObject->WorkOrderGet(
WorkOrderID => $WorkOrderID,
UserID => 1,
@@ -723,5 +726,5 @@
# deserialize template
- my $ConditionID = $Self->{TemplateObject}->TemplateDeSerialize(
+ my $ConditionID = $TemplateObject->TemplateDeSerialize(
TemplateID => $TemplateID,
ChangeID => $CreatedChangeID{TargetChange},
@@ -750,5 +753,5 @@
# deserialize template
- my $ChangeID = $Self->{TemplateObject}->TemplateDeSerialize(
+ my $ChangeID = $TemplateObject->TemplateDeSerialize(
TemplateID => $TemplateID,
UserID => 1,
@@ -763,5 +766,5 @@
# get change data
- my $Change = $Self->{ChangeObject}->ChangeGet(
+ my $Change = $ChangeObject->ChangeGet(
ChangeID => $ChangeID,
UserID => 1,
@@ -769,5 +772,5 @@
# get original change
- my $OrigChange = $Self->{ChangeObject}->ChangeGet(
+ my $OrigChange = $ChangeObject->ChangeGet(
ChangeID => $CreatedChangeID{BaseChange},
UserID => 1,
@@ -802,5 +805,5 @@
# test TemplateList()
-my $ChangeTemplateList = $Self->{TemplateObject}->TemplateList(
+my $ChangeTemplateList = $TemplateObject->TemplateList(
TemplateType => 'ITSMChange',
UserID => 1,
@@ -826,5 +829,5 @@
} keys %TestedTemplateID;
-my $WorkOrderTemplateList = $Self->{TemplateObject}->TemplateList(
+my $WorkOrderTemplateList = $TemplateObject->TemplateList(
TemplateType => 'ITSMWorkOrder',
UserID => 1,
@@ -846,5 +849,5 @@
} keys %TestedTemplateID;
-my $ConditionTemplateList = $Self->{TemplateObject}->TemplateList(
+my $ConditionTemplateList = $TemplateObject->TemplateList(
TemplateType => 'ITSMCondition',
UserID => 1,
@@ -862,5 +865,5 @@
}
-my $CABTemplateList = $Self->{TemplateObject}->TemplateList(
+my $CABTemplateList = $TemplateObject->TemplateList(
TemplateType => 'CAB',
UserID => 1,
@@ -897,5 +900,5 @@
my $TemplateID = $TestedTemplateID{$TemplateName};
- my $DeleteOk = $Self->{TemplateObject}->TemplateDelete(
+ my $DeleteOk = $TemplateObject->TemplateDelete(
TemplateID => $TemplateID,
UserID => 1,
@@ -907,5 +910,5 @@
# double check if change is really deleted
- my $TemplateData = $Self->{TemplateObject}->TemplateGet(
+ my $TemplateData = $TemplateObject->TemplateGet(
TemplateID => $TemplateID,
UserID => 1,
@@ -923,5 +926,5 @@
# delete the test changes
for my $ChangeID ( @ChangeIDs, values %CreatedChangeID ) {
- my $DeleteOk = $Self->{ChangeObject}->ChangeDelete(
+ my $DeleteOk = $ChangeObject->ChangeDelete(
ChangeID => $ChangeID,
UserID => 1,
@@ -933,5 +936,5 @@
# double check if change is really deleted
- my $ChangeData = $Self->{ChangeObject}->ChangeGet(
+ my $ChangeData = $ChangeObject->ChangeGet(
ChangeID => $ChangeID,
UserID => 1,
@@ -981,5 +984,5 @@
# store gathered information in hash for adding
$ActionAdd{$ActionAddValue}
- = $Self->{ConditionObject}->$FieldValue(
+ = $ConditionObject->$FieldValue(
%{ $ActionData->{$ActionAddValue}->{$FieldValue} },
);
@@ -988,5 +991,5 @@
# add action
- my $ActionID = $Self->{ConditionObject}->ActionAdd(
+ my $ActionID = $ConditionObject->ActionAdd(
%ActionAdd,
ConditionID => $ConditionID,
@@ -1002,5 +1005,5 @@
# check the added action
- my $ActionGet = $Self->{ConditionObject}->ActionGet(
+ my $ActionGet = $ConditionObject->ActionGet(
ActionID => $ActionID,
UserID => $ActionAdd{UserID},
@@ -1040,5 +1043,5 @@
# ommit static field if it is not set
next STATICFIELD if !exists $ExpressionAddSourceData{$StaticField}
- || !defined $ExpressionAddSourceData{$StaticField};
+ || !defined $ExpressionAddSourceData{$StaticField};
# safe data
@@ -1057,5 +1060,5 @@
# store gathered information in hash for adding
$ExpressionAddData{$ExpressionAddValue} =
- $Self->{ConditionObject}->$FieldValue(
+ $ConditionObject->$FieldValue(
%{ $ExpressionAddSourceData{$ExpressionAddValue}->{$FieldValue} },
);
@@ -1064,5 +1067,5 @@
# add expression
- my $ExpressionID = $Self->{ConditionObject}->ExpressionAdd(
+ my $ExpressionID = $ConditionObject->ExpressionAdd(
%ExpressionAddData,
ConditionID => $ConditionID,
@@ -1077,5 +1080,5 @@
# check the added expression
- my $ExpressionGetData = $Self->{ConditionObject}->ExpressionGet(
+ my $ExpressionGetData = $ConditionObject->ExpressionGet(
ExpressionID => $ExpressionID,
UserID => $ExpressionAddData{UserID},
Author: ub
Index: ITSMCondition.t
===================================================================
RCS file: /home/cvs/ITSMChangeManagement/scripts/test/ITSMCondition.t,v
retrieving revision 1.61
retrieving revision 1.62
diff -2 -u -d -r1.61 -r1.62
--- ITSMCondition.t 4 Mar 2011 12:08:07 -0000 1.61
+++ ITSMCondition.t 28 Jun 2013 14:39:16 -0000 1.62
@@ -1,5 +1,5 @@
# --
# ITSMCondition.t - Condition tests
-# Copyright (C) 2001-2011 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
# --
# $Id$
@@ -33,11 +33,14 @@
$Self->{UserObject} = Kernel::System::User->new( %{$Self} );
$Self->{GroupObject} = Kernel::System::Group->new( %{$Self} );
-$Self->{ChangeObject} = Kernel::System::ITSMChange->new( %{$Self} );
-$Self->{WorkOrderObject} = Kernel::System::ITSMChange::ITSMWorkOrder->new( %{$Self} );
$Self->{ConditionObject} = Kernel::System::ITSMChange::ITSMCondition->new( %{$Self} );
+# create change and workorder objects as local variables to prevent error messages
+# about missing LogObject during event transaction mode in object destruction.
+my $ChangeObject = Kernel::System::ITSMChange->new( %{$Self} );
+my $WorkOrderObject = Kernel::System::ITSMChange::ITSMWorkOrder->new( %{$Self} );
+
# test if change object was created successfully
$Self->True(
- $Self->{ChangeObject},
+ $ChangeObject,
'Test ' . $TestCount++ . ' - construction of change object',
);
@@ -45,5 +48,5 @@
# test if workorder object was created successfully
$Self->True(
- $Self->{WorkOrderObject},
+ $WorkOrderObject,
'Test ' . $TestCount++ . ' - construction of workorder object',
);
@@ -126,5 +129,5 @@
for my $CreateChange ( 0 .. 9 ) {
my $ChangeTitle = 'UnitTestChange' . $CreateChange;
- my $ChangeID = $Self->{ChangeObject}->ChangeAdd(
+ my $ChangeID = $ChangeObject->ChangeAdd(
ChangeTitle => $ChangeTitle,
UserID => 1,
@@ -150,5 +153,5 @@
for my $CreateWorkOrder ( 0 .. ( ( 3 * ( scalar @ChangeIDs ) ) - 1 ) ) {
my $WorkOrderTitle = 'UnitTestWO' . $CreateWorkOrder;
- my $WorkOrderID = $Self->{WorkOrderObject}->WorkOrderAdd(
+ my $WorkOrderID = $WorkOrderObject->WorkOrderAdd(
ChangeID => $ChangeIDs[ ( $CreateWorkOrder % scalar @ChangeIDs ) ],
WorkOrderTitle => $WorkOrderTitle,
@@ -1623,5 +1626,5 @@
# ommit static field if it is not set
next STATICFIELD if !exists $ExpressionAddSourceData{$StaticField}
- || !defined $ExpressionAddSourceData{$StaticField};
+ || !defined $ExpressionAddSourceData{$StaticField};
# safe data
@@ -2155,5 +2158,5 @@
my $ObjectData;
if ( $ObjectName eq 'ITSMChange' ) {
- $ObjectData = $Self->{ChangeObject}->ChangeGet(
+ $ObjectData = $ChangeObject->ChangeGet(
ChangeID => $Action->{Selector},
UserID => 1,
@@ -2161,5 +2164,5 @@
}
elsif ( $ObjectName eq 'ITSMWorkOrder' ) {
- $ObjectData = $Self->{WorkOrderObject}->WorkOrderGet(
+ $ObjectData = $WorkOrderObject->WorkOrderGet(
WorkOrderID => $Action->{Selector},
UserID => 1,
@@ -2267,5 +2270,5 @@
for my $ChangeID (@ChangeIDs) {
$Self->True(
- $Self->{ChangeObject}->ChangeDelete(
+ $ChangeObject->ChangeDelete(
ChangeID => $ChangeID,
UserID => 1,
@@ -2275,5 +2278,5 @@
# double check if change is really deleted
- my $ChangeData = $Self->{ChangeObject}->ChangeGet(
+ my $ChangeData = $ChangeObject->ChangeGet(
ChangeID => $ChangeID,
UserID => 1,
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log