[Avida-SVN] r1217 - in extras: . source/testsuites source/tools

[avidaedward at myxo.css.msu.edu]

Author: avidaedward
Date: 2007-01-28 01:16:33 -0500 (Sun, 28 Jan 2007)
New Revision: 1217

Modified:
   extras/
   extras/source/testsuites/nConsoleCatcher.cpp
   extras/source/tools/cConsoleCatcher.cpp
   extras/source/tools/cConsoleCatcher.h
Log:
 r1183 at clearly:  kaben | 2006-12-25 00:39:30 -0500
 Added convenience constructor to cConsoleCatcher class, taking and
 capturing a stream argument.



Property changes on: extras
___________________________________________________________________
Name: svk:merge
   - 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/extras:1182
   + 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/extras:1183

Modified: extras/source/testsuites/nConsoleCatcher.cpp
===================================================================
--- extras/source/testsuites/nConsoleCatcher.cpp	2007-01-28 06:16:28 UTC (rev 1216)
+++ extras/source/testsuites/nConsoleCatcher.cpp	2007-01-28 06:16:33 UTC (rev 1217)
@@ -87,6 +87,26 @@
           TEST(0 > captured.Find("blah"));
         }
 
+        /* Basics : Construct-Capture and Release a stream. */
+        {
+          cConsoleCatcher cc2(cout);
+          {
+            TEST(&cout == cc2.m_stream);
+            TEST(0 != cc2.m_streambuf);
+          }
+          cout << "hello, world.";
+          cString captured(cc2.Release());
+          {
+            TEST(0 == cc2.m_stream);
+            TEST(0 == cc2.m_streambuf);
+          }
+          //cout << "captured : \"" << captured << "\"." << endl;
+
+          TEST(0 <= captured.Find("hello, world"));
+
+          TEST(0 > captured.Find("blah"));
+        }
+
         /* What happens upon Capture-Capture-Release? */
         {
           cc.Capture(cout);

Modified: extras/source/tools/cConsoleCatcher.cpp
===================================================================
--- extras/source/tools/cConsoleCatcher.cpp	2007-01-28 06:16:28 UTC (rev 1216)
+++ extras/source/tools/cConsoleCatcher.cpp	2007-01-28 06:16:33 UTC (rev 1217)
@@ -8,6 +8,14 @@
 , m_capturing_stream("")
 {}
 
+cConsoleCatcher::cConsoleCatcher(std::ostream &out)
+: m_stream(0)
+, m_streambuf(0)
+, m_capturing_stream("")
+{
+  Capture(out);
+}
+
 cString cConsoleCatcher::Capture(std::ostream &out){
   cString out_string(Release());
 

Modified: extras/source/tools/cConsoleCatcher.h
===================================================================
--- extras/source/tools/cConsoleCatcher.h	2007-01-28 06:16:28 UTC (rev 1216)
+++ extras/source/tools/cConsoleCatcher.h	2007-01-28 06:16:33 UTC (rev 1217)
@@ -17,6 +17,7 @@
   std::stringstream m_capturing_stream;
 
   cConsoleCatcher();
+  explicit cConsoleCatcher(std::ostream &out);
   cString Capture(std::ostream &out);
   cString Release();
 };