Cleaned up logging in tests (4e937c95) · Commits · kinetic-archive / kinetic-c

test/system/test_system_bus.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -45,11 +45,11 @@
		#include "bus.h"

		void setUp(void)
		{ LOG_LOCATION;
		{
		}

		void tearDown(void)
		{ LOG_LOCATION;
		{

		}

		@@ -245,7 +245,7 @@ static void unexpected_msg_cb(void *msg,


		void test_that_we_can_register_sockets(void)
		{ LOG_LOCATION;
		{

		KineticLogger_Init("stdout", 3);
		bus_config cfg = {
		@@ -283,7 +283,7 @@ void test_that_we_can_register_sockets(void)
		}

		void test_that_we_can_register_SSL_sockets(void)
		{ LOG_LOCATION;
		{

		KineticLogger_Init("stdout", 3);
		bus_config cfg = {

test/system/test_system_delete.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@ void tearDown(void)

		void test_Delete_should_delete_an_object_from_device(void)
		{
		LOG_LOCATION;
		KineticStatus status;

		// Create an object so that we have something to delete

test/system/test_system_erase.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ static ByteBuffer ValueBuffer;
		static const char strKey[] = "GET system test blob";

		void setUp(void)
		{ LOG_LOCATION;
		{
		SystemTestSetup(&Fixture, 2);

		KeyBuffer = ByteBuffer_CreateAndAppendCString(KeyData, sizeof(KeyData), strKey);
		@@ -75,12 +75,12 @@ void setUp(void)
		}

		void tearDown(void)
		{ LOG_LOCATION;
		{
		SystemTestTearDown(&Fixture);
		}

		void test_InstantSecureErase_should_erase_device_contents(void)
		{ LOG_LOCATION;
		{
		if (SystemTestIsUnderSimulator()) {
		KineticStatus status = KineticClient_InstantSecureErase(&Fixture.session);
		TEST_ASSERT_EQUAL_KineticStatus(KINETIC_STATUS_SUCCESS, status);

test/system/test_system_get.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ static ByteBuffer ValueBuffer;
		static const char strKey[] = "GET system test blob";

		void setUp(void)
		{ LOG_LOCATION;
		{
		SystemTestSetup(&Fixture, 1);

		KeyBuffer = ByteBuffer_CreateAndAppendCString(KeyData, sizeof(KeyData), strKey);
		@@ -74,12 +74,12 @@ void setUp(void)
		}

		void tearDown(void)
		{ LOG_LOCATION;
		{
		SystemTestTearDown(&Fixture);
		}

		void test_Get_should_retrieve_object_and_metadata_from_device(void)
		{ LOG_LOCATION;
		{

		KineticEntry getEntry = {
		.key = KeyBuffer,
		@@ -103,7 +103,7 @@ void test_Get_should_retrieve_object_and_metadata_from_device(void)
		}

		void test_Get_should_retrieve_object_and_metadata_from_device_again(void)
		{ LOG_LOCATION;
		{

		KineticEntry getEntry = {
		.key = KeyBuffer,
		@@ -126,7 +126,7 @@ void test_Get_should_retrieve_object_and_metadata_from_device_again(void)
		}

		void test_Get_should_be_able_to_retrieve_just_metadata_from_device(void)
		{ LOG_LOCATION;
		{

		KineticEntry getEntry = {
		.key = KeyBuffer,

test/system/test_system_get_log.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -27,13 +27,13 @@ static KineticStatus Status;
		static KineticDeviceInfo* Info;

		void setUp(void)
		{ LOG_LOCATION;
		{
		SystemTestSetup(&Fixture, 1);
		Info = NULL;
		}

		void tearDown(void)
		{ LOG_LOCATION;
		{
		SystemTestTearDown(&Fixture);
		if (Info != NULL) {
		KineticDeviceInfo_Free(Info);
		@@ -43,7 +43,7 @@ void tearDown(void)


		void test_GetLog_should_retrieve_utilizations_from_device(void)
		{ LOG_LOCATION;
		{
		Status = KineticClient_GetLog(&Fixture.session, KINETIC_DEVICE_INFO_TYPE_UTILIZATIONS, &Info, NULL);
		TEST_ASSERT_EQUAL_KineticStatus(KINETIC_STATUS_SUCCESS, Status);
		TEST_ASSERT_NOT_NULL(Info);
		@@ -57,7 +57,7 @@ void test_GetLog_should_retrieve_utilizations_from_device(void)
		}

		void test_GetLog_should_retrieve_capacity_from_device(void)
		{ LOG_LOCATION;
		{
		Status = KineticClient_GetLog(&Fixture.session, KINETIC_DEVICE_INFO_TYPE_CAPACITIES, &Info, NULL);
		TEST_ASSERT_EQUAL_KineticStatus(KINETIC_STATUS_SUCCESS, Status);
		TEST_ASSERT_NOT_NULL(Info->capacity);
		@@ -67,7 +67,7 @@ void test_GetLog_should_retrieve_capacity_from_device(void)
		}

		void test_GetLog_should_retrieve_temperatures_from_device(void)
		{ LOG_LOCATION;
		{
		Status = KineticClient_GetLog(&Fixture.session, KINETIC_DEVICE_INFO_TYPE_TEMPERATURES, &Info, NULL);
		TEST_ASSERT_EQUAL_KineticStatus(KINETIC_STATUS_SUCCESS, Status);
		TEST_ASSERT_TRUE(Info->numTemperatures >= 2);
		@@ -82,7 +82,7 @@ void test_GetLog_should_retrieve_temperatures_from_device(void)
		}

		void test_GetLog_should_retrieve_configuration_from_device(void)
		{ LOG_LOCATION;
		{
		char buf[1024];

		Status = KineticClient_GetLog(&Fixture.session, KINETIC_DEVICE_INFO_TYPE_CONFIGURATION, &Info, NULL);
		@@ -120,7 +120,7 @@ void test_GetLog_should_retrieve_configuration_from_device(void)
		}

		void test_GetLog_should_retrieve_statistics_from_device(void)
		{ LOG_LOCATION;
		{
		Status = KineticClient_GetLog(&Fixture.session, KINETIC_DEVICE_INFO_TYPE_STATISTICS, &Info, NULL);
		TEST_ASSERT_EQUAL_KineticStatus(KINETIC_STATUS_SUCCESS, Status);
		TEST_ASSERT_NOT_NULL(Info->statistics);
		@@ -138,7 +138,7 @@ void test_GetLog_should_retrieve_statistics_from_device(void)
		uint8_t* Buffer[1024 * 1024 * 10];

		void test_GetLog_should_retrieve_messages_from_device(void)
		{ LOG_LOCATION;
		{
		Status = KineticClient_GetLog(&Fixture.session, KINETIC_DEVICE_INFO_TYPE_MESSAGES, &Info, NULL);
		TEST_ASSERT_EQUAL_KineticStatus(KINETIC_STATUS_SUCCESS, Status);
		TEST_ASSERT_NOT_NULL(Info->messages.data);
		@@ -150,7 +150,7 @@ void test_GetLog_should_retrieve_messages_from_device(void)
		}

		void test_GetLog_should_retrieve_limits_from_device(void)
		{ LOG_LOCATION;
		{
		Status = KineticClient_GetLog(&Fixture.session, KINETIC_DEVICE_INFO_TYPE_LIMITS, &Info, NULL);
		TEST_ASSERT_EQUAL_KineticStatus(KINETIC_STATUS_SUCCESS, Status);
		TEST_ASSERT_NOT_NULL(Info->limits);
		@@ -170,7 +170,7 @@ void test_GetLog_should_retrieve_limits_from_device(void)
		}

		void test_GetLog_should_retrieve_device_info_from_device(void)
		{ LOG_LOCATION;
		{
		Status = KineticClient_GetLog(&Fixture.session, KINETIC_DEVICE_INFO_TYPE_DEVICE, &Info, NULL);
		if (Status == KINETIC_STATUS_NOT_FOUND) {
		TEST_IGNORE_MESSAGE("Java simulator currently does NOT support GETLOG 'DEVICE' info attribute!");