[Rt-commit] rt branch, 3.9-merge-rtfm, updated. rt-3.9.6-1069-g9da2ae9

Shawn Moore sartak at bestpractical.com
Thu Dec 2 21:35:31 EST 2010


The branch, 3.9-merge-rtfm has been updated
       via  9da2ae9042f7c95a981f31032e0aa340e9593e54 (commit)
      from  bcaa2359e4f230c7015dfdf9d0baa299eeea6684 (commit)

Summary of changes:
 share/html/Articles/Elements/GotoArticle   |    4 +-
 share/html/Articles/Elements/ShowTopic     |    2 +-
 share/html/Search/Elements/Article         |    2 +-
 share/html/SelfService/Article/Search.html |    6 ++--
 t/articles/article.t                       |   48 ++++++++++++++--------------
 t/articles/articles.t                      |   46 +++++++++++++-------------
 t/articles/basic-api.t                     |   16 +++++-----
 t/articles/cfsearch.t                      |   18 +++++-----
 t/articles/class.t                         |   14 ++++----
 t/articles/interface.t                     |   44 +++++++++++++-------------
 t/articles/search-interface.t              |   20 ++++++------
 t/articles/upload-customfields.t           |    8 ++--
 t/articles/uri-a.t                         |    6 ++--
 t/articles/uri-rtfm.t                      |    4 +-
 14 files changed, 119 insertions(+), 119 deletions(-)

- Log -----------------------------------------------------------------
commit 9da2ae9042f7c95a981f31032e0aa340e9593e54
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Thu Dec 2 21:35:21 2010 -0500

    Remove ::FM from classnames

diff --git a/share/html/Articles/Elements/GotoArticle b/share/html/Articles/Elements/GotoArticle
index ccf9dd8..d84a2a5 100644
--- a/share/html/Articles/Elements/GotoArticle
+++ b/share/html/Articles/Elements/GotoArticle
@@ -54,8 +54,8 @@
 <option value="<% $topic %>">in this topic</option>
 % }
 % if ($class) {
-% my $Topics = RT::FM::Topics->new($session{'CurrentUser'});
-% $Topics->Limit(FIELD => 'ObjectType', VALUE => 'RT::FM::Class');
+% my $Topics = RT::Topics->new($session{'CurrentUser'});
+% $Topics->Limit(FIELD => 'ObjectType', VALUE => 'RT::Class');
 % $Topics->Limit(FIELD => 'ObjectId',   VALUE => $class);
 % my @topics;
 % push @topics, $_->Id while $_ = $Topics->Next;
diff --git a/share/html/Articles/Elements/ShowTopic b/share/html/Articles/Elements/ShowTopic
index b11def5..0e82c18 100644
--- a/share/html/Articles/Elements/ShowTopic
+++ b/share/html/Articles/Elements/ShowTopic
@@ -46,7 +46,7 @@
 %#%# END BPS TAGGED BLOCK }}}
 % for (@path) {
 %# this isn't always a class, it can be the system object
-% my $class_id = ($_->ObjectType eq 'RT::FM::Class' ? $_->ObjectId : 0 );
+% my $class_id = ($_->ObjectType eq 'RT::Class' ? $_->ObjectId : 0 );
 <% $_->ParentObj->Id ? " > " : "" %><a href="<% RT->Config->Get('WebPath') %>/Articles/Topics.html?class=<% $class_id %>&id=<% $_->Id %>"><% $_->Name || loc("(no name)") %></a>
 % }
 
diff --git a/share/html/Search/Elements/Article b/share/html/Search/Elements/Article
index b32992e..2837155 100644
--- a/share/html/Search/Elements/Article
+++ b/share/html/Search/Elements/Article
@@ -59,6 +59,6 @@
     &>
 <%INIT>
 my $QueryString = "?".$m->comp('/Elements/QueryString', %{$ARGS{args}});
-my $articles = RT::FM::Articles->new( $session{CurrentUser} );
+my $articles = RT::Articles->new( $session{CurrentUser} );
 $articles->Search( %{$ARGS{args}} );
 </%INIT>
diff --git a/share/html/SelfService/Article/Search.html b/share/html/SelfService/Article/Search.html
index dc5fef9..4394cbd 100644
--- a/share/html/SelfService/Article/Search.html
+++ b/share/html/SelfService/Article/Search.html
@@ -86,10 +86,10 @@
 % }
 </table>
 <%init>
-use RT::FM::Articles;
+use RT::Articles;
 
