Remove extract_text and extract_doc in favor of extract_sigle
Change-Id: I6577a8f453baab96e684da3b2238a31b4f0175e3
diff --git a/t/script/extract.t b/t/script/extract.t
index 11d7cf3..084908b 100644
--- a/t/script/extract.t
+++ b/t/script/extract.t
@@ -51,14 +51,14 @@
'--cache' => $cache
);
-my $sep = qr!\.\.\.[\n\r]+?\.\.\.!;
+# my $sep = qr!\.\.\.[\n\r]+?\.\.\.!;
# Test without compression
stdout_like(
sub {
system($call);
},
- qr!TEST/BSP/1 $sep extracted!s,
+ qr!TEST/BSP/1 .* extracted!s,
# qr!TEST/BSP/1 $sep extracted.!s,
$call
);
@@ -91,7 +91,8 @@
sub {
system($call);
},
- qr!TEST/BSP/4 $sep extracted.!s,
+ # qr!TEST/BSP/4 $sep extracted.!s,
+ qr!TEST/BSP/4 .* extracted.!s,
$call
);
@@ -100,7 +101,8 @@
sub {
system($call);
},
- qr!TEST/BSP/5 $sep extracted.!s,
+ # qr!TEST/BSP/5 $sep extracted.!s,
+ qr!TEST/BSP/5 .* extracted.!s,
$call
);
@@ -110,7 +112,6 @@
ok(-d catdir($output2, 'TEST', 'BSP', '4'), 'Directory created');
ok(!-d catdir($output2, 'TEST', 'BSP', '5'), 'Directory created');
-
# Test with document sigle
my $input_rei = catdir($f, '..', 'corpus', 'archive_rei.zip');
ok(-f $input_rei, 'Input archive found');
@@ -147,7 +148,6 @@
ok(-d catdir($output2, 'REI', 'BNG', '00128'), 'Directory created');
ok(!-d catdir($output2, 'REI', 'RBR', '00610'), 'Directory not created');
-
# Test with document sigle
$output2 = undef;
$output2 = tempdir(CLEANUP => 1);
@@ -176,7 +176,7 @@
sub {
system($call);
},
- qr!REI/RBR $sep extracted!s,
+ qr!REI/RBR .* extracted!s,
$call
);
@@ -205,7 +205,7 @@
sub {
system($call);
},
- qr!WPD15/A00/00081 $sep extracted!s,
+ qr!WPD15/A00/00081 .* extracted!s,
$call
);
@@ -239,7 +239,8 @@
sub {
system($call);
},
- qr!TEST/BSP "Example"\/1 $sep extracted!s,
+ qr!TEST/BSP "Example"\/1 .* extracted!s,
+ # qr!TEST/BSP "Example"\/1 $sep extracted!s,
# qr!Extract .+? TEST/BSP "Example"\/1!s,
$call
);