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

Refactored client API unit tests for operation creation change.

parent 26020293

test/unit/test_kinetic_client_delete.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void test_KineticClient_Delete_should_execute_DELETE_operation(void) 
    KineticEntry entry;

    KineticOperation operation;



    KineticOperation_Create_ExpectAndReturn(&Session, &operation);

    KineticAllocator_NewOperation_ExpectAndReturn(&Connection, &operation);

    KineticOperation_BuildDelete_Expect(&operation, &entry);

    KineticController_ExecuteOperation_ExpectAndReturn(&operation, NULL, KINETIC_STATUS_SUCCESS);

test/unit/test_kinetic_client_flush.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ void test_KineticClient_flush_should_get_success_if_no_writes_are_in_progress(vo 
    KineticOperation operation;

    KineticSession session = {.connection = &connection};



    KineticOperation_Create_ExpectAndReturn(&session, &operation);

    KineticAllocator_NewOperation_ExpectAndReturn(&connection, &operation);

    KineticOperation_BuildFlush_Expect(&operation);

    KineticController_ExecuteOperation_ExpectAndReturn(&operation, NULL, KINETIC_STATUS_SUCCESS);
@@ -68,7 +68,7 @@ void test_KineticClient_flush_should_expose_memory_error_from_CreateOperation(vo 
    KineticConnection connection;

    KineticSession session = {.connection = &connection};



    KineticOperation_Create_ExpectAndReturn(&session, NULL);

    KineticAllocator_NewOperation_ExpectAndReturn(&connection, NULL);

    

    KineticStatus status = KineticClient_Flush(&session, NULL);

test/unit/test_kinetic_client_get.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ void test_KineticClient_Get_should_execute_GET_operation(void) 
    };

    KineticOperation operation;



    KineticOperation_Create_ExpectAndReturn(&Session, &operation);

    KineticAllocator_NewOperation_ExpectAndReturn(&Connection, &operation);

    KineticOperation_BuildGet_Expect(&operation, &entry);

    KineticController_ExecuteOperation_ExpectAndReturn(&operation, NULL, KINETIC_STATUS_CLUSTER_MISMATCH);
@@ -123,7 +123,7 @@ void test_KineticClient_Get_should_execute_GET_operation_and_retrieve_only_metad 


    KineticOperation operation;



    KineticOperation_Create_ExpectAndReturn(&Session, &operation);

    KineticAllocator_NewOperation_ExpectAndReturn(&Connection, &operation);

    KineticOperation_BuildGet_Expect(&operation, &entry);

    KineticController_ExecuteOperation_ExpectAndReturn(&operation, NULL, KINETIC_STATUS_SUCCESS);

test/unit/test_kinetic_client_get_key_range.c

+1 −45
Original line number Diff line number Diff line
@@ -71,50 +71,6 @@ void tearDown(void) 
    KineticLogger_Close();

}



// command {

//   header {

//     // See above for descriptions of these fields

//     clusterVersion: ...

//     identity: ...

//     connectionID: ...

//     sequence: ...

//

//     // messageType should be GETKEYRANGE

//     messageType: GETKEYRANGE

//   }

//   body {

//     // The range message must be populated

//     range {

//       // Required bytes, the beginning of the requested range

//       startKey: "..."

//

//       // Optional bool, defaults to false

//       // True indicates that the start key should be included in the returned

//       // range

//       startKeyInclusive: ...

//

//       // Required bytes, the end of the requested range

//       endKey: "..."

//

//       // Optional bool, defaults to false

//       // True indicates that the end key should be included in the returned

//       // range

//       endKeyInclusive: ...

//

//       // Required int32, must be greater than 0

//       // The maximum number of keys returned, in sorted order

//       maxReturned: ...

//

//       // Optional bool, defaults to false

//       // If true, the key range will be returned in reverse order, starting at

//       // endKey and moving back to startKey.  For instance

//       // if the search is startKey="j", endKey="k", maxReturned=2,

//       // reverse=true and the keys "k0", "k1", "k2" exist

//       // the system will return "k2" and "k1" in that order.

//       reverse: ....

//     }

//   }

// }

void test_KineticClient_GetKeyRange_should_return_a_list_of_keys_within_the_specified_range(void)

{

    LOG_LOCATION;
@@ -136,7 +92,7 @@ void test_KineticClient_GetKeyRange_should_return_a_list_of_keys_within_the_spec 
    };

    KineticOperation operation;



    KineticOperation_Create_ExpectAndReturn(&Session, &operation);

    KineticAllocator_NewOperation_ExpectAndReturn(&Connection, &operation);

    KineticOperation_BuildGetKeyRange_Expect(&operation, &keyRange, &keyArray);

    KineticController_ExecuteOperation_ExpectAndReturn(&operation, NULL, KINETIC_STATUS_BUFFER_OVERRUN);

test/unit/test_kinetic_client_get_log.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ void test_KineticClient_GetLog_should_request_the_specified_log_data_from_the_de 
    KineticDeviceInfo* info;

    KineticOperation operation;



    KineticOperation_Create_ExpectAndReturn(&Session, &operation);

    KineticAllocator_NewOperation_ExpectAndReturn(&Connection, &operation);

    KineticOperation_BuildGetLog_Expect(&operation, KINETIC_DEVICE_INFO_TYPE_UTILIZATIONS, &info);

    KineticController_ExecuteOperation_ExpectAndReturn(&operation, NULL, KINETIC_STATUS_SUCCESS);