@@ -21,11 +21,10 @@ use warnings;
21
21
# core modules
22
22
23
23
# CPAN modules
24
+ use Test2::V0;
24
25
25
26
# OTOBO modules
26
- use Kernel::System::UnitTest::RegisterDriver; # Set up $Self and $Kernel::OM
27
-
28
- our $Self ;
27
+ use Kernel::System::UnitTest::RegisterDriver; # Set up $Kernel::OM
29
28
30
29
$Kernel::OM -> ObjectParamAdd(
31
30
' Kernel::System::UnitTest::Helper' => {
@@ -174,10 +173,7 @@ for my $FAQItem (@FAQItems) {
174
173
%{$FAQItem },
175
174
);
176
175
177
- $Self -> True(
178
- $FAQItemID ,
179
- " FAQAdd() successful for test - FAQItemID $FAQItemID " ,
180
- );
176
+ ok( $FAQItemID , " FAQAdd() successful for test - FAQItemID $FAQItemID " );
181
177
182
178
push @FAQItemIDs , $FAQItemID ;
183
179
}
@@ -431,41 +427,30 @@ for my $Test (@Tests) {
431
427
# check FAQKeywordArticleList attribute
432
428
if ( !$Test -> {FAQKeywordArticleList } || ref $Test -> {FAQKeywordArticleList } ne ' HASH' ) {
433
429
434
- $Self -> True(
435
- 0,
436
- " Test $TestCount : No FAQKeywordArticleList found for this test." ,
437
- );
430
+ fail(" Test $TestCount : No FAQKeywordArticleList found for this test." );
438
431
439
432
next TEST;
440
433
}
441
434
442
- # print test case description
443
- if ( $Test -> {Description } ) {
444
- $Self -> True(
445
- 1,
446
- " Test $TestCount : $Test ->{Description}" ,
447
- );
448
- }
435
+ subtest " Test $TestCount : $Test ->{Description}" => sub {
449
436
450
- my %FAQKeywordArticleList = $FAQObject -> FAQKeywordArticleList(
451
- %{ $Test -> {FAQKeywordArticleList } },
452
- );
453
-
454
- if ( $Test -> {Fails } ) {
455
- $Self -> False(
456
- %FAQKeywordArticleList ? 1 : 0,
457
- " Test $TestCount : FAQKeywordArticleList() - should fail." ,
437
+ my %FAQKeywordArticleList = $FAQObject -> FAQKeywordArticleList(
438
+ $Test -> {FAQKeywordArticleList }-> %*,
458
439
);
459
- }
460
- else {
461
440
462
- for my $Keyword ( sort keys %{ $Test -> {ReferenceData } } ) {
441
+ if ( $Test -> {Fails } ) {
442
+ ok( !%FAQKeywordArticleList , " Test $TestCount : FAQKeywordArticleList() - should fail." );
443
+ }
444
+ else {
463
445
464
- $Self -> IsDeeply(
465
- $FAQKeywordArticleList {$Keyword } || [],
466
- $Test -> {ReferenceData }-> {$Keyword },
467
- " Test $TestCount : FAQKeywordArticleList() - $Keyword - test the result" ,
468
- );
446
+ for my $Keyword ( sort keys %{ $Test -> {ReferenceData } } ) {
447
+
448
+ is(
449
+ $FAQKeywordArticleList {$Keyword } || [],
450
+ $Test -> {ReferenceData }-> {$Keyword },
451
+ " Test $TestCount : FAQKeywordArticleList() - $Keyword - test the result" ,
452
+ );
453
+ }
469
454
}
470
455
}
471
456
}
@@ -504,14 +489,11 @@ my $LastFAQKeywordArticleListCache = $Kernel::OM->Get('Kernel::System::Cache')->
504
489
Key => $CacheKey ,
505
490
);
506
491
507
- $Self -> True(
508
- 1,
509
- " Test $TestCount : Test the cache for last function call" ,
510
- );
492
+ diag(" Test $TestCount : Test the cache for last function call" );
511
493
512
494
for my $Keyword ( sort keys %{ $Tests [-1]-> {ReferenceData } } ) {
513
495
514
- $Self -> IsDeeply (
496
+ is (
515
497
$LastFAQKeywordArticleListCache -> {$Keyword } || [],
516
498
$Tests [-1]-> {ReferenceData }-> {$Keyword },
517
499
" Test $TestCount : Cache - FAQKeywordArticleList() - $Keyword - test the result" ,
@@ -803,10 +785,7 @@ for my $Test (@Tests) {
803
785
)
804
786
{
805
787
806
- $Self -> True(
807
- 0,
808
- " Test $TestCount : No RelatedAgentArticleList or RelatedCustomerArticleList found for this test." ,
809
- );
788
+ fail(" Test $TestCount : No RelatedAgentArticleList or RelatedCustomerArticleList found for this test." );
810
789
811
790
next TEST;
812
791
}
@@ -820,47 +799,37 @@ for my $Test (@Tests) {
820
799
$RelatedArticleFunction = ' RelatedAgentArticleList' ;
821
800
}
822
801
823
- # print test case description
824
- if ( $Test -> {Description } ) {
825
- $Self -> True(
826
- 1,
827
- " Test $TestCount : $Test ->{Description}" ,
828
- );
829
- }
802
+ subtest " Test $TestCount : $Test ->{Description}" => sub {
803
+ my @RelatedArticleList ;
830
804
831
- my @RelatedArticleList ;
832
-
833
- if ( $Test -> {RelatedCustomerArticleList } ) {
834
-
835
- @RelatedArticleList = $FAQObject -> $RelatedArticleFunction (
836
- %{ $Test -> {RelatedCustomerArticleList } },
837
- );
838
- }
839
- else {
840
- @RelatedArticleList = $FAQObject -> $RelatedArticleFunction (
841
- %{ $Test -> {RelatedAgentArticleList } },
842
- );
843
- }
805
+ if ( $Test -> {RelatedCustomerArticleList } ) {
806
+ @RelatedArticleList = $FAQObject -> $RelatedArticleFunction (
807
+ %{ $Test -> {RelatedCustomerArticleList } },
808
+ );
809
+ }
810
+ else {
811
+ @RelatedArticleList = $FAQObject -> $RelatedArticleFunction (
812
+ %{ $Test -> {RelatedAgentArticleList } },
813
+ );
814
+ }
844
815
845
- if ( $Test -> {Fails } ) {
846
- $Self -> False(
847
- @RelatedArticleList ? 1 : 0,
848
- " Test $TestCount : $RelatedArticleFunction () - should fail." ,
849
- );
850
- }
851
- else {
816
+ if ( $Test -> {Fails } ) {
817
+ ok( !@RelatedArticleList , " Test $TestCount : $RelatedArticleFunction () - should fail." );
818
+ }
819
+ else {
852
820
853
- my @RelatedFAQArticleIDs = map { $_ -> {ItemID } } @RelatedArticleList ;
821
+ my @RelatedFAQArticleIDs = map { $_ -> {ItemID } } @RelatedArticleList ;
854
822
855
- $Self -> IsDeeply(
856
- \@RelatedFAQArticleIDs ,
857
- $Test -> {ReferenceData },
858
- " Test $TestCount : $RelatedArticleFunction () - test the result" ,
859
- );
823
+ is(
824
+ \@RelatedFAQArticleIDs ,
825
+ $Test -> {ReferenceData },
826
+ " Test $TestCount : $RelatedArticleFunction () - test the result" ,
827
+ );
828
+ }
860
829
}
861
830
}
862
831
continue {
863
832
$TestCount ++;
864
833
}
865
834
866
- $Self -> DoneTesting ();
835
+ done_testing ();
0 commit comments