Update tests to deal with GSSCommand objects now taking only the 'argument' part...

[gssweb.git] / json_gssapi / test / GSSUnwrapTest.cpp

diff --git a/json_gssapi/test/GSSUnwrapTest.cpp b/json_gssapi/test/GSSUnwrapTest.cpp
index d807b52..de0d9a1 100644 (file)
--- a/json_gssapi/test/GSSUnwrapTest.cpp
+++ b/json_gssapi/test/GSSUnwrapTest.cpp
@@ -5,11 +5,16 @@
  *
  */
 
+#include <string>
+
 #include "GSSUnwrapTest.h"
 #include "command_mocks/MockUnwrap.h"
 #include "GSSUnwrap.h"
+#include <datamodel/GSSContext.h>
+#include <cache/GSSContextCache.h>
 #include <gssapi/gssapi.h>
 
+
 CPPUNIT_TEST_SUITE_REGISTRATION( GSSUnwrapTest );
 
 /* 
@@ -138,15 +143,14 @@ void GSSUnwrapTest::testEmptyCall()
 void GSSUnwrapTest::testConstructorWithJSONObject()
 {
   /* Variables */
-  const char* input = "{\"method\": \"gss_wrap\", \
-    \"arguments\": \
-    { \
-         \"context_handle\": \"#######\", \
+  GSSContext context((gss_ctx_id_t)rand(), true);
+  std::string key = GSSContextCache::instance()->store(context);
+  std::string input = "{ \
+         \"context_handle\": \"" + key + "\", \
          \"input_message\": \"mary had a little lamb\" \
-    }\
-  }";
+    }";
   json_error_t jsonErr;
-  JSONObject json = JSONObject::load(input, 0, &jsonErr);
+  JSONObject json = JSONObject::load(input.c_str(), 0, &jsonErr);
   
   GSSUnwrap cmd = GSSUnwrap(&json, &mock_unwrap);
   
@@ -155,6 +159,12 @@ void GSSUnwrapTest::testConstructorWithJSONObject()
   /* Main */
   
   CPPUNIT_ASSERT_EQUAL_MESSAGE(
+    "GSSUnwrap did not retrieve the GSS context correctly",
+    context.getContext(),
+    cmd.getContextHandle()
+  );
+  
+  CPPUNIT_ASSERT_EQUAL_MESSAGE(
     "GSSUnwrap did not parse the input message argument correctly",
     std::string("mary had a little lamb"),
     cmd.getInputMessage().toString()
@@ -189,35 +199,29 @@ void GSSUnwrapTest::testJSONMarshal()
   result = cmd.toJSON();
 //   std::cout << "\nGSSUnwrap JSON: \n" << result->dump() << "\n";
   
-  CPPUNIT_ASSERT_EQUAL_MESSAGE(
-    "The command name is incorrect",
-    std::string("gss_wrap"),
-    std::string( (*result)["command"].string() )
-  );
-  
   
   CPPUNIT_ASSERT_EQUAL_MESSAGE(
     "The return value was reported incorrectly",
     (int)MockUnwrap::retVal,
-    (int)( (*result)["return_values"]["major_status"].integer() )
+    (int)( (*result)["major_status"].integer() )
   );
   
   CPPUNIT_ASSERT_EQUAL_MESSAGE(
     "The minor_status value was reported incorrectly",
     (int)MockUnwrap::minor_status,
-    (int)( (*result)["return_values"]["minor_status"].integer() )
+    (int)( (*result)["minor_status"].integer() )
   );
   
   CPPUNIT_ASSERT_EQUAL_MESSAGE(
     "The output message was reported incorrectly",
     MockUnwrap::outputMessageBuffer.toString(),
-    std::string( (*result)["return_values"]["output_message"].string() )
+    std::string( (*result)["output_message"].string() )
   );
   
   CPPUNIT_ASSERT_EQUAL_MESSAGE(
     "The minor_status value was reported incorrectly",
     (int)qopState,
-    (int)( (*result)["return_values"]["qop_state"].integer() )
+    (int)( (*result)["qop_state"].integer() )
   );