Back to normal, tests again #5

Author: JJ

lib/Pod/To/Cached.pm6

@@ -149,7 +149,7 @@ method update-cache( --> Bool ) {
 
 method compile( $source-name, $key, $path, $status is copy ) {
     note "Caching $source-name" if $!verbose;
-    my ($handle , $error, $added);
+    my ($handle, $error, $added);
     try {
         CATCH {
             default {
@@ -261,14 +261,12 @@ method freeze( --> Bool ) {
     self.save-index;
 }
 
-method rm-cache() {
+sub rm-cache( $path ) is export {
     if $*SPEC ~~ IO::Spec::Win32 {
-        my $win-path = "$*CWD/$!path".trans( ["/"] => ["\\"] );
-        shell "rm $win-path\\.lock";
+        my $win-path = "$*CWD/$path".trans( ["/"] => ["\\"] );
         shell "rmdir /S /Q $win-path" ;
-        shell "rmdir $win-path";
     } else {
-        shell "rm -rf $!path";
+        shell "rm -rf $path";
     }
 }
 

t/020-source.t

@@ -228,8 +228,7 @@ is-deeply $cache.hash-files, ( 'a-pod-file' => 'Current', 'a-second-pod-file'=>'
 $cache .= new( :source( DOC ), :path( REP ));
 #--MARKER-- Test 36
 is-deeply $cache.hash-files(<Valid Old>), %( 'a-pod-file' => 'Valid', 'pod-file-to-deprecate' => 'Old'), 'hash-files with seq of statuses correct';
-# remove rep with old source
-$cache.rm-cache;
+
 #restore valid source file for later tests.
 (DOC ~ '/a-pod-file.pod6').IO.spurt(q:to/POD-CONTENT/);
     =begin pod

t/030-sub-directories.t

@@ -36,6 +36,5 @@ nok 'sub-dir-1' ~~ any( $cache.hash-files.keys ), 'sub-directories filtered from
 't'.IO.&indir( {$cache .= new(:source( 'tmp/doc' ) ) } );
 #--MARKER-- Test 4
 ok 't/.pod-cache'.IO ~~ :d, 'default repository created';
-rmtree 't/.pod-cache';
 
 done-testing;

t/040-pod-extraction.t

@@ -11,8 +11,10 @@ plan 11;
 
 my Pod::To::Cached $cache;
 my $rv;
-diag 'test pod extraction';
-$cache .= new( :path( REP ));
+diag 'Test pod extraction';
+rm-cache( REP );
+$cache .= new( :source( DOC ), :path( REP ), :!verbose);
+$cache.update-cache;
 #--MARKER-- Test 1
 ok $cache.pod('a-pod-file')[0] ~~ Pod::Block::Named, 'pod is returned from cache';
 
@@ -34,16 +36,24 @@ is %h<a-second-pod-file>, 'Valid', 'The old version is still in cache, no update
 lives-ok { $rv = $cache.pod('a-second-pod-file') }, 'Old Pod is provided';
 
 #--MARKER-- Test 4
-like $rv[0].contents[1].contents[0], /'Some more text but now it is changed'/, 'previous text in source';
+like $rv[0].contents[1].contents[0],
+        /'Some more text but now it is changed'/,
+        'previous text in source';
 
 diag 'testing freeze';
 #--MARKER-- Test 5
-throws-like { $cache.freeze }, Exception, :message(/'Cannot freeze because some files not Current'/), 'Cant freeze when a file not Current';
+throws-like { $cache.freeze }, Exception,
+        :message(/'Cannot freeze because some files not Current'/),
+        'Cannot freeze when a file not Current';
+
 #--MARKER-- Test 6
 ok $cache.update-cache, 'updates without problem';
 
 #--MARKER-- Test 7
-like $cache.pod('a-second-pod-file')[0].contents[1].contents[0], /'Some more text but now it is changed'/, 'new version after update';
+like $cache.pod('a-second-pod-file')[0].contents[1].contents[0],
+        /'Some more text but now it is changed'/,
+        'new version after update';
+
 #--MARKER-- Test 8
 lives-ok { $cache.freeze }, 'All updated so now can freeze';