Changeset 13795

Timestamp:

01/23/12 14:45:26 (4 weeks ago)

Author:

CrawfordCurrie

Message:

Item11466: fixes for borked unit tests; looks like 'someone' is running unit tests with ASSERT disabled. Tsk tsk.

Location:

trunk

Files:

• UnitTestContrib/test/unit/FoswikiTestCase.pm (modified) (1 diff)
• core/lib/Foswiki/Meta.pm (modified) (1 diff)

trunk/UnitTestContrib/test/unit/FoswikiTestCase.pm

@@ -741 +741 @@
     $this->{request} = $this->{session}{request};
     ASSERT( defined $Foswiki::Plugins::SESSION ) if SINGLE_SINGLETONS;
-    ( $this->{test_topicObject} ) =
-      Foswiki::Func::readTopic( $this->{test_web}, $this->{test_topic} );
+    if ($this->{test_web} && $this->{test_topic}) {
+        ( $this->{test_topicObject} ) =
+            Foswiki::Func::readTopic( $this->{test_web}, $this->{test_topic} );
+    }
 
     return $this->{session};

trunk/core/lib/Foswiki/Meta.pm

@@ -1247 +1247 @@
         if ( defined $name ) {
 
-#this code presumes the _indices are there (Sven would like it to re-create when needed..)
-# Paul.H notes that we trip over this one when meta obj is unloaded (I think, see Item10927)
-            ASSERT( defined( $this->{_indices} ) ) if DEBUG;
-            my $indices = $this->{_indices}->{$type};
+            my $indices = $this->{_indices};
+            return undef unless defined $indices;
+            $indices = $indices->{$type};
             return undef unless defined $indices;
             return undef unless defined $indices->{$name};