From 8272c2b087ed764ec383abe7da5c398398aa1935 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sun, 9 May 2010 14:51:20 -0700
Subject: [PATCH] Do not intstall a wrapper around new in Asset.pm

---
 t/lib/WebGUI/Test.pm | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/t/lib/WebGUI/Test.pm b/t/lib/WebGUI/Test.pm
index 3ed762aa5..16fdc2c2a 100644
--- a/t/lib/WebGUI/Test.pm
+++ b/t/lib/WebGUI/Test.pm
@@ -240,15 +240,15 @@ sub _mockAssetInits {
         if $mockedNew;
     require WebGUI::Asset;
     my $original_new = \&WebGUI::Asset::new;
-    *WebGUI::Asset::new = sub {
-        my ($class, $session, $assetId, $className, $revisionDate) = @_;
-        if ($mockedAssetIds{$assetId}) {
-            return $mockedAssetIds{$assetId};
-        }
-        goto $original_new;
-    };
-    my $original_newByDynamicClass = \&WebGUI::Asset::newByDynamicClass;
-    *WebGUI::Asset::newByDynamicClass = sub {
+#    *WebGUI::Asset::new = sub {
+#        my ($class, $session, $assetId, $className, $revisionDate) = @_;
+#        if ($mockedAssetIds{$assetId}) {
+#            return $mockedAssetIds{$assetId};
+#        }
+#        goto $original_new;
+#    };
+    my $original_newByDynamicClass = \&WebGUI::Asset::newById;
+    *WebGUI::Asset::newById = sub {
         my ($class, $session, $assetId, $revisionDate) = @_;
         if ($mockedAssetIds{$assetId}) {
             return $mockedAssetIds{$assetId};
@@ -263,6 +263,14 @@ sub _mockAssetInits {
         }
         goto $original_newPending;
     };
+    my $original_newByPropertyHashRef = \&WebGUI::Asset::newByPropertyHashRef;
+    *WebGUI::Asset::newByPropertyHashRef = sub {
+        my ($class, $session, $url, $revisionDate) = @_;
+        if ($url && $mockedAssetUrls{$url}) {
+            return $mockedAssetUrls{$url};
+        }
+        goto $original_newByPropertyHashRef;
+    };
     my $original_newByUrl = \&WebGUI::Asset::newByUrl;
     *WebGUI::Asset::newByUrl = sub {
         my ($class, $session, $url, $revisionDate) = @_;