Merge branch 'ci-episode-6-exercise-1-optimize-ci-pipeline' into...

Merge branch 'ci-episode-6-exercise-1-optimize-ci-pipeline' into ci-episode-7-exercise-1-using-includes

.gitlab/ci/run.gitlab-ci.yml

@@ -6,15 +6,15 @@
 ---
 
 running:
-  image: gcc:13
+  image: gcc:14
   stage: run
   script:
-    - cd build_gcc_13/bin/ && ./helloWorld
+    - cd build_gcc_14/bin/ && ./helloWorld
   needs:
     - job: "build:gcc"
       artifacts: true
       parallel:
         matrix:
-          - VERSION: 13
+          - VERSION: 14
 
 ...

src/main.cpp

@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 #include <iostream>
+#include <string>
 
 #include "src/helloworld.h"
 

tests/tests.cpp

@@ -4,41 +4,42 @@
 
 #include <gtest/gtest.h>
 #include <cstdlib>
+#include <string>
 
 #include "src/helloworld.h"
 
 namespace {
 
-    TEST(getUserNameViaEnv, HandleEnvUnset) {
-        // Test if function returns World if environment variable unset
-
-        // Make sure environment variable is unset
-        char* envVarNameChar;
-        std::string envVarName = std::string{"GITLAB_USER_NAME"};
-        envVarNameChar = &envVarName[0];
-        unsetenv(envVarNameChar);
-
-        // Assert that we get the expected result
-        EXPECT_EQ(std::string{"World"}, getUserNameViaEnv());
-    }
-
-    TEST(getUserNameViaEnv, HandleEnvSet) {
-        // Test if function returns World if environment variable unset
-
-        // Set the environment variable to the desired value
-        char* envVarNameChar;
-        char* envVarValChar;
-        std::string envVarName = std::string{"GITLAB_USER_NAME"};
-        std::string envVarVal = std::string{"Jane Doe"};
-        envVarNameChar = &envVarName[0];
-        envVarValChar = &envVarVal[0];
-        setenv(envVarNameChar, envVarValChar, true);
-
-        // Assert that function output and environment variable are similar
-        EXPECT_EQ(envVarVal, getUserNameViaEnv());
-
-        // Clean up
-        unsetenv(envVarNameChar);
-    }
+TEST(getUserNameViaEnv, HandleEnvUnset) {
+    // Test if function returns World if environment variable unset
+
+    // Make sure environment variable is unset
+    char* envVarNameChar;
+    std::string envVarName = std::string{"GITLAB_USER_NAME"};
+    envVarNameChar = &envVarName[0];
+    unsetenv(envVarNameChar);
+
+    // Assert that we get the expected result
+    EXPECT_EQ(std::string{"World"}, getUserNameViaEnv());
+}
+
+TEST(getUserNameViaEnv, HandleEnvSet) {
+    // Test if function returns World if environment variable unset
+
+    // Set the environment variable to the desired value
+    char* envVarNameChar;
+    char* envVarValChar;
+    std::string envVarName = std::string{"GITLAB_USER_NAME"};
+    std::string envVarVal = std::string{"Jane Doe"};
+    envVarNameChar = &envVarName[0];
+    envVarValChar = &envVarVal[0];
+    setenv(envVarNameChar, envVarValChar, true);
+
+    // Assert that function output and environment variable are similar
+    EXPECT_EQ(envVarVal, getUserNameViaEnv());
+
+    // Clean up
+    unsetenv(envVarNameChar);
+}
 
 }  // namespace