[dh-make-perl] 02/05: update test t/AptContents.t

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch gregoa/apt-file-3
in repository dh-make-perl.

commit 7ffb20fcf17ab06e15528128416664c50bde10ac
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Mar 25 03:22:07 2016 +0100

    update test t/AptContents.t
    
    - drop tests for removed methods
    - adjust to already created cache
    - update paths for our fake apt-get
    
    Gbp-Dch: Ignore
---
 t/AptContents.t | 102 +++++++-------------------------------------------------
 1 file changed, 12 insertions(+), 90 deletions(-)

diff --git a/t/AptContents.t b/t/AptContents.t
index 4aec946..3461836 100755
--- a/t/AptContents.t
+++ b/t/AptContents.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 26;
+use Test::More tests => 16;
 
 BEGIN {
     use_ok 'Debian::AptContents';
@@ -18,111 +18,31 @@ sub instance
 {
     Debian::AptContents->new({
         homedir => $Bin,
-        contents_dir    => "$Bin/contents",
         verbose => 0,
-        sources    => "$Bin/contents/sources.list",
         @_,
     });
 }
 
+$ENV{PATH} = "$Bin/bin:$ENV{PATH}";
+
 eval { Debian::AptContents->new() };
 ok( $@, 'AptContents->new with no homedir dies' );
 like( $@, qr/No homedir given/, 'should say why it died' );
 
-my $apt_contents = instance( contents_dir => 'non-existent' );
-
-isnt( $apt_contents, undef, 'should create with no contents' );
-
-is( $apt_contents->cache, undef, 'but should contain no cache' );
-
-is( $apt_contents->cache, undef, 'should have no cache when no dists found' );
-
-is_deeply(
-    [   $apt_contents->repo_source_to_contents_paths(
-            'deb     http://debian.cihar.com/ unstable main contrib non-free')
-    ],
-    [   'debian.cihar.com_dists_unstable_main',
-        'debian.cihar.com_dists_unstable_contrib',
-        'debian.cihar.com_dists_unstable_non-free',
-        'debian.cihar.com_dists_unstable'
-    ],
-    'source line conversion 1',
-);
+my $apt_contents = instance();
 
-is_deeply(
-    [ $apt_contents->repo_source_to_contents_paths(
-        'deb     http://kernel-archive.buildserver.net/debian-kernel trunk main') ],
-    [ 'kernel-archive.buildserver.net_debian-kernel_dists_trunk_main',
-     'kernel-archive.buildserver.net_debian-kernel_dists_trunk' ],
-    'source line conversion 2',
-);
-
-is_deeply(
-    [ $apt_contents->repo_source_to_contents_paths(
-        'deb     http://www.debian-multimedia.org stable main') ],
-    [ 'www.debian-multimedia.org_dists_stable_main',
-      'www.debian-multimedia.org_dists_stable' ],
-    'source line conversion 3',
-);
-
-is_deeply(
-    [ $apt_contents->repo_source_to_contents_paths(
-        'deb     http://ftp.debian-unofficial.org/debian testing main contrib non-free restricted') ],
-    [ 'ftp.debian-unofficial.org_debian_dists_testing_main',
-      'ftp.debian-unofficial.org_debian_dists_testing_contrib',
-      'ftp.debian-unofficial.org_debian_dists_testing_non-free',
-      'ftp.debian-unofficial.org_debian_dists_testing_restricted',
-      'ftp.debian-unofficial.org_debian_dists_testing' ],
-    'source line conversion 4',
-);
-
-is_deeply(
-    [ $apt_contents->repo_source_to_contents_paths(
-        'deb     http://ftp.de.debian.org/debian/ unstable main contrib non-free') ],
-    [ 'ftp.de.debian.org_debian_dists_unstable_main',
-      'ftp.de.debian.org_debian_dists_unstable_contrib',
-      'ftp.de.debian.org_debian_dists_unstable_non-free',
-      'ftp.de.debian.org_debian_dists_unstable' ],
-    'source line conversion 5',
-);
-
-is_deeply(
-    [   $apt_contents->repo_source_to_contents_paths(
-            'deb http://user:pass@ftp2.de.debian.org/debian/ squeeze main contrib non-free'
-        )
-    ],
-    [   'ftp2.de.debian.org_debian_dists_squeeze_main',
-        'ftp2.de.debian.org_debian_dists_squeeze_contrib',
-        'ftp2.de.debian.org_debian_dists_squeeze_non-free',
-        'ftp2.de.debian.org_debian_dists_squeeze',
-    ],
-    'source lines with user:pass@',
-);
-
-is_deeply(
-    [ $apt_contents->repo_source_to_contents_paths(
-        'deb file:/home/jason/debian stable main contrib non-free') ],
-    [ '_home_jason_debian_dists_stable_main',
-      '_home_jason_debian_dists_stable_contrib',
-      '_home_jason_debian_dists_stable_non-free',
-      '_home_jason_debian_dists_stable' ],
-    'source line conversion 6',
-);
+isnt( $apt_contents, undef, 'should create' );
 
 $apt_contents = instance();
 
 is_deeply(
     $apt_contents->contents_files,
-    [ sort grep { !/Contents.cache/} glob "$Bin/contents/*Contents*" ],
+    [ sort grep { !/Contents.cache/} glob "t/contents/*Contents*" ],
     'contents in a dir'
 );
 
 ok( -f "$Bin/Contents.cache", 'Contents.cache created' );
 
-is( $apt_contents->source, 'parsed files', 'no cache was used' );
-
-$apt_contents = instance();
-
 is( $apt_contents->source, 'cache', 'cache was used' );
 
 sleep(1);   # allow the clock to tick so the timestamp actually differs
@@ -135,16 +55,18 @@ is( $apt_contents->source, 'parsed files', 'cache updated' );
 is_deeply(
     [ $apt_contents->find_file_packages('Moose.pm')],
     [ 'libmoose-perl' ],
-    'Moose found by find_file_packages' );
+    'Moose found by find_file_packages'
+);
 
 is( $apt_contents->find_perl_module_package('Moose') . '',
     'libmoose-perl', 'Moose found by module name' );
 
 is_deeply(
     $apt_contents->get_contents_files,
-    [   "$Bin/contents/test_debian_dists_sid_main_Contents",
-        "$Bin/contents/test_debian_dists_testing_main_Contents"
-    ]
+    [   "t/contents/test_debian_dists_sid_main_Contents",
+        "t/contents/test_debian_dists_testing_main_Contents"
+    ],
+    'get_contents_files'
 );
 
 is_deeply(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/dh-make-perl.git