binary-search-tree: perform tests for the sortedData test cases. (#434)

Author: glennj

exercises/practice/binary-search-tree/.meta/exercise-data.yaml

@@ -1,28 +1,82 @@
-subs: tree
+subs: tree treeSort
 tests: |-
-  for my $case (@test_cases) {
-    is(
-      tree($case->{input}{treeData}),
-      $case->{expected},
-      $case->{description},
-    );
-  }
+  subtest data => sub {
+    for my $case (grep {$_->{property} eq 'data'} @test_cases) {
+      is(
+        tree($case->{input}{treeData}),
+        $case->{expected},
+        $case->{description},
+      );
+    }
+  };
 
-example: |-
-  use lib 'lib';
-  use Exercism::QuickSolve;
+  subtest sorting => sub {
+    for my $case (grep {$_->{property} eq 'sortedData'} @test_cases) {
+      is(
+        treeSort($case->{input}{treeData}),
+        $case->{expected},
+        $case->{description},
+      );
+    }
+  };
 
+example: |-
   sub tree {
     my ($data) = @_;
+    my $tree = leaf();
+    insert($tree, $_) for @$data;
+    return $tree;
+  }
 
-    quicksolve(
-      input => $data,
-      input_key => 'treeData',
-    );
+  sub leaf {
+    return {
+      data => undef,
+      left => undef,
+      right => undef,
+    };
+  }
+
+  sub insert {
+    my ($tree, $value) = @_;
+    if (not defined $tree->{data}) {
+      $tree->{data} = $value;
+    }
+    elsif ($value <= $tree->{data}) {
+      $tree->{left} //= leaf();
+      insert($tree->{left}, $value);
+    }
+    else {
+      $tree->{right} //= leaf();
+      insert($tree->{right}, $value);
+    }
+    return;
+  }
+
+  sub treeSort {
+    my ($data) = @_;
+    my $tree = tree($data);
+    my @values = ();
+    walk($tree, sub {push @values, (shift)->{data}});
+    return \@values;
+  }
+
+  sub walk {
+    my ($tree, $sub) = @_;
+    walk($tree->{left}, $sub) if defined $tree->{left};
+    $sub->($tree);
+    walk($tree->{right}, $sub) if defined $tree->{right};
+    return;
   }
 
 stub: |-
   sub tree {
     my ($data) = @_;
     return undef;
   }
+
+  # You are expected to create a tree and then do an in-order walk.
+  # Using the sort() function is cheating!
+  sub treeSort {
+    my ($data) = @_;
+    return undef;
+  }

exercises/practice/binary-search-tree/.meta/solutions/BinarySearchTree.pm

@@ -2,18 +2,53 @@ package BinarySearchTree;
 use strict;
 use warnings;
 use Exporter qw<import>;
-our @EXPORT_OK = qw<tree>;
-
-use lib 'lib';
-use Exercism::QuickSolve;
+our @EXPORT_OK = qw<tree treeSort>;
 
 sub tree {
   my ($data) = @_;
+  my $tree = leaf();
+  insert( $tree, $_ ) for @$data;
+  return $tree;
+}
+
+sub leaf {
+  return {
+    data  => undef,
+    left  => undef,
+    right => undef,
+  };
+}
+
+sub insert {
+  my ( $tree, $value ) = @_;
+  if ( not defined $tree->{data} ) {
+    $tree->{data} = $value;
+  }
+  elsif ( $value <= $tree->{data} ) {
+    $tree->{left} //= leaf();
+    insert( $tree->{left}, $value );
+  }
+  else {
+    $tree->{right} //= leaf();
+    insert( $tree->{right}, $value );
+  }
+  return;
+}
+
+sub treeSort {
+  my ($data) = @_;
+  my $tree   = tree($data);
+  my @values = ();
+  walk( $tree, sub { push @values, (shift)->{data} } );
+  return \@values;
+}
 
-  quicksolve(
-    input     => $data,
-    input_key => 'treeData',
-  );
+sub walk {
+  my ( $tree, $sub ) = @_;
+  walk( $tree->{left}, $sub ) if defined $tree->{left};
+  $sub->($tree);
+  walk( $tree->{right}, $sub ) if defined $tree->{right};
+  return;
 }
 
 1;

exercises/practice/binary-search-tree/.meta/solutions/binary-search-tree.t

@@ -6,16 +6,26 @@ use constant JSON => JSON::PP->new;
 use FindBin qw<$Bin>;
 use lib $Bin, "$Bin/local/lib/perl5";
 
-use BinarySearchTree qw<tree>;
+use BinarySearchTree qw<tree treeSort>;
 
-our @test_cases = do { local $/; @{ JSON->decode(<DATA>) }; };
+my @test_cases = do { local $/; @{ JSON->decode(<DATA>) }; };
 
-imported_ok qw<tree> or bail_out;
+imported_ok qw<tree treeSort> or bail_out;
 
-for my $case (@test_cases) {
-  is( tree( $case->{input}{treeData} ),
-    $case->{expected}, $case->{description}, );
-}
+subtest data => sub {
+  for my $case ( grep { $_->{property} eq 'data' } @test_cases ) {
+    is( tree( $case->{input}{treeData} ),
+      $case->{expected}, $case->{description}, );
+  }
+};
+
+subtest sorting => sub {
+  for my $case ( grep { $_->{property} eq 'sortedData' } @test_cases )
+  {
+    is( treeSort( $case->{input}{treeData} ),
+      $case->{expected}, $case->{description}, );
+  }
+};
 
 done_testing;
 

exercises/practice/binary-search-tree/BinarySearchTree.pm

@@ -2,11 +2,18 @@ package BinarySearchTree;
 use strict;
 use warnings;
 use Exporter qw<import>;
-our @EXPORT_OK = qw<tree>;
+our @EXPORT_OK = qw<tree treeSort>;
 
 sub tree {
   my ($data) = @_;
   return undef;
 }
 
+# You are expected to create a tree and then do an in-order walk.
+# Using the sort() function is cheating!
+sub treeSort {
+  my ($data) = @_;
+  return undef;
+}
+
 1;

exercises/practice/binary-search-tree/binary-search-tree.t

@@ -6,16 +6,26 @@ use constant JSON => JSON::PP->new;
 use FindBin qw<$Bin>;
 use lib $Bin, "$Bin/local/lib/perl5";
 
-use BinarySearchTree qw<tree>;
+use BinarySearchTree qw<tree treeSort>;
 
 my @test_cases = do { local $/; @{ JSON->decode(<DATA>) }; };
 
-imported_ok qw<tree> or bail_out;
+imported_ok qw<tree treeSort> or bail_out;
 
-for my $case (@test_cases) {
-  is( tree( $case->{input}{treeData} ),
-    $case->{expected}, $case->{description}, );
-}
+subtest data => sub {
+  for my $case ( grep { $_->{property} eq 'data' } @test_cases ) {
+    is( tree( $case->{input}{treeData} ),
+      $case->{expected}, $case->{description}, );
+  }
+};
+
+subtest sorting => sub {
+  for my $case ( grep { $_->{property} eq 'sortedData' } @test_cases )
+  {
+    is( treeSort( $case->{input}{treeData} ),
+      $case->{expected}, $case->{description}, );
+  }
+};
 
 done_testing;