From 1022fff9806e466679a965128b3d4856c0efd5c6 Mon Sep 17 00:00:00 2001

Message-Id: <1022fff9806e466679a965128b3d4856c0efd5c6.1351009358.git.ibell@...>

In-Reply-To: <180145dfd9a175bb1b824b63df34a41b7e97d425.1351009358.git.ibell@...>

References: <180145dfd9a175bb1b824b63df34a41b7e97d425.1351009358.git.ibell@...>

From: Ian Bell <ibell@...>

Date: Tue, 23 Oct 2012 14:09:37 +0100

Subject: [PATCH 05/12] Fix unittest

Fixed the openclose test adn removed a lot of debug printfs

Signed-off-by: Ian Bell <ibell@...>

---

mama/c_cpp/src/gunittest/c/openclosetest.cpp |   19 +++++++------------

1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/mama/c_cpp/src/gunittest/c/openclosetest.cpp b/mama/c_cpp/src/gunittest/c/openclosetest.cpp

index 63175ca..7fc05cf 100644

--- a/mama/c_cpp/src/gunittest/c/openclosetest.cpp

+++ b/mama/c_cpp/src/gunittest/c/openclosetest.cpp

@@ -62,7 +62,7 @@ void MamaOpenCloseTestC::TearDown(void)

 static void MAMACALLTYPE startCallback(mama_status status)

{

-    printf("In start in background callback\n");

+    //printf("In start in background callback\n");

}

@@ -84,19 +84,19 @@ TEST_F(MamaOpenCloseTestC, NestedOpenClose)

     mamaBridge mBridge;

     mama_loadBridge(&mBridge, getMiddleware());

-    printf("Attempt first open\n");

+    //printf("Attempt first open\n");

     mama_open();

-    printf("Attempt second open\n");

+    //printf("Attempt second open\n");

     mama_open();

-    printf("Attempt first close\n");

+    //printf("Attempt first close\n");

     mama_close();

-    printf("Attempt second close\n");

+    //printf("Attempt second close\n");

     mama_close();

-    printf("Finished nested testing\n");

+    //printf("Finished nested testing\n");

}

 TEST_F(MamaOpenCloseTestC, OpenCloseReopenSameBridge)

@@ -108,12 +108,7 @@ TEST_F(MamaOpenCloseTestC, OpenCloseReopenSameBridge)

     mama_close();

-    ASSERT_EQ(MAMA_STATUS_OK, mama_open());

-

-    return;

-

-    // If we get here there is a problem

-    ASSERT_TRUE(1);

+    ASSERT_EQ(MAMA_STATUS_NO_BRIDGE_IMPL, mama_open());

}

 TEST_F(MamaOpenCloseTestC, OpenCloseReopenNewBridge)

--

1.7.9.5