clean up test a bit

1 files changed, 18 insertions, 22 deletions

diff --git a/t/encryption.t b/t/encryption.t
index b2d0cca..77f7c38 100644
--- a/t/encryption.t
+++ b/t/encryption.t
@@ -5,27 +5,23 @@ use Test::More;
 
 use Spreadsheet::ParseXLSX;
 
-my $parser = Spreadsheet::ParseXLSX->new(Password => '123q');
-my $workbook = $parser->parse("t/data/encryption-agile-123q.xlsx");
-
-my $worksheet;
-my $cell;
-
-$worksheet = $workbook->worksheet(0);
-ok(defined($workbook));
-
-$cell = $worksheet->get_cell(1, 1);
-ok(defined($cell) && $cell->value() eq 'abcdefgABCDEFG');
-
-
-open FH, "t/data/encryption-standard-default-password.xlsx";
-$parser = Spreadsheet::ParseXLSX->new(Password => '');
-$workbook = $parser->parse(\*FH);
-
-ok(defined($workbook));
-
-$worksheet = $workbook->worksheet(0);
-$cell = $worksheet->get_cell(22, 8);
-ok(defined($cell) && $cell->value() == 1911);
+{
+    my $parser = Spreadsheet::ParseXLSX->new(Password => '123q');
+    my $workbook = $parser->parse("t/data/encryption-agile-123q.xlsx");
+
+    my $worksheet = $workbook->worksheet(0);
+    my $cell = $worksheet->get_cell(1, 1);
+    is($cell->value, 'abcdefgABCDEFG');
+}
+
+{
+    open my $fh, "t/data/encryption-standard-default-password.xlsx" or die;
+    my $parser = Spreadsheet::ParseXLSX->new(Password => '');
+    my $workbook = $parser->parse($fh);
+
+    my $worksheet = $workbook->worksheet(0);
+    my $cell = $worksheet->get_cell(22, 8);
+    is($cell->value, 1911);
+}
 
 done_testing;