[Rt-commit] r14694 - in rtfm/trunk: . t

[falcone at bestpractical.com]

Author: falcone
Date: Thu Jul 31 11:17:54 2008
New Revision: 14694

Modified:
   rtfm/trunk/   (props changed)
   rtfm/trunk/lib/RT/FM/Article.pm
   rtfm/trunk/lib/RT/FM/ArticleCollection.pm
   rtfm/trunk/lib/RT/FM/Article_Overlay.pm
   rtfm/trunk/lib/RT/FM/Class.pm
   rtfm/trunk/lib/RT/FM/ClassCollection.pm
   rtfm/trunk/lib/RT/FM/ObjectTopic.pm
   rtfm/trunk/lib/RT/FM/ObjectTopicCollection.pm
   rtfm/trunk/lib/RT/FM/Record.pm
   rtfm/trunk/lib/RT/FM/SearchBuilder.pm
   rtfm/trunk/lib/RT/FM/System.pm
   rtfm/trunk/lib/RT/FM/Topic.pm
   rtfm/trunk/t/00smoke.t
   rtfm/trunk/t/3upload-customfields.t

Log:
 r36536 at ketch:  falcone | 2008-07-31 11:17:22 -0400
 * shut up warnings during make test


Modified: rtfm/trunk/lib/RT/FM/Article.pm
==============================================================================
--- rtfm/trunk/lib/RT/FM/Article.pm	(original)
+++ rtfm/trunk/lib/RT/FM/Article.pm	Thu Jul 31 11:17:54 2008
@@ -65,6 +65,7 @@
 
 =cut
 
+no warnings 'redefine';
 package RT::FM::Article;
 use RT::FM::Record; 
 use RT::FM::Class;

Modified: rtfm/trunk/lib/RT/FM/ArticleCollection.pm
==============================================================================
--- rtfm/trunk/lib/RT/FM/ArticleCollection.pm	(original)
+++ rtfm/trunk/lib/RT/FM/ArticleCollection.pm	Thu Jul 31 11:17:54 2008
@@ -67,6 +67,7 @@
 
 =cut
 
+no warnings 'redefine';
 package RT::FM::ArticleCollection;
 
 use RT::FM::SearchBuilder;

Modified: rtfm/trunk/lib/RT/FM/Article_Overlay.pm
==============================================================================
--- rtfm/trunk/lib/RT/FM/Article_Overlay.pm	(original)
+++ rtfm/trunk/lib/RT/FM/Article_Overlay.pm	Thu Jul 31 11:17:54 2008
@@ -234,7 +234,8 @@
 
     my $temp = RT::FM::Article->new($RT::SystemUser);
     $temp->LoadByCols( Name => $name );
