From 4170ef8ecc604da38482934fb864adc5b436739f Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 18 Oct 2013 09:50:26 -0700
Subject: fixed llinstancetracker unit test

---
 indra/llcommon/tests/llinstancetracker_test.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'indra/llcommon/tests/llinstancetracker_test.cpp')

diff --git a/indra/llcommon/tests/llinstancetracker_test.cpp b/indra/llcommon/tests/llinstancetracker_test.cpp
index e769c3e22c..601d28ea3e 100755
--- a/indra/llcommon/tests/llinstancetracker_test.cpp
+++ b/indra/llcommon/tests/llinstancetracker_test.cpp
@@ -194,20 +194,21 @@ namespace tut
     {
         set_test_name("delete Keyed with outstanding instance_iter");
         std::string what;
-        Keyed* keyed = new Keyed("one");
+        Keyed* keyed = new Keyed("delete Keyed with outstanding instance_iter");
         {
-            WrapLL_ERRS wrapper;
+            WrapLLErrs wrapper;
             Keyed::instance_iter i(Keyed::beginInstances());
             try
             {
                 delete keyed;
             }
-            catch (const WrapLL_ERRS::FatalException& e)
+            catch (const WrapLLErrs::FatalException& e)
             {
                 what = e.what();
             }
         }
         ensure(! what.empty());
+		delete keyed;
     }
 
     template<> template<>
@@ -215,15 +216,15 @@ namespace tut
     {
         set_test_name("delete Keyed with outstanding key_iter");
         std::string what;
-        Keyed* keyed = new Keyed("one");
+        Keyed* keyed = new Keyed("delete Keyed with outstanding key_it");
         {
-            WrapLL_ERRS wrapper;
+            WrapLLErrs wrapper;
             Keyed::key_iter i(Keyed::beginKeys());
             try
             {
                 delete keyed;
             }
-            catch (const WrapLL_ERRS::FatalException& e)
+            catch (const WrapLLErrs::FatalException& e)
             {
                 what = e.what();
             }
@@ -238,13 +239,13 @@ namespace tut
         std::string what;
         Unkeyed* unkeyed = new Unkeyed;
         {
-            WrapLL_ERRS wrapper;
+            WrapLLErrs wrapper;
             Unkeyed::instance_iter i(Unkeyed::beginInstances());
             try
             {
                 delete unkeyed;
             }
-            catch (const WrapLL_ERRS::FatalException& e)
+            catch (const WrapLLErrs::FatalException& e)
             {
                 what = e.what();
             }
-- 
cgit v1.2.3


From aef2a527e5ff13db9078c980bfa099bc4bde4124 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 21 Oct 2013 10:32:19 -0700
Subject: BUILDFIX: double delete in instancetracker unit test

---
 indra/llcommon/tests/llinstancetracker_test.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/llcommon/tests/llinstancetracker_test.cpp')

diff --git a/indra/llcommon/tests/llinstancetracker_test.cpp b/indra/llcommon/tests/llinstancetracker_test.cpp
index 601d28ea3e..c7d4b8a06b 100755
--- a/indra/llcommon/tests/llinstancetracker_test.cpp
+++ b/indra/llcommon/tests/llinstancetracker_test.cpp
@@ -208,7 +208,6 @@ namespace tut
             }
         }
         ensure(! what.empty());
-		delete keyed;
     }
 
     template<> template<>
-- 
cgit v1.2.3