#include <iostream>
#include <string.h>
#include <exception>
-#include "util_json.h"
+#include "utils/util_json.h"
#include <cache/GSSContextCache.h>
#include <cache/GSSNameCache.h>
#include <datamodel/GSSContext.h>
-#include <utils/base64.h>
+#include <utils/util_base64.h>
// Registers the fixture into the 'registry'
CPPUNIT_TEST_SUITE_REGISTRATION( GSSCreateSecContextTest );
GSSCreateSecContextTest::testConstructor()
{
GSSInitSecContext cmd = GSSInitSecContext();
- void *cmdFn;
- void *GSSFn;
+ init_sec_context_type cmdFn;
+ init_sec_context_type GSSFn;
cmdFn = cmd.getGSSFunction();
- GSSFn = (void *)&gss_init_sec_context;
+ GSSFn = &gss_init_sec_context;
CPPUNIT_ASSERT_MESSAGE(
"The default constructor for GSSCreateSecContextCommand should assign the function gss_init_sec_context",
cmdFn == GSSFn);
GSSInitSecContext cmd = GSSInitSecContext(
&json,
- (void *)&mock_init_sec
+ &mock_init_sec
);
const char *from_cmd = cmd.getTargetDisplayName();
{
gss_ctx_id_t expectedResult, expectedArgument;
- GSSInitSecContext cmd ((void *)&mock_init_sec);
+ GSSInitSecContext cmd (&mock_init_sec);
/* Set expectations on what the GSS function will be called with */
cmd.time_req = rand() % 1024;
void GSSCreateSecContextTest::testJSONMarshal()
{
/* Variables */
- GSSInitSecContext cmd ((void *)&mock_init_sec);
+ GSSInitSecContext cmd (&mock_init_sec);
JSONObject *result;
GSSContextCache *cache = GSSContextCache::instance();
GSSContext context;
- unsigned long len;
std::string str = (*result)["output_token"].string();
- unsigned char *decoded = base64_decode(str, &len);
+ size_t len;
+ void *decoded = base64Decode(str.c_str(), &len);
+ CPPUNIT_ASSERT_MESSAGE(
+ "The decoded token size is incorrect",
+ ( len == InitSecContextMock::output_token.length )
+ );
CPPUNIT_ASSERT_MESSAGE(
"The output_token value was reported incorrectly",
- ( strcmp((const char *)(InitSecContextMock::output_token.value),
- (const char *)decoded ) == 0 )
+ ( memcmp(InitSecContextMock::output_token.value,
+ decoded, len ) == 0 )
);
+ base64Free(decoded);
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"The minor_status value was reported incorrectly",