Remove support for report_class_{suppressions,analysis} in tools

And let subclasses handle them by only implementing report_class().

diff --git a/lib/Test/Valgrind/Tool.pm b/lib/Test/Valgrind/Tool.pm
index a82b95d676632a0f65c0e6d632375908b6ab3105..147ee1109b00dc25851b6b8492f1d9d4c3ab50dd 100644 (file)
--- a/lib/Test/Valgrind/Tool.pm
+++ b/lib/Test/Valgrind/Tool.pm
@@ -73,39 +73,13 @@ sub new_trainer { }
 
 =head2 C<report_class $session>
 
-Wraps around either L</report_class_suppressions> or L</report_class_analysis> depending on the running mode of the C<$session>.
-
-=cut
-
-sub report_class {
- my ($self, $sess) = @_;
-
- if ($sess->do_suppressions) {
-  $self->report_class_suppressions($sess);
- } else {
-  $self->report_class_analysis($sess);
- }
-}
-
-=head2 C<report_class_suppressions $session>
-
 Returns the class in which suppression reports generated by this tool will be blessed.
 
 This method must be implemented when subclassing.
 
 =cut
 
-sub report_class_suppression;
-
-=head2 C<report_class_analysis $session>
-
-Returns the class in which error reports generated by this tool will be blessed.
-
-This method must be implemented when subclassing.
-
-=cut
-
-sub report_class_analysis;
+sub report_class;
 
 =head2 C<args $session>
 

diff --git a/lib/Test/Valgrind/Tool/memcheck.pm b/lib/Test/Valgrind/Tool/memcheck.pm
index e75f0c0dd0dda9492d35666052f1d588dbd952f5..1302efefc3750ed7b3af24b088382dacb3b78340 100644 (file)
--- a/lib/Test/Valgrind/Tool/memcheck.pm
+++ b/lib/Test/Valgrind/Tool/memcheck.pm
@@ -73,13 +73,18 @@ sub callers { $_[0]->{callers} }
 
 sub suppressions_tag { 'memcheck-' . $_[1]->version }
 
-=head2 C<report_class_analysis $session>
+=head2 C<report_class $session>
 
 This tool emits C<Test::Valgrind::Tool::memcheck::Report> object reports in analysis mode.
 
 =cut
 
-sub report_class_analysis { 'Test::Valgrind::Tool::memcheck::Report' }
+sub report_class {
+ my ($self, $session) = @_;
+
+ $session->do_suppressions ? 'Test::Valgrind::Report::Suppressions'
+                           : 'Test::Valgrind::Tool::memcheck::Report'
+}
 
 sub args {
  my $self = shift;