- Renamed Forked test to OtherLink test to be more explicit.

manwar · manwar · commit 6bc3571506c8 · 2025-04-17T15:50:51.000+01:00
diff --git a/Changes b/Changes
@@ -1,5 +1,8 @@
 Revision history for Map::Tube
 
+4.07  2025-04-17T15:50:00+00:00
+      - Renamed Forked test to OtherLink test to be more explicit.
+
 4.06  2025-04-15T17:25:00+00:00
       - Proposed patch for this FAIL report, thanks Andreas J. Koenig.
       https://www.cpantesters.org/cpan/report/50dde750-1736-11f0-8297-ce01b18213f0
diff --git a/MANIFEST b/MANIFEST
@@ -32,13 +32,13 @@ t/line-stations.t
 t/map.t
 t/not_ok_map.t
 t/ok_map.t
-t/ok_map_forked.t
+t/ok_map_other_link.t
 t/ok_map_functions.t
 t/ok_map_routes.t
 t/preferred-route.t
 t/Sample.pm
-t/Forked.pm
-t/forked-map.xml
+t/OtherLink.pm
+t/other-link-map.xml
 t/sample.xml
 t/lib/BadSample.pm
 t/lib/Sample.pm
diff --git a/Makefile.PL b/Makefile.PL
@@ -52,16 +52,16 @@ WriteMakefile(
     (eval { ExtUtils::MakeMaker->VERSION(6.46) } ? (META_MERGE => {
         'meta-spec' => { version => 2 },
         provides    => {
-            'Map::Tube'            => { file => 'lib/Map/Tube.pm'          , version => '4.06' },
-            'Map::Tube::Node'      => { file => 'lib/Map/Tube/Node.pm'     , version => '4.06' },
-            'Map::Tube::Line'      => { file => 'lib/Map/Tube/Line.pm'     , version => '4.06' },
-            'Map::Tube::Table'     => { file => 'lib/Map/Tube/Table.pm'    , version => '4.06' },
-            'Map::Tube::Route'     => { file => 'lib/Map/Tube/Route.pm'    , version => '4.06' },
-            'Map::Tube::Utils'     => { file => 'lib/Map/Tube/Utils.pm'    , version => '4.06' },
-            'Map::Tube::Types'     => { file => 'lib/Map/Tube/Types.pm'    , version => '4.06' },
-            'Map::Tube::Cookbook'  => { file => 'lib/Map/Tube/Cookbook.pm' , version => '4.06' },
-            'Map::Tube::Pluggable' => { file => 'lib/Map/Tube/Pluggable.pm', version => '4.06' },
-            'Test::Map::Tube'      => { file => 'lib/Test/Map/Tube.pm'     , version => '4.06' },
+            'Map::Tube'            => { file => 'lib/Map/Tube.pm'          , version => '4.07' },
+            'Map::Tube::Node'      => { file => 'lib/Map/Tube/Node.pm'     , version => '4.07' },
+            'Map::Tube::Line'      => { file => 'lib/Map/Tube/Line.pm'     , version => '4.07' },
+            'Map::Tube::Table'     => { file => 'lib/Map/Tube/Table.pm'    , version => '4.07' },
+            'Map::Tube::Route'     => { file => 'lib/Map/Tube/Route.pm'    , version => '4.07' },
+            'Map::Tube::Utils'     => { file => 'lib/Map/Tube/Utils.pm'    , version => '4.07' },
+            'Map::Tube::Types'     => { file => 'lib/Map/Tube/Types.pm'    , version => '4.07' },
+            'Map::Tube::Cookbook'  => { file => 'lib/Map/Tube/Cookbook.pm' , version => '4.07' },
+            'Map::Tube::Pluggable' => { file => 'lib/Map/Tube/Pluggable.pm', version => '4.07' },
+            'Test::Map::Tube'      => { file => 'lib/Test/Map/Tube.pm'     , version => '4.07' },
         },
         prereqs => {
             test => {
diff --git a/lib/Map/Tube.pm b/lib/Map/Tube.pm
@@ -1,6 +1,6 @@
 package Map::Tube;
 
-$Map::Tube::VERSION   = '4.06';
+$Map::Tube::VERSION   = '4.07';
 $Map::Tube::AUTHORITY = 'cpan:MANWAR';
 
 =head1 NAME
@@ -9,7 +9,7 @@ Map::Tube - Lightweight Routing Framework.
 
 =head1 VERSION
 
-Version 4.06
+Version 4.07
 
 =cut
 
diff --git a/lib/Map/Tube/Cookbook.pm b/lib/Map/Tube/Cookbook.pm
@@ -1,6 +1,6 @@
 package Map::Tube::Cookbook;
 
-$Map::Tube::Cookbook::VERSION   = '4.06';
+$Map::Tube::Cookbook::VERSION   = '4.07';
 $Map::Tube::Cookbook::AUTHORITY = 'cpan:MANWAR';
 
 =head1 NAME
@@ -9,7 +9,7 @@ Map::Tube::Cookbook - Cookbook for Map::Tube library.
 
 =head1 VERSION
 
-Version 4.06
+Version 4.07
 
 =cut
 
diff --git a/lib/Map/Tube/Line.pm b/lib/Map/Tube/Line.pm
@@ -1,6 +1,6 @@
 package Map::Tube::Line;
 
-$Map::Tube::Line::VERSION   = '4.06';
+$Map::Tube::Line::VERSION   = '4.07';
 $Map::Tube::Line::AUTHORITY = 'cpan:MANWAR';
 
 =head1 NAME
@@ -9,7 +9,7 @@ Map::Tube::Line - Class to represent the line in the map.
 
 =head1 VERSION
 
-Version 4.06
+Version 4.07
 
 =cut
 
diff --git a/lib/Map/Tube/Node.pm b/lib/Map/Tube/Node.pm
@@ -1,6 +1,6 @@
 package Map::Tube::Node;
 
-$Map::Tube::Node::VERSION   = '4.06';
+$Map::Tube::Node::VERSION   = '4.07';
 $Map::Tube::Node::AUTHORITY = 'cpan:MANWAR';
 
 =head1 NAME
@@ -9,7 +9,7 @@ Map::Tube::Node - Class to represent the station in the map.
 
 =head1 VERSION
 
-Version 4.06
+Version 4.07
 
 =cut
 
diff --git a/lib/Map/Tube/Pluggable.pm b/lib/Map/Tube/Pluggable.pm
@@ -1,6 +1,6 @@
 package Map::Tube::Pluggable;
 
-$Map::Tube::Pluggable::VERSION   = '4.06';
+$Map::Tube::Pluggable::VERSION   = '4.07';
 $Map::Tube::Pluggable::AUTHORITY = 'cpan:MANWAR';
 
 =head1 NAME
@@ -9,7 +9,7 @@ Map::Tube::Pluggable - Class to load plugins for Map::Tube.
 
 =head1 VERSION
 
-Version 4.06
+Version 4.07
 
 =cut
 
diff --git a/lib/Map/Tube/Route.pm b/lib/Map/Tube/Route.pm
@@ -1,6 +1,6 @@
 package Map::Tube::Route;
 
-$Map::Tube::Route::VERSION   = '4.06';
+$Map::Tube::Route::VERSION   = '4.07';
 $Map::Tube::Route::AUTHORITY = 'cpan:MANWAR';
 
 =head1 NAME
@@ -9,7 +9,7 @@ Map::Tube::Route - Class to represent the route in the map.
 
 =head1 VERSION
 
-Version 4.06
+Version 4.07
 
 =cut
 
diff --git a/lib/Map/Tube/Table.pm b/lib/Map/Tube/Table.pm
@@ -1,6 +1,6 @@
 package Map::Tube::Table;
 
-$Map::Tube::Table::VERSION   = '4.06';
+$Map::Tube::Table::VERSION   = '4.07';
 $Map::Tube::Table::AUTHORITY = 'cpan:MANWAR';
 
 =head1 NAME
@@ -9,7 +9,7 @@ Map::Tube::Table - Class to represent the table in the map.
 
 =head1 VERSION
 
-Version 4.06
+Version 4.07
 
 =cut
 
diff --git a/lib/Map/Tube/Types.pm b/lib/Map/Tube/Types.pm
@@ -1,6 +1,6 @@
 package Map::Tube::Types;
 
-$Map::Tube::Types::VERSION   = '4.06';
+$Map::Tube::Types::VERSION   = '4.07';
 $Map::Tube::Types::AUTHORITY = 'cpan:MANWAR';
 
 =head1 NAME
@@ -9,7 +9,7 @@ Map::Tube::Types - Attribute type definition for Map::Tube.
 
 =head1 VERSION
 
-Version 4.06
+Version 4.07
 
 =cut
 
diff --git a/lib/Map/Tube/Utils.pm b/lib/Map/Tube/Utils.pm
@@ -1,6 +1,6 @@
 package Map::Tube::Utils;
 
-$Map::Tube::Utils::VERSION   = '4.06';
+$Map::Tube::Utils::VERSION   = '4.07';
 $Map::Tube::Utils::AUTHORITY = 'cpan:MANWAR';
 
 =head1 NAME
@@ -9,7 +9,7 @@ Map::Tube::Utils - Helper package for Map::Tube.
 
 =head1 VERSION
 
-Version 4.06
+Version 4.07
 
 =cut
 
diff --git a/lib/Test/Map/Tube.pm b/lib/Test/Map/Tube.pm
@@ -1,6 +1,6 @@
 package Test::Map::Tube;
 
-$Test::Map::Tube::VERSION    = '4.06';
+$Test::Map::Tube::VERSION    = '4.07';
 $Test::Map::Tube::AUTHORITY = 'cpan:MANWAR';
 
 =head1 NAME
@@ -9,7 +9,7 @@ Test::Map::Tube - Module for testing Map::Tube data and features.
 
 =head1 VERSION
 
-Version 4.06
+Version 4.07
 
 =head1 DESCRIPTION
 
@@ -705,10 +705,10 @@ sub ok_stations_linked_share_lines($;$) {
                     ) {
             my $stationct = grep { exists( $rawinfo->{station_served_by_lines}{$_}{$line} ) }
                             keys %{ $rawinfo->{station_linked_to_stations}{$station} };
-    		$stationct	 += grep { exists( $rawinfo->{station_served_by_lines}{$_}{$line} ) }
-    						keys %{ $rawinfo->{station_linked_from_stations}{$station} };
+            $stationct   += grep { exists( $rawinfo->{station_served_by_lines}{$_}{$line} ) }
+                            keys %{ $rawinfo->{station_linked_from_stations}{$station} };
             ( $ok, @results ) = _emit_diagnostics( $name, wantarray, $ok,
-    											   "Line id $line at station id $station serves neither a linked nor a linking station",
+                                                   "Line id $line at station id $station serves neither a linked nor a linking station",
                                                    \@results, $max_msg
                                                  ) unless $stationct;
         }
@@ -1157,7 +1157,7 @@ sub ok_stations_linked($;$) {
 
     my %linked;
     for my $id( sort keys %{ $map->{nodes} } ) {
-    	$linked{$_}{$id}++ for ( sort grep { ( $_ ne '' ) && !exists( $map->{nodes}->{$_} ) } split( /\,/, $map->{nodes}->{$id}->{link} ) );
+        $linked{$_}{$id}++ for ( sort grep { ( $_ ne '' ) && !exists( $map->{nodes}->{$_} ) } split( /\,/, $map->{nodes}->{$id}->{link} ) );
     }
 
     ($ok, @results ) = _emit_diagnostics( $name, wantarray, $ok,
@@ -1485,9 +1485,9 @@ sub _prepare_xml_map {
   my $xml = XML::Twig->new( );
   $xml->parsefile( $map->xml( ) );
   my $root = $xml->root( );
-  my( %line_names,    			   %line_names_uc,				  %line_ids_defined, %line_ids_used,
-      %line_ids_indexed,		   %line_id_has_indices,		  %other_link_used,
-      %station_names,			   %station_ids_defined,		  %station_ids_used,
+  my( %line_names,                 %line_names_uc,                %line_ids_defined, %line_ids_used,
+      %line_ids_indexed,           %line_id_has_indices,          %other_link_used,
+      %station_names,              %station_ids_defined,          %station_ids_used,
       %station_linked_to_stations, %station_linked_from_stations, %station_served_by_lines,
       %station_line_count,
     );
@@ -1515,7 +1515,7 @@ sub _prepare_xml_map {
     $station_names{$name} //= [ ];
     push( @{ $station_names{$name} }, $id );
     $station_ids_defined{$id}++;
-    $station_ids_used{$_}++ 					for map { ( split(/:/) )[0] } split( /,/, $station->att('link') );
+    $station_ids_used{$_}++                     for map { ( split(/:/) )[0] } split( /,/, $station->att('link') );
     $station_linked_to_stations{$id}{$_}   |= 1 for map { ( split(/:/) )[0] } split( /,/, $station->att('link') );
     $station_linked_from_stations{$_}{$id} |= 1 for map { ( split(/:/) )[0] } split( /,/, $station->att('link') );
 
@@ -1537,29 +1537,29 @@ sub _prepare_xml_map {
         my( $ol, $target ) = split( /:/, $other_link );
         $other_link_used{$ol}++;
         $station_ids_used{$target}++;
-    	$station_linked_to_stations{$id}{$target}	|= 2;
-    	$station_linked_from_stations{$target}{$id} |= 2;
+        $station_linked_to_stations{$id}{$target}   |= 2;
+        $station_linked_from_stations{$target}{$id} |= 2;
         $station_served_by_lines{$id}{$ol}          |= 2;
       }
     }
 
     $station = $station->next_sibling( );
   }
 
-  $map->{_rawinfo} = { line_names    				=> \%line_names,
-    				   line_names_uc				=> \%line_names_uc,
-    				   line_ids_defined 			=> \%line_ids_defined,
-    				   line_ids_used				=> \%line_ids_used,
-    				   line_ids_indexed 			=> \%line_ids_indexed,
+  $map->{_rawinfo} = { line_names                   => \%line_names,
+                       line_names_uc                => \%line_names_uc,
+                       line_ids_defined             => \%line_ids_defined,
+                       line_ids_used                => \%line_ids_used,
+                       line_ids_indexed             => \%line_ids_indexed,
                        line_id_has_indices          => \%line_id_has_indices,
-    				   station_names				=> \%station_names,
+                       station_names                => \%station_names,
                        station_ids_defined          => \%station_ids_defined,
-    				   station_ids_used 			=> \%station_ids_used,
-    				   station_line_count			=> \%station_line_count,
+                       station_ids_used             => \%station_ids_used,
+                       station_line_count           => \%station_line_count,
                        other_link_used              => \%other_link_used,
-    				   station_linked_to_stations	=> \%station_linked_to_stations,
-    				   station_linked_from_stations => \%station_linked_from_stations,
-    				   station_served_by_lines		=> \%station_served_by_lines,
+                       station_linked_to_stations   => \%station_linked_to_stations,
+                       station_linked_from_stations => \%station_linked_from_stations,
+                       station_served_by_lines      => \%station_served_by_lines,
                      };
   return $map;
 }
@@ -1572,9 +1572,9 @@ sub _prepare_json_map {
   plan skip_all => 'Map::Tube::Utils required (should have been installed along with Map::Tube)' if $@;
 
   my $map = shift;
-  my( %line_names,    			   %line_names_uc,				  %line_ids_defined, %line_ids_used,
-      %line_ids_indexed,		   %line_id_has_indices,		  %other_link_used,
-      %station_names,			   %station_ids_defined,		  %station_ids_used,
+  my( %line_names,                 %line_names_uc,                %line_ids_defined, %line_ids_used,
+      %line_ids_indexed,           %line_id_has_indices,          %other_link_used,
+      %station_names,              %station_ids_defined,          %station_ids_used,
       %station_linked_to_stations, %station_linked_from_stations, %station_served_by_lines,
       %station_line_count,
     );
@@ -1601,7 +1601,7 @@ sub _prepare_json_map {
     $station_names{$name} //= [ ];
     push( @{ $station_names{$name} }, $id );
     $station_ids_defined{$id}++;
-    $station_ids_used{$_}++ 					for map { ( split(/:/) )[0] } split( /,/, $station->{link} );
+    $station_ids_used{$_}++                     for map { ( split(/:/) )[0] } split( /,/, $station->{link} );
     $station_linked_to_stations{$id}{$_}   |= 1 for map { ( split(/:/) )[0] } split( /,/, $station->{link} );
     $station_linked_from_stations{$_}{$id} |= 1 for map { ( split(/:/) )[0] } split( /,/, $station->{link} );
 
@@ -1622,27 +1622,27 @@ sub _prepare_json_map {
         my( $ol, $target ) = split( /:/, $other_link );
         $other_link_used{$ol}++;
         $station_ids_used{$target}++;
-    	$station_linked_to_stations{$id}{$target}	|= 2;
-    	$station_linked_from_stations{$target}{$id} |= 2;
-    	$station_served_by_lines{$id}{$ol}			|= 2;
+        $station_linked_to_stations{$id}{$target}   |= 2;
+        $station_linked_from_stations{$target}{$id} |= 2;
+        $station_served_by_lines{$id}{$ol}          |= 2;
       }
     }
   }
 
-  $map->{_rawinfo} = { line_names    				=> \%line_names,
-    				   line_names_uc				=> \%line_names_uc,
-    				   line_ids_defined 			=> \%line_ids_defined,
-    				   line_ids_used				=> \%line_ids_used,
-    				   line_ids_indexed 			=> \%line_ids_indexed,
-    				   line_id_has_indices			=> \%line_id_has_indices,
-    				   station_names				=> \%station_names,
-    				   station_ids_defined			=> \%station_ids_defined,
-    				   station_ids_used 			=> \%station_ids_used,
-    				   station_line_count			=> \%station_line_count,
+  $map->{_rawinfo} = { line_names                   => \%line_names,
+                       line_names_uc                => \%line_names_uc,
+                       line_ids_defined             => \%line_ids_defined,
+                       line_ids_used                => \%line_ids_used,
+                       line_ids_indexed             => \%line_ids_indexed,
+                       line_id_has_indices          => \%line_id_has_indices,
+                       station_names                => \%station_names,
+                       station_ids_defined          => \%station_ids_defined,
+                       station_ids_used             => \%station_ids_used,
+                       station_line_count           => \%station_line_count,
                        other_link_used              => \%other_link_used,
-    				   station_linked_to_stations	=> \%station_linked_to_stations,
-    				   station_linked_from_stations => \%station_linked_from_stations,
-    				   station_served_by_lines		=> \%station_served_by_lines,
+                       station_linked_to_stations   => \%station_linked_to_stations,
+                       station_linked_from_stations => \%station_linked_from_stations,
+                       station_served_by_lines      => \%station_served_by_lines,
                      };
   return $map;
 }
diff --git a/t/OtherLink.pm b/t/OtherLink.pm
@@ -1,10 +1,10 @@
-package Forked;
+package OtherLink;
 
 use 5.006;
 use Moo;
 use namespace::clean;
 
-has xml => (is => 'ro', default => sub { return File::Spec->catfile('t', 'forked-map.xml') });
+has xml => (is => 'ro', default => sub { return File::Spec->catfile('t', 'other-link-map.xml') });
 with 'Map::Tube';
 
 1;
diff --git a/t/ok_map_other_link.t b/t/ok_map_other_link.t
diff --git a/t/other-link-map.xml b/t/other-link-map.xml
