X-Git-Url: http://git.shiar.net/perl/list-index.git/blobdiff_plain/ab9917512865cf7070b364a1b0f07f32a3b49e3f..1c331324738bb8ca05889f1a7baa5e1b40595d38:/t/10-ranges.t

diff --git a/t/10-ranges.t b/t/10-ranges.t
index 66edf76..ef292b1 100644
--- a/t/10-ranges.t
+++ b/t/10-ranges.t
@@ -2,54 +2,54 @@
 use strict;
 use warnings;
 
-use Test::More tests => 16;
+use Test::More tests => 6;
 use Test::NoWarnings;
 use Data::Dump 'pp';
 
 BEGIN { use_ok('List::Index'); }
 ok(eval { List::Index->VERSION(1) }, 'version 1.00 compatibility');
 
-{
-my @uniform = 'a'..'z';
-ok(my $index = List::Index->new(\@uniform), 'object (single-char values)');
-is_deeply(\@uniform, ['a'..'z'], 'original data unaltered');
-is_deeply($index->ranges, [['','']], 'single page');
-is_deeply($index->ranges({pages => 3}), [map { [split /-/, $_, 3] } qw(
-	-h i-q r-
-)], 'given pages');
-is_deeply($index->ranges({pagesize => @uniform / 2.1}), [map { [split /-/, $_, 2] } qw(
-	-h i-q r-
-)], 'equivalent pagesize');
-}
-
-{
-ok(my $index = List::Index->new(['aa'..'zz', 1..193]), 'non-alphabetic values (uniform)');
-is_deeply($index->ranges, [map { [split /-/, $_, 2] } qw(
-	-. . . .
-	a-b c-dr ds-fn fo-hk hl-jg jh-k l-m n-o p-qr qs-sn so-uk ul-wg wh-x y-
-)], 'default ranges');
-is_deeply($index->ranges({pagesize => 300}), [map { [split /-/, $_, 2] } qw(
-	-c d-o p-
-)], 'large pagesize');
-}
-
-{
-ok(my $index = List::Index->new([qw(
-	baa1 baa2  baa3 baaa  bbc cbc  daaa ea  eaaa zed
-)]), 'variable length values');
-is_deeply($index->ranges({pagesize => 2, context => 0}), [
-	map { [split /-/, $_, 2] } qw(-baa. baa.-bbb bbc-daa. daaa-eaa. eaaa-)
-], 'no context');
-is_deeply($index->ranges({pagesize => 2}), [
-	map { [split /-/, $_, 2] } qw(-a b c d-ea. eaa-)
-], 'default context');  # context should be 1
-is_deeply($index->ranges({pagesize => 2, context => 2}), [
-	map { [split /-/, $_, 2] } qw(-a b-c d-c d e-)
-], 'overlap');  # first item equals second due to large context
-is_deeply($index->ranges({pagesize => 2, length => 1}), [
-	map { [split /-/, $_, 2] } qw(-a b-a b-c d e-)
-], 'single char');
-
-#pp($index->ranges({pagesize => 2, context => 2, length => 1}));
-}
+subtest 'single-char alphabet' => sub {
+	plan tests => 4;
+	my @uniform = 'a'..'z';
+	my $index = List::Index->new(\@uniform) or return;
+	is_deeply(\@uniform, ['a'..'z'], 'original data unaltered');
+	is_deeply($index->ranges, ['-'], 'single page');
+	is_deeply($index->ranges({pages => 3}), [qw(-i j-q r-)], 'given pages');
+	is_deeply($index->ranges({pagesize => @uniform / 2.1}), [qw(
+		-i j-q r-
+	)], 'equivalent pagesize');
+};
+
+subtest 'uniform alphanumeric' => sub {
+	plan tests => 2;
+	my $index = List::Index->new(['aa'..'zz', 1..202]) or return;
+	is_deeply($index->ranges, [qw(
+		-.
+		.-bp bq-dm dn-fi fj-hf hg-i j-k l-m n-os ot-qp qq-sm sn-uj uk-wf wg-x y-
+
+	)], 'default ranges');
+	is_deeply($index->ranges({pagesize => 300}), [qw(-c d-n o-)], 'large pagesize');
+};
+
+subtest 'context' => sub {
+	plan tests => 4;
+	my $index = List::Index->new([qw(
+		baa1 baa2  baa3 baaa  bbc cbc  daaa ea  eaaa zed
+	)]) or return;
+	is_deeply($index->ranges({pagesize => 2, context => 0}), [
+		qw(-baa. baa.-bbb bbc-daa. daaa-eaa. eaaa-)
+	], 'no context');
+	is_deeply($index->ranges({pagesize => 2}), [
+		qw(-a b c d e-)
+	], 'default context');  # context should be 1
+	is_deeply($index->ranges({pagesize => 2, context => 2}), [
+		qw(-a b-c d e-)
+	], 'overlap');  # first item equals second due to large context
+	is_deeply($index->ranges({pagesize => 2, context => 0, length => 1}), [
+		qw(-a b-c d e-)
+	], 'single char');
+
+	#pp($index->ranges({pagesize => 2, context => 2, length => 1}));
+};