Commit da20ddbf authored by Greg Williams's avatar Greg Williams
Browse files

Fixed test setup issues to get by newly added assertions

parent 89a1bb4f

test/system/test_system_stress_single_session_threaded.c

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ void test_kinetic_client_throughput_for_small_sized_objects(void) 
    for (uint32_t i = 0; i < 2; i++) {

        KineticClientConfig config = {

            .logFile = "stdout",

            .logLevel = 2,

            .logLevel = 0,

        };

        KineticClient * client = KineticClient_Init(&config);

        run_tests(client);

test/unit/test_kinetic_client_put.c

+2 −0
Original line number Diff line number Diff line
@@ -51,9 +51,11 @@ void tearDown(void) 
void test_KineticClient_Put_should_execute_PUT_operation(void)

{

    Session.connection = &Connection;

    Connection.pSession = &Session;

    ByteArray value = ByteArray_CreateWithCString("Four score, and seven years ago");

    KineticEntry entry = {.value = ByteBuffer_CreateWithArray(value)};

    KineticOperation operation;

    operation.connection = &Connection;

    

    KineticController_CreateOperation_ExpectAndReturn(&Session, &operation);

    KineticOperation_BuildPut_Expect(&operation, &entry);

test/unit/test_kinetic_operation.c

+2 −2
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ void setUp(void) 
    KineticLogger_Init("stdout", 1);

    Connection.connectionID = ConnectionID;

    Session.connection = &Connection;

    Connection.pSession = &Session;

    KineticPDU_InitWithCommand(&Request, &Connection);

    KineticPDU_InitWithCommand(&Response, &Connection);

    KineticOperation_Init(&Operation, &Connection);
@@ -58,7 +59,6 @@ void setUp(void) 
    Operation.connection = &Connection;

    SessionConfig = (KineticSessionConfig) {.host = "anyhost", .port = KINETIC_PORT};

    Session = (KineticSession) {.config = SessionConfig, .connection = &Connection};

    Connection.session = Session;

}



void tearDown(void)

test/unit/test_kinetic_pdu.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ void setUp(void) 
    memset(&Connection, 0, sizeof(Connection));

    Connection.connected = true;

    Connection.socket = 456;

    Connection.session = Session;

    Connection.pSession = &Session;



    KineticPDU_Init(&PDU, &Connection);

    ByteArray_FillWithDummyData(Value);

test/unit/test_kinetic_session.c

+16 −4
Original line number Diff line number Diff line
@@ -47,15 +47,20 @@ static KineticPDU Request, Response; 
static int OperationCompleteCallbackCount;

static KineticStatus LastStatus;

static struct _KineticClient Client;

static struct bus MessageBus;



void setUp(void)

{

    memset(&Session, 0, sizeof(Session));

    Session.config = (KineticSessionConfig) {

        .host = "somehost.com",

        .port = 17,

    };

    memset(&Connection, 0, sizeof(Connection));

    KineticAllocator_NewConnection_ExpectAndReturn(&Connection);

    Connection.pSession = &Session;

    Client.bus = &MessageBus;



    KineticAllocator_NewConnection_ExpectAndReturn(&MessageBus, &Session, &Connection);

    KineticCountingSemaphore_Create_ExpectAndReturn(KINETIC_MAX_OUTSTANDING_OPERATIONS_PER_SESSION, &Semaphore);

    

    KineticStatus status = KineticSession_Create(&Session, &Client);
@@ -65,7 +70,6 @@ void setUp(void) 
    TEST_ASSERT_FALSE(Session.connection->connected);

    TEST_ASSERT_EQUAL_STRING(Session.config.host, "somehost.com");

    TEST_ASSERT_EQUAL(17, Session.config.port);

    TEST_ASSERT_EQUAL(-1, Session.connection->socket);



    KineticPDU_InitWithCommand(&Request, Session.connection);

    KineticPDU_InitWithCommand(&Response, Session.connection);
@@ -87,15 +91,22 @@ void test_KineticSession_Create_should_return_KINETIC_STATUS_SESSION_EMPTY_upon_ 
void test_KineticSession_Create_should_return_KINETIC_STATUS_SESSION_EMPTY_upon_NULL_client(void)

{

    LOG_LOCATION;

    TEST_ASSERT_EQUAL(KINETIC_STATUS_SESSION_EMPTY, KineticSession_Create(&Session, NULL));

    KineticSession session;

    memset(&session, 0, sizeof(session));

    session.connection = &Connection;

    TEST_ASSERT_EQUAL(KINETIC_STATUS_SESSION_EMPTY, KineticSession_Create(&session, NULL));

}



void test_KineticSession_Create_should_allocate_and_destroy_KineticConnections(void)

{

    LOG_LOCATION;

    KineticSession session;

    memset(&session, 0, sizeof(session));

    KineticConnection connection;

    KineticAllocator_NewConnection_ExpectAndReturn(&connection);

    connection.pSession = &session;

    // session.connection = &connection;



    KineticAllocator_NewConnection_ExpectAndReturn(&MessageBus, &session, &connection);

    KineticCountingSemaphore_Create_ExpectAndReturn(KINETIC_MAX_OUTSTANDING_OPERATIONS_PER_SESSION, &Semaphore);

    KineticStatus status = KineticSession_Create(&session, &Client);

    TEST_ASSERT_EQUAL_KineticStatus(KINETIC_STATUS_SUCCESS, status);
@@ -118,6 +129,7 @@ void test_KineticSession_Connect_should_return_KINETIC_SESSION_EMPTY_upon_NULL_s 
    TEST_ASSERT_EQUAL(KINETIC_STATUS_SESSION_EMPTY, status);

}





void test_KineticSession_Connect_should_return_KINETIC_STATUS_CONNECTION_ERROR_upon_NULL_connection(void)

{

    LOG_LOCATION;