From 2c7017ad9c4be2aa11d3bf8209f953713d4098bd Mon Sep 17 00:00:00 2001
From: Sebastian Ohlmann <sebastian.ohlmann@mpcdf.mpg.de>
Date: Thu, 21 Oct 2021 11:07:42 +0200
Subject: [PATCH 1/2] Add new function: add2
---
src/funcs.cpp | 1 +
tests/test_funcs.cpp | 3 +++
2 files changed, 4 insertions(+)
diff --git a/src/funcs.cpp b/src/funcs.cpp
index 1eafd06..d8d62d3 100644
--- a/src/funcs.cpp
+++ b/src/funcs.cpp
@@ -2,6 +2,7 @@
using namespace std;
int add(int a,int b){return a+b;}
+int add2(int a,int b){return a+b+2;}
int sub(int a,int b){return a-b;}
int mul(int a,int b){return a*b;}
int dv(int a,int b){
diff --git a/tests/test_funcs.cpp b/tests/test_funcs.cpp
index c13d2e8..640e7bc 100644
--- a/tests/test_funcs.cpp
+++ b/tests/test_funcs.cpp
@@ -4,6 +4,9 @@
TEST(FuncsTest,Add){
EXPECT_EQ(6,add(4,2));
};
+TEST(FuncsTest,Add2){
+ EXPECT_EQ(8,add2(4,2));
+};
TEST(FuncsTest,Sub){
EXPECT_EQ(2,sub(4,2));
};
--
GitLab
From bf5abf5e25850da836972553f944a4d1da86a5a7 Mon Sep 17 00:00:00 2001
From: Sebastian Ohlmann <sebastian.ohlmann@mpcdf.mpg.de>
Date: Thu, 21 Oct 2021 11:10:50 +0200
Subject: [PATCH 2/2] Add MR template
---
.gitlab/merge_request_templates/default.md | 7 +++++++
1 file changed, 7 insertions(+)
create mode 100644 .gitlab/merge_request_templates/default.md
diff --git a/.gitlab/merge_request_templates/default.md b/.gitlab/merge_request_templates/default.md
new file mode 100644
index 0000000..4effa46
--- /dev/null
+++ b/.gitlab/merge_request_templates/default.md
@@ -0,0 +1,7 @@
+# Description
+
+Describe your changes
+
+# Checklist
+[ ] Tests pass
+[ ] I checked the coding guidelines
--
GitLab