-    if ( $temp->id && $temp->id != $self->id ) {
+    if ( $temp->id && 
+         (!$self->id || ($temp->id != $self->id ))) {
         return (undef);
     }
 

Modified: rtfm/trunk/lib/RT/FM/Class.pm
==============================================================================
--- rtfm/trunk/lib/RT/FM/Class.pm	(original)
+++ rtfm/trunk/lib/RT/FM/Class.pm	Thu Jul 31 11:17:54 2008
@@ -65,6 +65,7 @@
 
 =cut
 
+no warnings 'redefine';
 package RT::FM::Class;
 use RT::FM::Record; 
 

Modified: rtfm/trunk/lib/RT/FM/ClassCollection.pm
==============================================================================
--- rtfm/trunk/lib/RT/FM/ClassCollection.pm	(original)
+++ rtfm/trunk/lib/RT/FM/ClassCollection.pm	Thu Jul 31 11:17:54 2008
@@ -67,6 +67,7 @@
 
 =cut
 
+no warnings 'redefine';
 package RT::FM::ClassCollection;
 
 use RT::FM::SearchBuilder;

Modified: rtfm/trunk/lib/RT/FM/ObjectTopic.pm
==============================================================================
--- rtfm/trunk/lib/RT/FM/ObjectTopic.pm	(original)
+++ rtfm/trunk/lib/RT/FM/ObjectTopic.pm	Thu Jul 31 11:17:54 2008
@@ -65,6 +65,7 @@
 
 =cut
 
+no warnings 'redefine';
 package RT::FM::ObjectTopic;
 use RT::FM::Record; 
 use RT::FM::Topic;

Modified: rtfm/trunk/lib/RT/FM/ObjectTopicCollection.pm
==============================================================================
--- rtfm/trunk/lib/RT/FM/ObjectTopicCollection.pm	(original)
+++ rtfm/trunk/lib/RT/FM/ObjectTopicCollection.pm	Thu Jul 31 11:17:54 2008
@@ -67,6 +67,7 @@
 
 =cut
 
+no warnings 'redefine';
 package RT::FM::ObjectTopicCollection;
 
 use RT::FM::SearchBuilder;

Modified: rtfm/trunk/lib/RT/FM/Record.pm
==============================================================================
--- rtfm/trunk/lib/RT/FM/Record.pm	(original)
+++ rtfm/trunk/lib/RT/FM/Record.pm	Thu Jul 31 11:17:54 2008
@@ -61,6 +61,7 @@
 =cut
 
 
+no warnings 'redefine';
 package RT::FM::Record;
 use  base qw(RT::Record);
 use RT::FM;

Modified: rtfm/trunk/lib/RT/FM/SearchBuilder.pm
==============================================================================
--- rtfm/trunk/lib/RT/FM/SearchBuilder.pm	(original)
+++ rtfm/trunk/lib/RT/FM/SearchBuilder.pm	Thu Jul 31 11:17:54 2008
@@ -59,6 +59,7 @@
 
 =cut
 
+no warnings 'redefine';
 package RT::FM::SearchBuilder;
 use base qw(RT::SearchBuilder);
 use RT::FM;

Modified: rtfm/trunk/lib/RT/FM/System.pm
==============================================================================
--- rtfm/trunk/lib/RT/FM/System.pm	(original)
+++ rtfm/trunk/lib/RT/FM/System.pm	Thu Jul 31 11:17:54 2008
@@ -65,6 +65,7 @@
 =cut
 
 
+no warnings 'redefine';
 package RT::FM::System;
 use RT::ACL;
 use base qw /RT::Base/;

Modified: rtfm/trunk/lib/RT/FM/Topic.pm
==============================================================================
--- rtfm/trunk/lib/RT/FM/Topic.pm	(original)
+++ rtfm/trunk/lib/RT/FM/Topic.pm	Thu Jul 31 11:17:54 2008
@@ -65,6 +65,7 @@
 
 =cut
 
+no warnings 'redefine';
 package RT::FM::Topic;
 use RT::FM::Record; 
 

Modified: rtfm/trunk/t/00smoke.t
==============================================================================
--- rtfm/trunk/t/00smoke.t	(original)
+++ rtfm/trunk/t/00smoke.t	Thu Jul 31 11:17:54 2008
@@ -11,6 +11,6 @@
 
 use File::Find;
 File::Find::find({wanted => \&wanted}, 'lib');
-sub wanted { /^.*\.pm\z/s && $_ !~ /Overlay/ && ok(require $_, "Requiring '$_'"); }
+sub wanted { /^.*\.pm\z/s && $_ !~ /Overlay/ && require_ok($_) };
 
 

Modified: rtfm/trunk/t/3upload-customfields.t
==============================================================================
--- rtfm/trunk/t/3upload-customfields.t	(original)
+++ rtfm/trunk/t/3upload-customfields.t	Thu Jul 31 11:17:54 2008
@@ -71,7 +71,7 @@
 $tcf =~ /(\d+)$/ or die "Hey this is impossible dude";
 my $upload_field = "Object-RT::FM::Article--CustomField-$1-Upload";
 
-diag("Uploading an image to $upload_field");
+diag("Uploading an image to $upload_field") if $ENV{TEST_VERBOSE};
 
 $m->submit_form(
     form_name => "EditArticle",