From 1e30359a92747f6277d29aafb7c61f3322f35054 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20B=C3=BCren?= <jan@kivitendo-premium.de>
Date: Mon, 30 Oct 2017 17:12:07 +0100
Subject: [PATCH] =?utf8?q?DATEV-Tests=20auch=20sauber=20f=C3=BCr=20perl=20?=
 =?utf8?q?5.22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 t/datev/invoices.t | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/t/datev/invoices.t b/t/datev/invoices.t
index 225af8836..6b06196ab 100644
--- a/t/datev/invoices.t
+++ b/t/datev/invoices.t
@@ -3,6 +3,7 @@ use Test::More;
 use Test::Deep qw(cmp_bag);
 
 use lib 't';
+use utf8;
 
 use_ok 'Support::TestSetup';
 use SL::DATEV qw(:CONSTANTS);
@@ -62,9 +63,10 @@ my $datev1 = SL::DATEV->new(
 
 $datev1->generate_datev_data;
 
-cmp_bag $datev1->generate_datev_lines, [
+my @data_datev   = sort { $a->{umsatz} <=> $b->{umsatz} } @{ $datev1->generate_datev_lines() };
+cmp_bag \@data_datev, [
                                          {
-                                           'belegfeld1'   => Encode::decode('utf-8', "Þ sales ¥& invöice"),
+                                           'belegfeld1'   => "\x{de} sales \x{a5}& inv\x{f6}ice",
                                            'buchungstext' => 'Testcustomer',
                                            'datum'        => '01.01.2017',
                                            'gegenkonto'   => '8400',
@@ -76,7 +78,7 @@ cmp_bag $datev1->generate_datev_lines, [
                                            'soll_haben_kennzeichen' => 'S',
                                          },
                                          {
-                                           'belegfeld1'   => Encode::decode('utf-8', "Þ sales ¥& invöice"),
+                                           'belegfeld1'   => "\x{de} sales \x{a5}& inv\x{f6}ice",
                                            'buchungstext' => 'Testcustomer',
                                            'datum'        => '01.01.2017',
                                            'gegenkonto'   => '8300',
@@ -88,7 +90,8 @@ cmp_bag $datev1->generate_datev_lines, [
                                            'soll_haben_kennzeichen' => 'S',
                                          },
                                          {
-                                           'belegfeld1'   => Encode::decode('utf-8', "Þ sales ¥& invöice"),
+                                           'belegfeld1'   => "\x{de} sales \x{a5}& inv\x{f6}ice",
+                                           'buchungstext' => 'Testcustomer',
                                            'buchungstext' => 'Testcustomer',
                                            'datum'        => '05.01.2017',
                                            'gegenkonto'   => '1400',
@@ -105,7 +108,7 @@ $datev1->use_pk(1);
 $datev1->generate_datev_data;
 cmp_bag $datev1->generate_datev_lines, [
                                          {
-                                           'belegfeld1'   => Encode::decode('utf-8', "Þ sales ¥& invöice"),
+                                           'belegfeld1'   => "\x{de} sales \x{a5}& inv\x{f6}ice",
                                            'buchungstext' => 'Testcustomer',
                                            'datum'        => '01.01.2017',
                                            'gegenkonto'   => '8400',
@@ -117,7 +120,7 @@ cmp_bag $datev1->generate_datev_lines, [
                                            'soll_haben_kennzeichen' => 'S',
                                          },
                                          {
-                                           'belegfeld1'   => Encode::decode('utf-8', "Þ sales ¥& invöice"),
+                                           'belegfeld1'   => "\x{de} sales \x{a5}& inv\x{f6}ice",
                                            'buchungstext' => 'Testcustomer',
                                            'datum'        => '01.01.2017',
                                            'gegenkonto'   => '8300',
@@ -129,7 +132,7 @@ cmp_bag $datev1->generate_datev_lines, [
                                            'soll_haben_kennzeichen' => 'S',
                                          },
                                          {
-                                           'belegfeld1'   => Encode::decode('utf-8', "Þ sales ¥& invöice"),
+                                           'belegfeld1'   => "\x{de} sales \x{a5}& inv\x{f6}ice",
                                            'buchungstext' => 'Testcustomer',
                                            'datum'        => '05.01.2017',
                                            'gegenkonto'   => $customer->customernumber,
@@ -154,7 +157,7 @@ $datev1->use_pk(0); # reset use_pk for csv_buchungsexport
 # splice away the header, because sort won't do
 # we need sort, because pay_invoice is not acc_trans_id order safe
 my @data_csv = splice @{ $datev1->csv_buchungsexport() }, 2, 5;
-@data_csv    = sort { $a->[0] <=> $b->[0] } @data_csv;
+@data_csv    = sort { $a->[0] cmp $b->[0] } @data_csv;
 
 my $cp1252_belegfeld1   = SL::Iconv::convert("UTF-8", "CP1252", 'Þ sales ¥& i');
 my $cp1252_buchungstext = SL::Iconv::convert("UTF-8", "CP1252", 'Þ sales ¥& invöice');
-- 
2.20.1