Changeset 13836 for branches/Release01x01/core/lib/Foswiki.pm

Timestamp:

01/27/12 05:14:49 (4 months ago)

Author:

PaulHarvey

Message:

Item11431: add ASSERTs for SINGLE_SINGLETONS

Conflicts:

lib/Foswiki.pm

File:

• branches/Release01x01/core/lib/Foswiki.pm (modified) (6 diffs)

branches/Release01x01/core/lib/Foswiki.pm

@@ -80 +80 @@
 our $OC      = "<!--\0";
 our $CC      = "\0-->";
+
+# This variable is set if Foswiki is running in unit test mode.
+# It is provided so that modules can detect unit test mode to avoid
+# corrupting data spaces.
+our $inUnitTestMode = 0;
+
+sub SINGLE_SINGLETONS       { 0 }
+sub SINGLE_SINGLETONS_TRACE { 0 }
 
 # Returns the full path of the directory containing Foswiki.pm
@@ -1673 +1681 @@
         CGI::charset( $Foswiki::cfg{Site}{CharSet} );
     }
+    if (SINGLE_SINGLETONS_TRACE) {
+        require Data::Dumper;
+        print STDERR "new $this: "
+          . Data::Dumper->Dump( [ [caller], [ caller(1) ] ] );
+    }
 
     $this->{request}  = $query;
@@ -1681 +1694 @@
     # This is required in case we get an exception during
     # initialisation, so that we have a session to handle it with.
+    ASSERT( !$Foswiki::Plugins::SESSION ) if SINGLE_SINGLETONS;
     $Foswiki::Plugins::SESSION = $this;
+    ASSERT( $Foswiki::Plugins::SESSION->isa('Foswiki') ) if DEBUG;
 
     # Tell Foswiki::Response which charset we are using if not default
@@ -2131 +2146 @@
 
     undef $this->{DebugVerificationCode};    # from Foswiki::UI::Register
+    if (SINGLE_SINGLETONS_TRACE) {
+        require Data::Dumper;
+        print STDERR "finish $this: "
+          . Data::Dumper->Dump( [ [caller], [ caller(1) ] ] );
+    }
+    if (SINGLE_SINGLETONS) {
+        ASSERT( defined $Foswiki::Plugins::SESSION );
+        ASSERT( $Foswiki::Plugins::SESSION == $this );
+        ASSERT( $Foswiki::Plugins::SESSION->isa('Foswiki') );
+    }
+    undef $Foswiki::Plugins::SESSION;
 
     if (DEBUG) {
@@ -2396 +2422 @@
 
     # Make sure func works, for registered tag handlers
+    if (SINGLE_SINGLETONS) {
+        ASSERT( defined $Foswiki::Plugins::SESSION );
+        ASSERT( $Foswiki::Plugins::SESSION == $this );
+    }
     local $Foswiki::Plugins::SESSION = $this;
+    ASSERT( $Foswiki::Plugins::SESSION->isa('Foswiki') ) if DEBUG;
 
     my $text = $topicObject->text();
@@ -2733 +2764 @@
 
     # Make sure func works, for registered tag handlers
-    $Foswiki::Plugins::SESSION = $this;
+    if (SINGLE_SINGLETONS) {
+        ASSERT( defined $Foswiki::Plugins::SESSION );
+        ASSERT( $Foswiki::Plugins::SESSION == $this );
+    }
+    local $Foswiki::Plugins::SESSION = $this;
+    ASSERT( $Foswiki::Plugins::SESSION->isa('Foswiki') ) if DEBUG;
 
     # NOTE TO DEBUGGERS