Item13897: A lot of bugs fixed & some tests are passing again.

- First major change involing Moo/Moose specific functionality: Foswiki::Prefs::BaseBackend is now a role, not a base class for other preference classes. - Complete Moo-fication of preferences. - Renamed meta attribute of Foswiki::Meta class to metaData to avoid possible clashes with Moo::Object meta() method. - Renamed Foswiki::Meta::load() to Foswiki::Meta::loadCached(). Thanks to TitanOfOld and JulianLevens for their advices! - Foswiki::Object now accepts an object in its =$class= argument to have support for clone-alike methods. - New isa validator: Foswiki::Object::isaHASH. - Use of Foswiki::Exception->rethrow() in Plguin.pm. - Renamed suite attribute of FoswikiFnTestCase to testSuite for compatibility with TestSuite.pm.
foswiki · Jan 29, 2016 · 0f8803f · 0f8803f
1 parent cd9a15e
commit 0f8803f
Show file tree

Hide file tree

Showing 22 changed files with 470 additions and 357 deletions.
diff --git a/PreferencesPlugin/lib/Foswiki/Plugins/PreferencesPlugin.pm b/PreferencesPlugin/lib/Foswiki/Plugins/PreferencesPlugin.pm
@@ -56,8 +56,7 @@ sub beforeCommonTagsHandler {
 
         # SMELL: Unpublished API. No choice, though :-(
         require Foswiki::Form;    # SMELL
-        $formDef =
-          Foswiki::Form->load( $Foswiki::Plugins::SESSION, $formWeb, $form );
+        $formDef = Foswiki::Form->loadCached( $Foswiki::Plugins::SESSION, $formWeb, $form );
     }
 
     my $query = Foswiki::Func::getCgiQuery();

diff --git a/UnitTestContrib/test/unit/AccessControlTests.pm b/UnitTestContrib/test/unit/AccessControlTests.pm
@@ -19,7 +19,7 @@ around BUILDARGS => sub {
 
     # We need to override the suite parameter.
     my %args = @_;
-    $args{suite} = 'AccessControl';
+    $args{testSuite} = 'AccessControl';
     return $orig->( $class, %args );
 };
 

diff --git a/UnitTestContrib/test/unit/AddToHeadTests.pm b/UnitTestContrib/test/unit/AddToHeadTests.pm
@@ -17,7 +17,7 @@ around BUILDARGS => sub {
 
     # We need to override the suite parameter.
     my %args = @_;
-    $args{suite} = 'SortedHeadTests';
+    $args{testSuite} = 'SortedHeadTests';
     return $orig->( $class, %args );
 };
 