-my $articles_content = RT::FM::Articles->new( $session{'CurrentUser'} );
-my $articles_basics = RT::FM::Articles->new( $session{'CurrentUser'} );
+my $articles_content = RT::Articles->new( $session{'CurrentUser'} );
+my $articles_basics = RT::Articles->new( $session{'CurrentUser'} );
 if ( $ARGS{'Articles_Content'} ) {
     $articles_content->LimitCustomField( VALUE => $ARGS{'Articles_Content'},
                                                 OPERATOR => 'LIKE' );
diff --git a/t/articles/article.t b/t/articles/article.t
index d1a4f69..41b2629 100644
--- a/t/articles/article.t
+++ b/t/articles/article.t
@@ -5,15 +5,15 @@ use warnings;
 
 use RT::Test tests => 70;
 
-use_ok 'RT::FM::Articles';
-use_ok 'RT::FM::Classes';
-use_ok 'RT::FM::Class';
+use_ok 'RT::Articles';
+use_ok 'RT::Classes';
+use_ok 'RT::Class';
 
 my $CLASS = 'ArticleTest-'.$$;
 
 my $user = RT::CurrentUser->new('root');
 
-my $class = RT::FM::Class->new($user);
+my $class = RT::Class->new($user);
 
 
 my ($id, $msg) = $class->Create(Name =>$CLASS);
@@ -21,9 +21,9 @@ ok ($id, $msg);
 
 
 
-my $article = RT::FM::Article->new($user);
-ok (UNIVERSAL::isa($article, 'RT::FM::Article'));
-ok (UNIVERSAL::isa($article, 'RT::FM::Record'));
+my $article = RT::Article->new($user);
+ok (UNIVERSAL::isa($article, 'RT::Article'));
+ok (UNIVERSAL::isa($article, 'RT::Record'));
 ok (UNIVERSAL::isa($article, 'RT::Record'));
 ok (UNIVERSAL::isa($article, 'DBIx::SearchBuilder::Record') , "It's a searchbuilder record!");
 
@@ -32,7 +32,7 @@ ok (UNIVERSAL::isa($article, 'DBIx::SearchBuilder::Record') , "It's a searchbuil
 ok ($id, $msg);
 $article->Load($id);
 is ($article->Summary, $CLASS, "The summary is set correct");
-my $at = RT::FM::Article->new($RT::SystemUser);
+my $at = RT::Article->new($RT::SystemUser);
 $at->Load($id);
 is ($at->id , $id);
 is ($at->Summary, $article->Summary);
@@ -40,17 +40,17 @@ is ($at->Summary, $article->Summary);
 
 
 
-my  $a1 = RT::FM::Article->new($RT::SystemUser);
+my  $a1 = RT::Article->new($RT::SystemUser);
  ($id, $msg)  = $a1->Create(Class => $class->id, Name => 'ValidateNameTest'.$$);
 ok ($id, $msg);
 
 
 
-my  $a2 = RT::FM::Article->new($RT::SystemUser);
+my  $a2 = RT::Article->new($RT::SystemUser);
 ($id, $msg)  = $a2->Create(Class => $class->id, Name => 'ValidateNameTest'.$$);
 ok (!$id, $msg);
 
-my  $a3 = RT::FM::Article->new($RT::SystemUser);
+my  $a3 = RT::Article->new($RT::SystemUser);
 ($id, $msg)  = $a3->Create(Class => $class->id, Name => 'ValidateNameTest2'.$$);
 ok ($id, $msg);
 ($id, $msg) =$a3->SetName('ValidateNameTest'.$$);
@@ -65,32 +65,32 @@ ok ($id, $msg);
 
 
 
-my $newart = RT::FM::Article->new($RT::SystemUser);
+my $newart = RT::Article->new($RT::SystemUser);
 $newart->Create(Name => 'DeleteTest'.$$, Class => '1');
 $id = $newart->Id;
 
 ok($id, "New article has an id");
 
 
- $article = RT::FM::Article->new($RT::SystemUser);
+ $article = RT::Article->new($RT::SystemUser);
 $article->Load($id);
 ok ($article->Id, "Found the article");
 my $val;
  ($val, $msg) = $article->Delete();
 ok ($val, "Article Deleted: $msg");
 
- $a2 = RT::FM::Article->new($RT::SystemUser);
+ $a2 = RT::Article->new($RT::SystemUser);
 $a2->Load($id);
 ok (!$a2->Id, "Did not find the article");
 
 # NOT OK
 #$RT::Handle->SimpleQuery("DELETE FROM Links");
 
-my $article_a = RT::FM::Article->new($RT::SystemUser);
+my $article_a = RT::Article->new($RT::SystemUser);
 ($id, $msg) = $article_a->Create( Class => $CLASS, Summary => "ArticleTestlink1".$$);
 ok($id,$msg);
 
-my $article_b = RT::FM::Article->new($RT::SystemUser);
+my $article_b = RT::Article->new($RT::SystemUser);
 ($id, $msg) = $article_b->Create( Class => $CLASS, Summary => "ArticleTestlink2".$$);
 ok($id,$msg);
 
@@ -105,7 +105,7 @@ my $first = $refers_to_b->First;
 ok ($first->isa('RT::Link'), "IT's an RT link - ref ".ref($first) );
 ok ($first->TargetObj->Id == $article_b->Id, "Its target is B");
 
-ok($refers_to_b->First->BaseObj->isa('RT::FM::Article'), "Yep. its an article");
+ok($refers_to_b->First->BaseObj->isa('RT::Article'), "Yep. its an article");
 
 
 # Make sure that Article A's "RefersTo" links object refers to this article"
@@ -116,7 +116,7 @@ ok ($first->isa('RT::Link'), "IT's an RT link - ref ".ref($first) );
 ok ($first->TargetObj->Id == $article_b->Id, "Its target is B - " . $first->TargetObj->Id);
 ok ($first->BaseObj->Id == $article_a->Id, "Its base is A");
 
-ok($referred_To_by_a->First->BaseObj->isa('RT::FM::Article'), "Yep. its an article");
+ok($referred_To_by_a->First->BaseObj->isa('RT::Article'), "Yep. its an article");
 
 # Delete the link
 ($id, $msg) = $article_a->DeleteLink(Type => 'RefersTo', Target => $article_b->URI);
@@ -148,10 +148,10 @@ ok ($tix->First->Id == $tick->id, "It's even the right one");
 
 
 # Find all articles which refer to Ticket 1
-use RT::FM::Articles;
+use RT::Articles;
 
-my $articles = RT::FM::Articles->new($RT::SystemUser);
-ok($articles->isa('RT::FM::Articles'), "Created an article collection");
+my $articles = RT::Articles->new($RT::SystemUser);
+ok($articles->isa('RT::Articles'), "Created an article collection");
 ok($articles->isa('RT::SearchBuilder'), "Created an article collection");
 ok($articles->isa('DBIx::SearchBuilder'), "Created an article collection");
 ok($tick->URI, "The ticket does still have a URI");
@@ -195,7 +195,7 @@ ok ($id, $msg);
 
 
 
-my $art = RT::FM::Article->new($RT::SystemUser);
+my $art = RT::Article->new($RT::SystemUser);
 ($id, $msg) = $art->Create (Class => $CLASS);
 ok ($id,$msg);
 
@@ -205,7 +205,7 @@ ok($art->__Value('URI') eq $art->URI, "The uri in the db is set correctly");
 
 
 
- $art = RT::FM::Article->new($RT::SystemUser);
+ $art = RT::Article->new($RT::SystemUser);
 ($id, $msg) = $art->Create (Class => $CLASS);
 ok ($id,$msg);
 
@@ -214,7 +214,7 @@ ok($art->__Value('URI') eq $art->URIObj->URI, "The uri in the db is set correctl
 
 
 my $art_id = $art->id;
-$art = RT::FM::Article->new($RT::SystemUser);
+$art = RT::Article->new($RT::SystemUser);
 $art->Load($art_id);
 ok ($art->Id == $art_id, "Loaded article 1");
 my $s =$art->Summary;
diff --git a/t/articles/articles.t b/t/articles/articles.t
index f8ea114..7bae29b 100644
--- a/t/articles/articles.t
+++ b/t/articles/articles.t
@@ -5,11 +5,11 @@ use warnings;
 
 use RT::Test tests => 32;
 
-use_ok 'RT::FM::Articles';
-use_ok 'RT::FM::Classes';
-use_ok 'RT::FM::Class';
+use_ok 'RT::Articles';
+use_ok 'RT::Classes';
+use_ok 'RT::Class';
 
-my $class = RT::FM::Class->new($RT::SystemUser);
+my $class = RT::Class->new($RT::SystemUser);
 my ( $id, $msg ) = $class->Create( Name => 'CollectionTest-' . $$ );
 ok( $id, $msg );
 
@@ -20,7 +20,7 @@ isa_ok($cf, 'RT::CustomField');
 
 ($id,$msg) = $cf->Create( Name => 'FM::Sample-'.$$,
              Description => 'Test text cf',
-             LookupType => RT::FM::Article->CustomFieldLookupType,
+             LookupType => RT::Article->CustomFieldLookupType,
              Type => 'Freeform'
              );
 
@@ -34,7 +34,7 @@ ok ($id,$msg);
 
 
 
-my $art = RT::FM::Article->new($RT::SystemUser);
+my $art = RT::Article->new($RT::SystemUser);
 ( $id, $msg ) = $art->Create(
     Class   => $class->id,
     Name    => 'Collection-1-' . $$,
@@ -49,25 +49,25 @@ ok( $id, $msg );
 
 
 
-my $arts = RT::FM::Articles->new($RT::SystemUser);
+my $arts = RT::Articles->new($RT::SystemUser);
 $arts->LimitName( VALUE => 'Collection-1-' . $$ . 'fake' );
 is( $arts->Count, 0,
     "Found no artlcles with names matching something that is not there" );
 
-my $arts2 = RT::FM::Articles->new($RT::SystemUser);
+my $arts2 = RT::Articles->new($RT::SystemUser);
 $arts2->LimitName( VALUE => 'Collection-1-' . $$ );
 is( $arts2->Count, 1, 'Found one with names matching the word "test"' );
 
-$arts = RT::FM::Articles->new($RT::SystemUser);
+$arts = RT::Articles->new($RT::SystemUser);
 $arts->LimitSummary( VALUE => 'Coll-1-' . $$ . 'fake' );
 is( $arts->Count, 0,
     'Found no artlcles with summarys matching something that is not there' );
 
-$arts2 = RT::FM::Articles->new($RT::SystemUser);
+$arts2 = RT::Articles->new($RT::SystemUser);
 $arts2->LimitSummary( VALUE => 'Coll-1-' . $$ );
 is( $arts2->Count, 1, 'Found one with summarys matching the word "Coll-1"' );
 
-my $new_art = RT::FM::Article->new($RT::SystemUser);
+my $new_art = RT::Article->new($RT::SystemUser);
 ( $id, $msg ) = $new_art->Create(
     Class          => $class->id,
     Name           => 'CFSearchTest1' . $$,
@@ -77,34 +77,34 @@ my $new_art = RT::FM::Article->new($RT::SystemUser);
 ok( $id, $msg . " Created a second testable article" );
 
 
-$arts = RT::FM::Articles->new($RT::SystemUser);
+$arts = RT::Articles->new($RT::SystemUser);
 $arts->LimitCustomField( OPERATOR => 'LIKE', VALUE => "esting".$$ );
 is( $arts->Count, 1, "Found 1 cf values matching 'esting" . $$ . "' for an unspecified field");
 
-$arts = RT::FM::Articles->new($RT::SystemUser);
+$arts = RT::Articles->new($RT::SystemUser);
 $arts->LimitCustomField( OPERATOR => '=', VALUE => "esting".$$ );
 is( $arts->Count, 0, "Found 0 cf values EXACTLY matching 'esting" . $$ . "' for an unspecified field");
 
-$arts = RT::FM::Articles->new($RT::SystemUser);
+$arts = RT::Articles->new($RT::SystemUser);
 $arts->LimitCustomField( OPERATOR => '=', VALUE => "testing".$$ );
 is( $arts->Count, 1, "Found 0 cf values EXACTLY matching 'testing" . $$ . "' for an unspecified field");
 
 
-$arts = RT::FM::Articles->new($RT::SystemUser);
+$arts = RT::Articles->new($RT::SystemUser);
 $arts->LimitCustomField( OPERATOR => 'LIKE', VALUE => $$ );
 is( $arts->Count, 2, "Found 1 cf values matching '" . $$ . "' for an unspecified field");
 
 
 # Test searching on named custom fields
-$arts = RT::FM::Articles->new($RT::SystemUser);
+$arts = RT::Articles->new($RT::SystemUser);
 $arts->LimitCustomField( OPERATOR => 'LIKE', VALUE => $$, FIELD => $cf->Name );
 is( $arts->Count, 2, "Found 1 Article with cf values matching '".$$."' for CF named " .$cf->Name);
 
-$arts = RT::FM::Articles->new($RT::SystemUser);
+$arts = RT::Articles->new($RT::SystemUser);
 $arts->LimitCustomField( OPERATOR => 'LIKE', VALUE => $$, FIELD => 'NO-SUCH-CF' );
 is( $arts->Count,0, "Found no cf values matching '".$$."' for CF 'NO-SUCH-CF'  " );
 
-$arts = RT::FM::Articles->new($RT::SystemUser);
+$arts = RT::Articles->new($RT::SystemUser);
 $arts->Limit(FIELD =>'Class', VALUE => $class->id);
         
 $arts->LimitCustomField(
@@ -116,22 +116,22 @@ is(
     $arts->Count ,2,
     "Found 1 articles with custom field values not matching blah");
 
-$arts = RT::FM::Articles->new($RT::SystemUser);
+$arts = RT::Articles->new($RT::SystemUser);
 $arts->Limit(FIELD =>'Class', VALUE => $class->id);
 $arts->LimitCustomField( OPERATOR => 'NOT LIKE', VALUE => 'est', FIELD => $cf->id );
 is( $arts->Count , 0, "Found 0 cf values not matching 'est' for CF  ".$cf->id. " " . join(',', map {$_->id} @{$arts->ItemsArrayRef}));
-$arts = RT::FM::Articles->new($RT::SystemUser);
+$arts = RT::Articles->new($RT::SystemUser);
 $arts->Limit(FIELD =>'Class', VALUE => $class->id);
 $arts->LimitCustomField( OPERATOR => 'NOT LIKE', VALUE => 'BOGUS', FIELD => $cf->id );
 is( $arts->Count , 2, "Found 2 articles not matching 'BOGUS' for CF  ".$cf->id);
 
-my $ac = RT::FM::Articles->new($RT::SystemUser);
-ok( $ac->isa('RT::FM::Articles') );
+my $ac = RT::Articles->new($RT::SystemUser);
+ok( $ac->isa('RT::Articles') );
 ok( $ac->isa('DBIx::SearchBuilder') );
 ok( $ac->LimitRefersTo('http://dead.link') );
 ok( $ac->Count == 0 );
 
-$ac = RT::FM::Articles->new($RT::SystemUser);
+$ac = RT::Articles->new($RT::SystemUser);
 ok( $ac->LimitReferredToBy('http://dead.link') );
 ok( $ac->Count == 0 );
 
diff --git a/t/articles/basic-api.t b/t/articles/basic-api.t
index 88136d6..4342d0d 100644
--- a/t/articles/basic-api.t
+++ b/t/articles/basic-api.t
@@ -5,11 +5,11 @@ use strict;
 
 use RT::Test tests => 40;
 
-use_ok('RT::FM::Class');
+use_ok('RT::Class');
 
-my $class = RT::FM::Class->new($RT::SystemUser);
-isa_ok($class, 'RT::FM::Class');
-isa_ok($class, 'RT::FM::Record');
+my $class = RT::Class->new($RT::SystemUser);
+isa_ok($class, 'RT::Class');
+isa_ok($class, 'RT::Record');
 isa_ok($class, 'RT::Record');
 
 
@@ -37,7 +37,7 @@ isa_ok($cf, 'RT::CustomField');
 
 ($id,$msg) = $cf->Create( Name => 'FM::Sample-'.$$,
              Description => 'Test text cf',
-             LookupType => RT::FM::Article->CustomFieldLookupType,
+             LookupType => RT::Article->CustomFieldLookupType,
              Type => 'Text'
              );
 
@@ -70,9 +70,9 @@ ok ($id,$msg);
 
 
 
-use_ok('RT::FM::Article');
+use_ok('RT::Article');
 
-my $art = RT::FM::Article->new($RT::SystemUser);
+my $art = RT::Article->new($RT::SystemUser);
 ($id,$msg) =$art->Create(Class => $class->id,
              Name => 'Sample'.$$,
              Description => 'A sample article');
@@ -85,7 +85,7 @@ my $txns = $art->Transactions;
 
 is($txns->Count, 1, "One txn");
 my $txn = $txns->First;
-is ($txn->ObjectType, 'RT::FM::Article');
+is ($txn->ObjectType, 'RT::Article');
 is ($txn->ObjectId , $id ,  "It's the right article");
 is ($txn->Type, 'Create', "It's a create!");
 
diff --git a/t/articles/cfsearch.t b/t/articles/cfsearch.t
index 9d27abe..917bd9a 100644
--- a/t/articles/cfsearch.t
+++ b/t/articles/cfsearch.t
@@ -7,12 +7,12 @@ use RT::Test tests => 14;
 
 my $suffix = '-'. $$;
 
-use_ok 'RT::FM::Class';
-use_ok 'RT::FM::Article';
+use_ok 'RT::Class';
+use_ok 'RT::Article';
 use_ok 'RT::CustomField';
 
 my $classname = 'TestClass';
-my $class = RT::FM::Class->new( $RT::SystemUser );
+my $class = RT::Class->new( $RT::SystemUser );
 {
     $class->Load( $classname );
     unless ( $class->Id ) {
@@ -33,7 +33,7 @@ my $cf = RT::CustomField->new( $RT::SystemUser );
 {
     my ($id, $msg) = $cf->Create(
         Name => $cfname,
-        LookupType => 'RT::FM::Class-RT::FM::Article',
+        LookupType => 'RT::Class-RT::Article',
         Type => 'Select', MaxValues => 1,
         Description => 'singleselect cf for tests',
     );
@@ -58,18 +58,18 @@ my $cf = RT::CustomField->new( $RT::SystemUser );
 }
 
 my $article1name = 'TestArticle1'.$suffix;
-my $article1 = new RT::FM::Article($RT::SystemUser);
+my $article1 = new RT::Article($RT::SystemUser);
 $article1->Create( Name => $article1name, Summary => 'Test', Class => $class->Id);
 $article1->AddCustomFieldValue(Field => $cf->Id, Value => 'Value1');
 
 my $article2name = 'TestArticle2'.$suffix;
-my $article2 = new RT::FM::Article($RT::SystemUser);
+my $article2 = new RT::Article($RT::SystemUser);
 $article2->Create( Name => $article2name, Summary => 'Test', Class => $class->Id);
 $article2->AddCustomFieldValue(Field => $cf->Id, Value => 'Value2');
 
 # search for articles containing 1st value
 {
-    my $articles = RT::FM::Articles->new( $RT::SystemUser );
+    my $articles = RT::Articles->new( $RT::SystemUser );
     $articles->UnLimit;
     $articles->Limit( FIELD => "Class", SUBCLAUSE => 'ClassMatch', VALUE => $class->Id);
     $articles->LimitCustomField( FIELD => $cf->Id, VALUE => 'Value1' );
@@ -77,7 +77,7 @@ $article2->AddCustomFieldValue(Field => $cf->Id, Value => 'Value2');
 }
 
 {
-    my $articles = new RT::FM::Articles($RT::SystemUser);
+    my $articles = new RT::Articles($RT::SystemUser);
     $articles->UnLimit;
     $articles->Limit( FIELD => "Class", SUBCLAUSE => 'ClassMatch', VALUE => $class->Id);
     $articles->LimitCustomField( FIELD => $cf, VALUE => 'Value1' );    
@@ -85,7 +85,7 @@ $article2->AddCustomFieldValue(Field => $cf->Id, Value => 'Value2');
 }
 
 {
-    my $articles = new RT::FM::Articles($RT::SystemUser);
+    my $articles = new RT::Articles($RT::SystemUser);
     $articles->UnLimit( );
     $articles->Limit( FIELD => "Class", SUBCLAUSE => 'ClassMatch', VALUE => $class->Id);
     $articles->LimitCustomField( FIELD => $cf->Name, VALUE => 'Value1' );
diff --git a/t/articles/class.t b/t/articles/class.t
index 09abf23..26d9b23 100644
--- a/t/articles/class.t
+++ b/t/articles/class.t
@@ -5,9 +5,9 @@ use warnings;
 
 use RT::Test tests => 16;
 
-use_ok 'RT::FM::Articles';
-use_ok 'RT::FM::Classes';
-use_ok 'RT::FM::Class';
+use_ok 'RT::Articles';
+use_ok 'RT::Classes';
+use_ok 'RT::Class';
 
 $RT::SystemUser || die ;# just shut up the warning
 $RT::System     || die; # just shut up the warning;
@@ -15,8 +15,8 @@ $RT::System     || die; # just shut up the warning;
 
 my $root = RT::CurrentUser->new('root');
 ok ($root->Id, "Loaded root");
-my $cl = RT::FM::Class->new($root);
-ok (UNIVERSAL::isa($cl, 'RT::FM::Class'), "the new class is a class");
+my $cl = RT::Class->new($root);
+ok (UNIVERSAL::isa($cl, 'RT::Class'), "the new class is a class");
 
 my ($id, $msg) = $cl->Create(Name => 'Test-'.$$, Description => 'A test class');
 
@@ -47,8 +47,8 @@ $u->Create(Name => "RTFMTest".time, Privileged => 1);
 ok ($u->Id, "Created a new user");
 
 # Make sure you can't create a group with no acls
-$cl = RT::FM::Class->new($u);
-ok (UNIVERSAL::isa($cl, 'RT::FM::Class'), "the new class is a class");
+$cl = RT::Class->new($u);
+ok (UNIVERSAL::isa($cl, 'RT::Class'), "the new class is a class");
 
 ($id, $msg) = $cl->Create(Name => 'Test-nobody'.$$, Description => 'A test class');
 
diff --git a/t/articles/interface.t b/t/articles/interface.t
index 33361d8..0ea3ce1 100644
--- a/t/articles/interface.t
+++ b/t/articles/interface.t
@@ -9,9 +9,9 @@ use RT::CustomField;
 use RT::EmailParser;
 use RT::Queue;
 use RT::Ticket;
-use_ok 'RT::FM::Class';
-use_ok 'RT::FM::Topic';
-use_ok 'RT::FM::Article';
+use_ok 'RT::Class';
+use_ok 'RT::Topic';
+use_ok 'RT::Article';
 
 my ($url, $m) = RT::Test->started_ok;
 
@@ -19,46 +19,46 @@ my ($url, $m) = RT::Test->started_ok;
 my ($ret, $msg);
 
 # Create a test class
-my $class = RT::FM::Class->new($RT::SystemUser);
+my $class = RT::Class->new($RT::SystemUser);
 ($ret, $msg) = $class->Create('Name' => 'tlaTestClass-'.$$,
 			      'Description' => 'A general-purpose test class');
 ok($ret, "Test class created");
-my $class2 = RT::FM::Class->new($RT::SystemUser);
+my $class2 = RT::Class->new($RT::SystemUser);
 ($ret, $msg) = $class2->Create('Name' => 'tlaTestClass2-'.$$,
 			      'Description' => 'Another general-purpose test class');
 ok($ret, "Test class 2 created");
 
 
 # Create a hierarchy of test topics
-my $topic1 = RT::FM::Topic->new($RT::SystemUser);
-my $topic11 = RT::FM::Topic->new($RT::SystemUser);
-my $topic12 = RT::FM::Topic->new($RT::SystemUser);
-my $topic2 = RT::FM::Topic->new($RT::SystemUser);
-my $topic_class2= RT::FM::Topic->new($RT::SystemUser);
-my $gtopic = RT::FM::Topic->new($RT::SystemUser);
+my $topic1 = RT::Topic->new($RT::SystemUser);
+my $topic11 = RT::Topic->new($RT::SystemUser);
+my $topic12 = RT::Topic->new($RT::SystemUser);
+my $topic2 = RT::Topic->new($RT::SystemUser);
+my $topic_class2= RT::Topic->new($RT::SystemUser);
+my $gtopic = RT::Topic->new($RT::SystemUser);
 ($ret, $msg) = $topic1->Create('Parent' => 0,
 			      'Name' => 'tlaTestTopic1-'.$$,
-			      'ObjectType' => 'RT::FM::Class',
+			      'ObjectType' => 'RT::Class',
 			      'ObjectId' => $class->Id);
 ok($ret, "Topic 1 created");
 ($ret, $msg) = $topic11->Create('Parent' => $topic1->Id,
 			       'Name' => 'tlaTestTopic1.1-'.$$,
-			       'ObjectType' => 'RT::FM::Class',
+			       'ObjectType' => 'RT::Class',
 			       'ObjectId' => $class->Id);
 ok($ret, "Topic 1.1 created");
 ($ret, $msg) = $topic12->Create('Parent' => $topic1->Id,
 			       'Name' => 'tlaTestTopic1.2-'.$$,
-			       'ObjectType' => 'RT::FM::Class',
+			       'ObjectType' => 'RT::Class',
 			       'ObjectId' => $class->Id);
 ok($ret, "Topic 1.2 created");
 ($ret, $msg) = $topic2->Create('Parent' => 0,
 			      'Name' => 'tlaTestTopic2-'.$$,
-			      'ObjectType' => 'RT::FM::Class',
+			      'ObjectType' => 'RT::Class',
 			      'ObjectId' => $class->Id);
 ok($ret, "Topic 2 created");
 ($ret, $msg) = $topic_class2->Create('Parent' => 0,
 			      'Name' => 'tlaTestTopicClass2-'.$$,
-			      'ObjectType' => 'RT::FM::Class',
+			      'ObjectType' => 'RT::Class',
 			      'ObjectId' => $class2->Id);
 ok($ret, "Topic Class2 created");
 ($ret, $msg) = $gtopic->Create('Parent' => 0,
@@ -74,14 +74,14 @@ my $answerCF = RT::CustomField->new($RT::SystemUser);
 ($ret, $msg) = $questionCF->Create('Name' => 'Question-'.$$,
 			   'Type' => 'Text',
 			   'MaxValues' => 1,
-			   'LookupType' => 'RT::FM::Class-RT::FM::Article',
+			   'LookupType' => 'RT::Class-RT::Article',
 			   'Description' => 'The question to be answered',
 			   'Disabled' => 0);
 ok($ret, "Question CF created: $msg");
 ($ret, $msg) = $answerCF->Create('Name' => 'Answer-'.$$,
 			 'Type' => 'Text',
 			 'MaxValues' => 1,
-			 'LookupType' => 'RT::FM::Class-RT::FM::Article',
+			 'LookupType' => 'RT::Class-RT::Article',
 			 'Description' => 'The answer to the question',
 			 'Disabled' => 0);
 ok($ret, "Answer CF created: $msg");
@@ -104,10 +104,10 @@ my %cvals = ('article1q' => 'Some question about swallows',
 
 # Create an article or two with our custom field values.
 
-my $article1 = RT::FM::Article->new($RT::SystemUser);
-my $article2 = RT::FM::Article->new($RT::SystemUser);
-my $article3 = RT::FM::Article->new($RT::SystemUser);
-my $article4 = RT::FM::Article->new($RT::SystemUser);
+my $article1 = RT::Article->new($RT::SystemUser);
+my $article2 = RT::Article->new($RT::SystemUser);
+my $article3 = RT::Article->new($RT::SystemUser);
+my $article4 = RT::Article->new($RT::SystemUser);
 ($ret, $msg) = $article1->Create(Name => 'First article '.$$,
 				 Summary => 'blah blah 1',
 				 Class => $class->Id,
diff --git a/t/articles/search-interface.t b/t/articles/search-interface.t
index 0cba9a8..c934849 100644
--- a/t/articles/search-interface.t
+++ b/t/articles/search-interface.t
@@ -8,9 +8,9 @@ use RT::Test tests => 24;
 use RT::CustomField;
 use RT::Queue;
 use RT::Ticket;
-use_ok 'RT::FM::Class';
-use_ok 'RT::FM::Topic';
-use_ok 'RT::FM::Article';
+use_ok 'RT::Class';
+use_ok 'RT::Topic';
+use_ok 'RT::Article';
 
 my ($url, $m) = RT::Test->started_ok;
 
@@ -18,7 +18,7 @@ my ($url, $m) = RT::Test->started_ok;
 my ($ret, $msg);
 
 # Create a test class
-my $class = RT::FM::Class->new($RT::SystemUser);
+my $class = RT::Class->new($RT::SystemUser);
 ($ret, $msg) = $class->Create('Name' => 'tlaTestClass-'.$$,
 			      'Description' => 'A general-purpose test class');
 ok($ret, "Test class created");
@@ -30,14 +30,14 @@ my $ticketCF = RT::CustomField->new($RT::SystemUser);
 ($ret, $msg) = $questionCF->Create('Name' => 'Question-'.$$,
 			   'Type' => 'Text',
 			   'MaxValues' => 1,
-			   'LookupType' => 'RT::FM::Class-RT::FM::Article',
+			   'LookupType' => 'RT::Class-RT::Article',
 			   'Description' => 'The question to be answered',
 			   'Disabled' => 0);
 ok($ret, "Question CF created: $msg");
 ($ret, $msg) = $answerCF->Create('Name' => 'Answer-'.$$,
 			 'Type' => 'Text',
 			 'MaxValues' => 1,
-			 'LookupType' => 'RT::FM::Class-RT::FM::Article',
+			 'LookupType' => 'RT::Class-RT::Article',
 			 'Description' => 'The answer to the question',
 			 'Disabled' => 0);
 ok($ret, "Answer CF created: $msg");
@@ -71,10 +71,10 @@ my %cvals = ('article1q' => 'Some question about swallows',
 
 # Create an article or two with our custom field values.
 
-my $article1 = RT::FM::Article->new($RT::SystemUser);
-my $article2 = RT::FM::Article->new($RT::SystemUser);
-my $article3 = RT::FM::Article->new($RT::SystemUser);
-my $article4 = RT::FM::Article->new($RT::SystemUser);
+my $article1 = RT::Article->new($RT::SystemUser);
+my $article2 = RT::Article->new($RT::SystemUser);
+my $article3 = RT::Article->new($RT::SystemUser);
+my $article4 = RT::Article->new($RT::SystemUser);
 ($ret, $msg) = $article1->Create(Name => 'First article '.$$,
 				 Summary => 'blah blah 1',
 				 Class => $class->Id,
diff --git a/t/articles/upload-customfields.t b/t/articles/upload-customfields.t
index 546e136..de01b6c 100644
--- a/t/articles/upload-customfields.t
+++ b/t/articles/upload-customfields.t
@@ -24,8 +24,8 @@ use constant ImageFileContent => do {
     scalar <$fh>;
 };
 
-use RT::FM::Class;
-my $class = RT::FM::Class->new($RT::SystemUser);
+use RT::Class;
+my $class = RT::Class->new($RT::SystemUser);
 my ($ret, $msg) = $class->Create('Name' => 'tlaTestClass-'.$$,
 			      'Description' => 'A general-purpose test class');
 ok($ret, "Test class created");
@@ -43,7 +43,7 @@ $m->submit_form(
     form_name => "ModifyCustomField",
     fields => {
         TypeComposite => 'Image-0',
-        LookupType => 'RT::FM::Class-RT::FM::Article',
+        LookupType => 'RT::Class-RT::Article',
         Name => 'img'.$$,
         Description => 'img',
     },
@@ -69,7 +69,7 @@ $m->title_is(qq/Create a new article/);
 $m->content_like(qr/Upload multiple images/, 'has a upload image field');
 
 $tcf =~ /(\d+)$/ or die "Hey this is impossible dude";
-my $upload_field = "Object-RT::FM::Article--CustomField-$1-Upload";
+my $upload_field = "Object-RT::Article--CustomField-$1-Upload";
 
 diag("Uploading an image to $upload_field") if $ENV{TEST_VERBOSE};
 
diff --git a/t/articles/uri-a.t b/t/articles/uri-a.t
index 260346c..d608a04 100644
--- a/t/articles/uri-a.t
+++ b/t/articles/uri-a.t
@@ -9,10 +9,10 @@ use_ok("RT::URI::a");
 my $uri = RT::URI::a->new($RT::SystemUser);
 ok(ref($uri), "URI object exists");
 
-my $class = RT::FM::Class->new( $RT::SystemUser );
+my $class = RT::Class->new( $RT::SystemUser );
 $class->Create( Name => 'URItest - '. $$ );
 ok $class->id, 'created a class';
-my $article = RT::FM::Article->new( $RT::SystemUser );
+my $article = RT::Article->new( $RT::SystemUser );
 my ($id, $msg) = $article->Create(
     Name    => 'Testing URI parsing - '. $$,
     Summary => 'In which this should load',
@@ -22,7 +22,7 @@ ok($id,$msg);
 
 my $uristr = "a:" . $article->Id;
 $uri->ParseURI($uristr);
-is(ref($uri->Object), "RT::FM::Article", "Object loaded is an article");
+is(ref($uri->Object), "RT::Article", "Object loaded is an article");
 is($uri->Object->Id, $article->Id, "Object loaded has correct ID");
 is($article->URI, 'fsck.com-rtfm://example.com/article/'.$article->Id, 
    "URI object has correct URI string");
diff --git a/t/articles/uri-rtfm.t b/t/articles/uri-rtfm.t
index f90ceaf..e572a8f 100644
--- a/t/articles/uri-rtfm.t
+++ b/t/articles/uri-rtfm.t
@@ -15,10 +15,10 @@ isa_ok $uri, 'RT::Base';
 
 is $uri->LocalURIPrefix, 'fsck.com-rtfm://example.com/article/';
 
-my $class = RT::FM::Class->new( $RT::SystemUser );
+my $class = RT::Class->new( $RT::SystemUser );
 $class->Create( Name => 'URItest - '. $$ );
 ok $class->id, 'created a class';
-my $article = RT::FM::Article->new( $RT::SystemUser );
+my $article = RT::Article->new( $RT::SystemUser );
 my ($id, $msg) = $article->Create(
     Name    => 'Testing URI parsing - '. $$,
     Summary => 'In which this should load',

-----------------------------------------------------------------------


More information about the Rt-commit mailing list