From d39c0e19cff460b7c8ad2e1ad373cd65a0727730 Mon Sep 17 00:00:00 2001 From: Andrzej Rafalski Date: Sat, 4 Jun 2022 13:25:49 +0200 Subject: [PATCH 1/3] add clang-format job --- .github/workflows/vector-of-shared-ptrs.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/vector-of-shared-ptrs.yml b/.github/workflows/vector-of-shared-ptrs.yml index b8c284cb..ce09d3c4 100644 --- a/.github/workflows/vector-of-shared-ptrs.yml +++ b/.github/workflows/vector-of-shared-ptrs.yml @@ -20,3 +20,12 @@ jobs: - name: Run tests working-directory: ${{ env.path }} run: ctest -V + + formatting_check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Run clang-format style check + uses: coders-school/github-actions/clang-format-check@main + with: + check_path: 'homework/vector-of-shared-ptrs' From 590f0f08568be685a78b267d8823e8ff17806f02 Mon Sep 17 00:00:00 2001 From: Andrzej Rafalski Date: Sat, 4 Jun 2022 13:26:02 +0200 Subject: [PATCH 2/3] add .clang-format file --- .clang-format | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..c7b6b950 --- /dev/null +++ b/.clang-format @@ -0,0 +1,9 @@ +Language: Cpp +BasedOnStyle: Chromium +UseTab: Never +IndentWidth: 4 +TabWidth: 4 +AllowShortIfStatementsOnASingleLine: Never +IndentCaseLabels: false +ColumnLimit: 0 +AccessModifierOffset: -4 From 23e6b4fad2eb87d22f4473cbb77d3319d5c971c1 Mon Sep 17 00:00:00 2001 From: Andrzej Rafalski Date: Sat, 4 Jun 2022 13:26:14 +0200 Subject: [PATCH 3/3] update formatting in task files --- homework/vector-of-shared-ptrs/test.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/homework/vector-of-shared-ptrs/test.cpp b/homework/vector-of-shared-ptrs/test.cpp index e044ea05..277090b4 100644 --- a/homework/vector-of-shared-ptrs/test.cpp +++ b/homework/vector-of-shared-ptrs/test.cpp @@ -1,7 +1,7 @@ -#include #include -#include "vectorFunctions.hpp" +#include #include "gtest/gtest.h" +#include "vectorFunctions.hpp" constexpr const int count = 10; @@ -9,7 +9,7 @@ struct Homework : public testing::Test { auto generateExpectedVector(int count) { std::vector> expected; expected.reserve(count); - for (size_t i = 0 ; i < count ; ++i) { + for (size_t i = 0; i < count; ++i) { expected.emplace_back(std::make_shared(i)); } return expected; @@ -20,7 +20,7 @@ TEST_F(Homework, ShouldGenerateVectorOfProperSize) { auto expected = generateExpectedVector(count); auto result = generate(count); ASSERT_EQ(expected.size(), result.size()); - for (size_t i = 0 ; i < count ; ++i) { + for (size_t i = 0; i < count; ++i) { EXPECT_EQ(*result[i], i); } } @@ -29,7 +29,7 @@ TEST_F(Homework, ShouldAdd10ToEachElement) { auto result = generate(count); add10(result); - for (size_t i = 0 ; i < count ; ++i) { + for (size_t i = 0; i < count; ++i) { EXPECT_EQ(*result[i], i + 10); } } @@ -37,10 +37,10 @@ TEST_F(Homework, ShouldAdd10ToEachElement) { TEST_F(Homework, ShouldNotAdd10WhenNullptr) { std::vector> vec(count); for (auto& num : vec) { - num = nullptr; + num = nullptr; } add10(vec); - for (size_t i = 0 ; i < count ; ++i) { + for (size_t i = 0; i < count; ++i) { EXPECT_EQ(vec[i], nullptr); } } @@ -61,12 +61,12 @@ TEST_F(Homework, ShouldNotSubtract10ForNullptr) { TEST_F(Homework, ShouldSubtract10ForVector) { std::vector> vec; vec.reserve(count); - for (size_t i = 0 ; i < count ; ++i) { + for (size_t i = 0; i < count; ++i) { vec.emplace_back(std::make_shared(i + 10)); } sub10(vec); - for (size_t i = 0 ; i < count ; ++i) { + for (size_t i = 0; i < count; ++i) { EXPECT_EQ(*vec[i], i); } } @@ -74,14 +74,14 @@ TEST_F(Homework, ShouldSubtract10ForVector) { TEST_F(Homework, BehavioralTest) { std::vector> vec; vec.reserve(count); - for (size_t i = 0 ; i < count ; ++i) { + for (size_t i = 0; i < count; ++i) { vec.emplace_back(std::make_shared(i + 10)); } auto copyVec = vec; sub10(vec); add10(vec); EXPECT_EQ(copyVec, vec); - for (size_t i = 0 ; i < count ; ++i) { + for (size_t i = 0; i < count; ++i) { EXPECT_EQ(vec[i], copyVec[i]); } }