Merge remote-tracking branch 'assignments-base/assignment2'

Author: amisev

.github/workflows/github-actions.yml

@@ -16,7 +16,7 @@ jobs:
           - name: Run unit test
             run: ./unit-test.sh
     full-test:
-        container: cuaesd/aesd-autotest:24-assignment1
+        container: cuaesd/aesd-autotest:24-assignment2
         runs-on: self-hosted
         steps:
           - uses: actions/checkout@v2

CMakeLists.txt

@@ -7,7 +7,6 @@ project(aesd-assignments)
 set(AUTOTEST_SOURCES
     test/assignment1/Test_hello.c
     test/assignment1/Test_assignment_validate.c
-    ../student-test/assignment1/Test_validate_username.c
 )
 # A list of all files containing test code that is used for assignment validation
 set(TESTED_SOURCE

assignment-autotest

@@ -1 +1 @@
-assignment1
+assignment2

conf/assignment.txt

@@ -6,10 +6,10 @@
 
 /**
 * This function should:
-*   1) Call the my_username() function in autotest-validate.c to get your hard coded username.
+*   1) Call the my_username() function in Test_assignment_validate.c to get your hard coded username.
 *   2) Obtain the value returned from function malloc_username_from_conf_file() in username-from-conf-file.h within
 *       the assignment autotest submodule at assignment-autotest/test/assignment1/
-*   3) Use unity assertion TEST_ASSERT_EQUAL_STRING_MESSAGE to verify the two strings are equal.  See
+*   3) Use unity assertion TEST_ASSERT_EQUAL_STRING_MESSAGE the two strings are equal.  See
 *       the [unity assertion reference](https://github.com/ThrowTheSwitch/Unity/blob/master/docs/UnityAssertionsReference.md)
 */
 void test_validate_my_username()