Changeset 13108

Timestamp:

11/18/11 05:26:10 (6 months ago)

Author:

PaulHarvey

Message:

Item11259: Fix inappropriate Foswiki::Meta->new()

• MongoDBPlugin failed miserably in UploadScriptTests because of the incorrect Foswiki::Meta->new() call. Replaced with Foswiki::Func::readTopic()
• When LocalLib has ASSERTS=1, doing $this->assert() failure from set_up crashes test runner.

File:

• branches/Release01x01/UnitTestContrib/test/unit/UploadScriptTests.pm (modified) (3 diffs)

branches/Release01x01/UnitTestContrib/test/unit/UploadScriptTests.pm

@@ -28 +28 @@
     $this->SUPER::set_up();
     $UI_FN ||= $this->getUIFn('upload');
-    my $topicObject =
-      Foswiki::Meta->new( $this->{session}, $this->{test_web},
-        $this->{test_topic}, "   * Set ATTACHFILESIZELIMIT = 511\n", undef );
-    $topicObject->put( 'FORM', $FORM );
+    my ($topicObject) =
+      Foswiki::Func::readTopic( $this->{test_web}, $this->{test_topic} );
+    $topicObject->text("   * Set ATTACHFILESIZELIMIT = 511\n");
+    $topicObject->putAll( 'FORM',  $FORM );
     $topicObject->putAll( 'FIELD', @FIELDS );
     $topicObject->save( forcenewrevision => 1 );
-    $this->_assert_meta_stillgood();
+    $this->_assert_meta_stillgood(0);
 
     return;
@@ -406 +406 @@
 # Assert that we've still got good meta
 sub _assert_meta_stillgood {
-    my ($this) = @_;
+    my ( $this, $assert ) = @_;
     my ($topicObj) =
       Foswiki::Func::readTopic( $this->{test_web}, $this->{test_topic} );
@@ -413 +413 @@
     my %tFIELDShash = map { $_->{name} => $_ } @tFIELDS;
 
-    $this->assert($tFORM);
-    $this->assert( exists $tFORM->{name} );
-    $this->assert( $tFORM->{name} eq $FORM->{name} );
-    $this->assert( scalar(@tFIELDS) );
-    $this->assert( scalar(@tFIELDS) == scalar(@FIELDS) );
+    return unless $this->_assert_( $assert, $tFORM );
+    return unless $this->_assert_( $assert, exists $tFORM->{name} );
+    return unless $this->_assert_( $assert, $tFORM->{name} eq $FORM->{name} );
+    return unless $this->_assert_( $assert, scalar(@tFIELDS) );
+    return
+      unless $this->_assert_( $assert, scalar(@tFIELDS) == scalar(@FIELDS) );
     foreach my $name ( keys %FIELDShash ) {
-        $this->assert(
+        return
+          unless $this->_assert_(
+            $assert,
             exists $tFIELDShash{$name},
 "$this->{test_web}.$this->{test_topic} did not contain META:FIELD[name='$name']"
-        );
-        $this->assert(
+          );
+        return
+          unless $this->_assert_(
+            $assert,
             exists $tFIELDShash{$name}->{value},
 "$this->{test_web}.$this->{test_topic} did not contain a value key in META:FIELD[name='$name']"
-        );
-        $this->assert(
+          );
+        return
+          unless $this->_assert_(
+            $assert,
             $tFIELDShash{$name}->{value} eq $FIELDShash{$name}->{value},
 "'$this->{test_web}.$this->{test_topic}'/META:FIELD[name='$name'].value = '$tFIELDShash{$name}->{value}' but expected '$FIELDShash{$name}->{value}'"
-        );
-    }
-
-    return;
+          );
+    }
+
+    return;
+}
+
+# ->assert() from set_up crashes TestRunner if LocalLib has ASSERTS=1, so die
+# differently inside set_up
+sub _assert_ {
+    my ( $this, $assert, $condition, $message ) = @_;
+
+    if ( !defined $assert || $assert ) {
+        $this->assert( $condition, $message );
+    }
+    elsif ( !$condition ) {
+        print STDERR 'ASSERT FAILED during set_up: ' . ( $message || '' );
+    }
+
+    return $condition;
 }