Fixes names in randomizer functions and randomizer tests

source/src/utils/CMakeLists.txt

@@ -2,6 +2,6 @@
 opener_common_includes()
 opener_platform_spec()
 
-set( UTILS_SRC xorshiftrandom.c)
+set( UTILS_SRC random.c xorshiftrandom.c)
 
 add_library( Utils ${UTILS_SRC} )

source/src/utils/xorshiftrandom.c

@@ -23,7 +23,7 @@ void CalculateNextSeed(void) {
   xor_shift_seed ^= xor_shift_seed << 5;
 }
 
-uint32_t NextXorShiftUInt32(void) {
+uint32_t NextXorShiftUint32(void) {
   CalculateNextSeed();
   return xor_shift_seed;
 }

source/tests/CMakeLists.txt

@@ -16,10 +16,11 @@ configure_file( CTestCustom.cmake ${PROJECT_BINARY_DIR}/CTestCustom.cmake )
 add_subdirectory( utils )
 add_executable( OpENer_Tests OpENerTests.cpp )
 
-set( CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${CPPUTEST_HOME}/lib )
+find_library ( CPPUTEST_LIBRARY CppUTest ${CPPUTEST_HOME}/cpputest_build/lib )
+find_library ( CPPUTESTEXT_LIBRARY CppUTestExt ${CPPUTEST_HOME}/cpputest_build/lib )
 
-target_link_libraries( OpENer_Tests CppUTest CppUTestExt )
-target_link_libraries( OpENer_Tests UtilsTest Utils )
+target_link_libraries( OpENer_Tests gcov ${CPPUTEST_LIBRARY} ${CPPUTESTEXT_LIBRARY} )
+target_link_libraries( OpENer_Tests UtilsTest Utils ) 
 
 ########################################
 # Adds test to CTest environment       #

source/tests/utils/randomTests.cpp

@@ -22,7 +22,7 @@ TEST(RandomClass, CreateXOrShiftObject)
 {
 	Random* pRandom;
 	uint32_t nResult = 0;
-	pRandom = random_new(SetXorShiftSeed, NextXorShiftUint32);
-	POINTERS_EQUAL(SetXorShiftSeed, pRandom->setSeed);
-	POINTERS_EQUAL(NextXorShiftUint32, pRandom->getNextUInt32);
+	pRandom = RandomNew(SetXorShiftSeed, NextXorShiftUint32);
+	POINTERS_EQUAL(SetXorShiftSeed, pRandom->set_seed);
+	POINTERS_EQUAL(NextXorShiftUint32, pRandom->get_next_uint32);
 }