diff --git a/UnitTestContrib/test/unit/FormDefTests.pm b/UnitTestContrib/test/unit/FormDefTests.pm
@@ -23,7 +23,8 @@ sub test_minimalForm {
 FORM
     $topicObject->save();
     $topicObject->finish();
-    my $def = Foswiki::Form->new( $this->session, $this->test_web, 'TestForm' );
+    my $def =
+      Foswiki::Form->loadCached( $this->session, $this->test_web, 'TestForm' );
     $this->assert($def);
     $this->assert_equals( 1, scalar @{ $def->getFields() } );
     my $f = $def->getField('Date');
@@ -54,7 +55,8 @@ sub test_allCols {
 FORM
     $topicObject->save();
     $topicObject->finish();
-    my $def = Foswiki::Form->new( $this->session, $this->test_web, 'TestForm' );
+    my $def =
+      Foswiki::Form->loadCached( $this->session, $this->test_web, 'TestForm' );
 
     $this->assert_equals( 7, scalar @{ $def->getFields() } );
     my $f = $def->getField('Select');
@@ -137,7 +139,8 @@ FORM
     $topicObject->save();
     $topicObject->finish();
 
-    my $def = Foswiki::Form->new( $this->session, $this->test_web, 'TestForm' );
+    my $def =
+      Foswiki::Form->loadCached( $this->session, $this->test_web, 'TestForm' );
 
     $this->assert_equals( 1, scalar @{ $def->getFields() } );
     my $f = $def->getField('ValsElsewhere');
@@ -175,7 +178,8 @@ FORM
 FORM
     $topicObject->save();
     $topicObject->finish();
-    my $def = Foswiki::Form->new( $this->session, $test_web, 'TestForm' );
+    my $def =
+      Foswiki::Form->loadCached( $this->session, $test_web, 'TestForm' );
 
     $this->assert_equals( 1, scalar @{ $def->getFields() } );
     my $f = $def->getField('ValsElsewhere');
@@ -212,7 +216,8 @@ FORM
 FORM
     $topicObject->save();
     $topicObject->finish();
-    my $def = Foswiki::Form->new( $this->session, $this->test_web, 'TestForm' );
+    my $def =
+      Foswiki::Form->loadCached( $this->session, $this->test_web, 'TestForm' );
 
     $this->assert_equals( 1, scalar @{ $def->getFields() } );
     my $f = $def->getField('Ecks');
@@ -246,7 +251,7 @@ FORM
     $topicObject->save();
     $topicObject->finish();
     my $def =
-      Foswiki::Form->load( $this->session, $this->test_web, 'TestForm' );
+      Foswiki::Form->loadCached( $this->session, $this->test_web, 'TestForm' );
 
     $this->assert_equals( 1, scalar @{ $def->getFields() } );
     my $f = $def->getField('Ecks');
@@ -276,7 +281,8 @@ FORM
     $topicObject->save();
     $topicObject->finish();
 
-    my $def = Foswiki::Form->new( $this->session, $this->test_web, 'TestForm' );
+    my $def =
+      Foswiki::Form->loadCached( $this->session, $this->test_web, 'TestForm' );
 
     my $f = $def->getField('Ecks');
     $this->assert_str_equals( 'SplodgeOne;Blah',
@@ -302,7 +308,7 @@ FORM
     $topicObject->finish();
     my ($meta) = Foswiki::Func::readTopic( $this->test_web, 'SplodgeOne' );
     my $form =
-      Foswiki::Form->new( $this->session, $this->test_web,
+      Foswiki::Form->loadCached( $this->session, $this->test_web,
         'NonExistantForm', $meta );
     my $f = $form->getField('Ecks');
     $this->assert_str_equals( '',     $f->getDefaultValue() );
@@ -325,7 +331,8 @@ sub test_Item972_selectPlusValues {
 FORM
     $topicObject->save();
     $topicObject->finish();
-    my $def = Foswiki::Form->new( $this->session, $this->test_web, 'TestForm' );
+    my $def =
+      Foswiki::Form->loadCached( $this->session, $this->test_web, 'TestForm' );
 
     my $f = $def->getField('Select');
     $this->assert_str_equals( 'select+values', $f->{type} );
@@ -343,7 +350,7 @@ sub test_Item10987_formObjClass {
 
     $this->createNewFoswikiSession( $Foswiki::cfg{AdminUserWikiName} );
     my $formObj =
-      Foswiki::Form->new( $this->session, $Foswiki::cfg{SystemWebName},
+      Foswiki::Form->loadCached( $this->session, $Foswiki::cfg{SystemWebName},
         'UserForm' );
     $this->assert( $formObj->isa('Foswiki::Form') );
     my @fields = $formObj->getFields();

diff --git a/UnitTestContrib/test/unit/FoswikiFnTestCase.pm b/UnitTestContrib/test/unit/FoswikiFnTestCase.pm
@@ -29,14 +29,15 @@ use Unit::Request();
 use Unit::Response();
 use Foswiki::UI::Register();
 use Try::Tiny;
+use Carp qw(cluck);
 
 our @mails;
 
 use Moo;
 use namespace::clean;
 extends qw(FoswikiTestCase);
 
-has suite => (
+has testSuite => (
     is       => 'ro',
     required => 1,
 );
@@ -45,19 +46,19 @@ has test_web => (
     lazy    => 1,
     clearer => 1,
     builder => sub {
-        my $suite = $_[0]->suite;
-        return 'Temporary' . $suite . 'TestWeb' . $suite;
+        my $testSuite = $_[0]->testSuite;
+        return 'Temporary' . $testSuite . 'TestWeb' . $testSuite;
     },
 );
 has test_topic => (
     is      => 'rw',
     lazy    => 1,
-    builder => sub { return 'TestTopic' . $_[0]->suite; },
+    builder => sub { return 'TestTopic' . $_[0]->testSuite; },
 );
 has users_web => (
     is      => 'rw',
     lazy    => 1,
-    builder => sub { return 'Temporary' . $_[0]->suite . 'UsersWeb'; },
+    builder => sub { return 'Temporary' . $_[0]->testSuite . 'UsersWeb'; },
 );
 has test_user_forename => ( is => 'rw', );
 has test_user_surname  => ( is => 'rw', );

diff --git a/core/lib/Foswiki/Compatibility.pm b/core/lib/Foswiki/Compatibility.pm
@@ -178,7 +178,8 @@ sub upgradeCategoryTable {
         }
 
         require Foswiki::Form;
-        my $def = Foswiki::Form->load( $session, $web, $defaultFormTemplate );
+        my $def =
+          Foswiki::Form->loadCached( $session, $web, $defaultFormTemplate );
         $meta->put( 'FORM', { name => $defaultFormTemplate } );
 
         foreach my $fieldDef ( @{ $def->getFields() } ) {

diff --git a/core/lib/Foswiki/Form.pm b/core/lib/Foswiki/Form.pm
@@ -70,8 +70,9 @@ has def => (
     predicate => 1,
 );
 has fields => (
-    is   => 'rw',
-    lazy => 1,
+    is      => 'rw',
+    lazy    => 1,
+    clearer => 1,
 );
 has mandatoryFieldsPresent => (
     is      => 'rw',
@@ -126,7 +127,8 @@ sub _validateWebTopic {
 # XXX vrurg ClassMethod load() is supposed to replace the old new() method and
 # become a new constructor. Required to stay in compliance with Moo architecture
 # and avoid replacing of the standard new() method.
-sub load {
+# SMELL Foswiki::Meta already defines load() method. Need another name.
+sub loadCached {
     my ( $class, $session, $web, $form, $def ) = @_;
 
     my ( $vweb, $vtopic ) = _validateWebTopic( $session, $web, $form );
@@ -144,7 +146,7 @@ sub load {
         session   => $session,
         web       => $vweb,
         form      => $vtopic,
-        _via_load => 1,
+        _indirect => 1,
         ( defined $def ? ( def => $def ) : () ),
     );
 }
@@ -163,12 +165,12 @@ around BUILDARGS => sub {
     $params->{topic} = $vtopic;
 
     # Avoid direct calls to $class::new().
-    ASSERT( $params->{_via_load},
-        "${class}::new() has been use directly. Use ${class}::load() instead."
+    ASSERT( $params->{_indirect},
+"${class}::new() has been use directly. Use ${class}->loadCached() instead."
     );
 
     # No more need to pollute properties with this key.
-    delete $params->{_via_load};
+    delete $params->{_indirect};
 
     # Got to have either a def or a topic
     unless ( $params->{def} || $session->topicExists( $vweb, $vtopic ) ) {