Moved match changing operations to Enrich::*
diff --git a/t/result/segment/fields.t b/t/result/segment/enrich_fields.t
similarity index 92%
rename from t/result/segment/fields.t
rename to t/result/segment/enrich_fields.t
index 4f4ae77..5bba4a6 100644
--- a/t/result/segment/fields.t
+++ b/t/result/segment/enrich_fields.t
@@ -5,7 +5,7 @@
use_ok('Krawfish::Index');
use_ok('Krawfish::Koral::Query::Builder');
-use_ok('Krawfish::Result::Segment::Fields');
+use_ok('Krawfish::Result::Segment::Enrich::Fields');
my $index = Krawfish::Index->new;
ok_index($index, {
@@ -28,7 +28,7 @@
my $query = $kq->token('aa');
# Get fields object
-ok(my $fields = Krawfish::Result::Segment::Fields->new(
+ok(my $fields = Krawfish::Result::Segment::Enrich::Fields->new(
$index,
$query->normalize->finalize->optimize($index),
[qw/license corpus/]
@@ -49,7 +49,7 @@
# Get fields object
-ok($fields = Krawfish::Result::Segment::Fields->new(
+ok($fields = Krawfish::Result::Segment::Enrich::Fields->new(
$index,
$query->normalize->finalize->optimize($index),
[qw/license corpus/]
diff --git a/t/result/highlights.t b/t/result/segment/enrich_highlights.t
similarity index 75%
rename from t/result/highlights.t
rename to t/result/segment/enrich_highlights.t
index 4d620e0..4b71819 100644
--- a/t/result/highlights.t
+++ b/t/result/segment/enrich_highlights.t
@@ -4,12 +4,12 @@
use warnings;
use_ok('Krawfish::Index');
-use_ok('Krawfish::Result::Snippet::Highlights');
+use_ok('Krawfish::Result::Segment::Enrich::Snippet::Highlights');
my $index = Krawfish::Index->new;
ok_index($index, [qw/aa bb aa bb/], 'Add new document');
-my $highlights = Krawfish::Result::Snippet::Highlights->new(
+my $highlights = Krawfish::Result::Segment::Enrich::Snippet::Highlights->new(
[2,3] => $index->subtokens
);
diff --git a/t/result/snippet.t b/t/result/segment/enrich_snippet.t
similarity index 90%
rename from t/result/snippet.t
rename to t/result/segment/enrich_snippet.t
index 12027f6..5afdf65 100644
--- a/t/result/snippet.t
+++ b/t/result/segment/enrich_snippet.t
@@ -5,7 +5,7 @@
use_ok('Krawfish::Index');
use_ok('Krawfish::Koral::Query::Builder');
-use_ok('Krawfish::Result::Snippet');
+use_ok('Krawfish::Result::Segment::Enrich::Snippet');
my $index = Krawfish::Index->new;
ok_index($index, {
@@ -24,7 +24,7 @@
is($prepare->to_string, "or('aa','bb')", 'Stringification');
# Get facets object
-ok(my $snippet = Krawfish::Result::Snippet->new(
+ok(my $snippet = Krawfish::Result::Segment::Enrich::Snippet->new(
query => $prepare,
index => $index
), 'Create count object');
diff --git a/t/result/segment/enrich_snippet_elements.t b/t/result/segment/enrich_snippet_elements.t
new file mode 100644
index 0000000..5023266
--- /dev/null
+++ b/t/result/segment/enrich_snippet_elements.t
@@ -0,0 +1,17 @@
+use Test::More;
+use Test::Krawfish;
+use strict;
+use warnings;
+
+use_ok('Krawfish::Result::Segment::Enrich::Snippet::Spans');
+
+my $spans = Krawfish::Result::Segment::Enrich::Snippet::Spans->new;
+
+$spans->add_text('Der')->add_text(' ')->add_text('alte');
+
+is($spans->to_html, 'Der alte', 'HTML');
+
+
+done_testing;
+
+1;
diff --git a/t/result/snippet_elements.t b/t/result/snippet_elements.t
deleted file mode 100644
index b326f73..0000000
--- a/t/result/snippet_elements.t
+++ /dev/null
@@ -1,17 +0,0 @@
-use Test::More;
-use Test::Krawfish;
-use strict;
-use warnings;
-
-use_ok('Krawfish::Result::Snippet::Spans');
-
-my $spans = Krawfish::Result::Snippet::Spans->new;
-
-$spans->add_text('Der')->add_text(' ')->add_text('alte');
-
-is($spans->to_html, 'Der alte', 'HTML');
-
-
-done_testing;
-
-1;
diff --git a/t/result/sort_priority_cascade.t b/t/result/sort_priority_cascade.t
index 455cf35..e6dc88e 100644
--- a/t/result/sort_priority_cascade.t
+++ b/t/result/sort_priority_cascade.t
@@ -6,7 +6,7 @@
use_ok('Krawfish::Index');
use_ok('Krawfish::Koral::Query::Builder');
use_ok('Krawfish::Result::Sort::PriorityCascade');
-use_ok('Krawfish::Result::Segment::Fields');
+use_ok('Krawfish::Result::Segment::Enrich::Fields');
my $index = Krawfish::Index->new;
@@ -44,7 +44,7 @@
), 'Create sort object');
-ok(my $sort_fields = Krawfish::Result::Segment::Fields->new(
+ok(my $sort_fields = Krawfish::Result::Segment::Enrich::Fields->new(
$index,
$sort,
['author', 'docID']