Merge branch 'jonas' of https://git.efi.th-nuernberg.de/gitea/gloecknerni100842/I2_Projects into jonas
This commit is contained in:
commit
c3ce82150e
@ -233,6 +233,7 @@ int main()
|
|||||||
{
|
{
|
||||||
UNITY_BEGIN();
|
UNITY_BEGIN();
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
printf("\n============================\n Stack tests\n============================\n");
|
printf("\n============================\n Stack tests\n============================\n");
|
||||||
@ -253,6 +254,8 @@ int main()
|
|||||||
=======
|
=======
|
||||||
>>>>>>> 0c075ea (stackTest file added)
|
>>>>>>> 0c075ea (stackTest file added)
|
||||||
=======
|
=======
|
||||||
|
=======
|
||||||
|
>>>>>>> ef8340ba6b9e7a4d6bac8d0eb9b4b987a9316088
|
||||||
RUN_TEST(test_push_should_add_new_node_at_top);
|
RUN_TEST(test_push_should_add_new_node_at_top);
|
||||||
RUN_TEST(test_push_multiple_should_chain_nodes_correctly);
|
RUN_TEST(test_push_multiple_should_chain_nodes_correctly);
|
||||||
RUN_TEST(test_top_should_return_null_on_empty_stack);
|
RUN_TEST(test_top_should_return_null_on_empty_stack);
|
||||||
@ -261,6 +264,9 @@ int main()
|
|||||||
RUN_TEST(test_pop_should_remove_single_element);
|
RUN_TEST(test_pop_should_remove_single_element);
|
||||||
RUN_TEST(test_pop_should_remove_top_node_only);
|
RUN_TEST(test_pop_should_remove_top_node_only);
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
>>>>>>> 0d561c0 (added stackTest)
|
>>>>>>> 0d561c0 (added stackTest)
|
||||||
|
=======
|
||||||
|
>>>>>>> ef8340ba6b9e7a4d6bac8d0eb9b4b987a9316088
|
||||||
return UNITY_END();
|
return UNITY_END();
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user