[otrs-cvs] ITSMChangeManagement/scripts/test ITSMChange.t, 1.195.4.1, 1.195.4.2 ITSMCondition.t, 1.61, 1.61.6.1 ITSMTemplate.t, 1.9, 1.9.6.1
"CVS commits notifications of OTRS.org" <[email protected]> Fri, 28 Jun 2013 14:39:57 +0000
| Newsgroups | gmane.comp.otrs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Comments:
Update of /home/cvs/ITSMChangeManagement/scripts/test
In directory lancelot:/tmp/cvs-serv9423/scripts/test
Modified Files:
Tag: rel-3_2
ITSMChange.t ITSMCondition.t ITSMTemplate.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.4.1
retrieving revision 1.195.4.2
diff -2 -u -d -r1.195.4.1 -r1.195.4.2
--- ITSMChange.t 28 Jun 2013 13:03:52 -0000 1.195.4.1
+++ ITSMChange.t 28 Jun 2013 14:39:52 -0000 1.195.4.2
@@ -41,9 +41,12 @@
$Self->{ValidObject} = Kernel::System::Valid->new( %{$Self} );
$Self->{GeneralCatalogObject} = Kernel::System::GeneralCatalog->new( %{$Self} );
+$Self->{CIPAllocateObject} = Kernel::System::ITSMChange::ITSMChangeCIPAllocate->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} );
-$Self->{CIPAllocateObject} = Kernel::System::ITSMChange::ITSMChangeCIPAllocate->new( %{$Self} );
-$Self->{HistoryObject} = Kernel::System::ITSMChange::History->new( %{$Self} );
-$Self->{CacheObject} = Kernel::System::Cache->new( %{$Self} );
# test if change object was created successfully
Author: ub
Index: ITSMCondition.t
===================================================================
RCS file: /home/cvs/ITSMChangeManagement/scripts/test/ITSMCondition.t,v
retrieving revision 1.61
retrieving revision 1.61.6.1
diff -2 -u -d -r1.61 -r1.61.6.1
--- ITSMCondition.t 4 Mar 2011 12:08:07 -0000 1.61
+++ ITSMCondition.t 28 Jun 2013 14:39:52 -0000 1.61.6.1
@@ -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,
Author: ub
Index: ITSMTemplate.t
===================================================================
RCS file: /home/cvs/ITSMChangeManagement/scripts/test/ITSMTemplate.t,v
retrieving revision 1.9
retrieving revision 1.9.6.1
diff -2 -u -d -r1.9 -r1.9.6.1
--- ITSMTemplate.t 4 Mar 2011 14:27:48 -0000 1.9
+++ ITSMTemplate.t 28 Jun 2013 14:39:52 -0000 1.9.6.1
@@ -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},
---------------------------------------------------------------------
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