From bdf6349c7b498ab9fda9ac1f08b0927ffe79038c Mon Sep 17 00:00:00 2001 From: georgina <20093147> Date: Tue, 22 Feb 2022 15:49:17 +0000 Subject: [PATCH 1/4] added hello --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 1531e216..630db52f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -2,7 +2,7 @@ # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven name: Java CI with Maven - +//hello on: push: branches: [ master ] From d819ddde2f7276ba0504f12a223d19eb8bae0cfa Mon Sep 17 00:00:00 2001 From: georgina <20093147> Date: Tue, 22 Feb 2022 15:50:13 +0000 Subject: [PATCH 2/4] added there --- .github/workflows/maven.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 630db52f..b8c19e2f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -3,6 +3,7 @@ name: Java CI with Maven //hello +//world on: push: branches: [ master ] From d1fb80d0c5a5189532126966131bac8be1aaf85d Mon Sep 17 00:00:00 2001 From: georgina <20093147> Date: Tue, 22 Feb 2022 15:54:11 +0000 Subject: [PATCH 3/4] branch --- .github/workflows/maven.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b8c19e2f..3a6a937d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -4,6 +4,7 @@ name: Java CI with Maven //hello //world +//branch on: push: branches: [ master ] From bf00cc52fa6320b59d96fc5e2214e692dba0f2a8 Mon Sep 17 00:00:00 2001 From: georgina <20093147> Date: Tue, 22 Feb 2022 16:11:12 +0000 Subject: [PATCH 4/4] testAdd5 --- .github/workflows/maven.yml | 4 +--- .../gettingstarted/GettingStartedTest.java | 22 +++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3a6a937d..1531e216 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -2,9 +2,7 @@ # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven name: Java CI with Maven -//hello -//world -//branch + on: push: branches: [ master ] diff --git a/src/test/java/tudelft/gettingstarted/GettingStartedTest.java b/src/test/java/tudelft/gettingstarted/GettingStartedTest.java index dca51b75..6d269bba 100644 --- a/src/test/java/tudelft/gettingstarted/GettingStartedTest.java +++ b/src/test/java/tudelft/gettingstarted/GettingStartedTest.java @@ -13,15 +13,15 @@ public void addFiveTo20() { // UNCOMMENT THE CODE BELOW, AND FILL THE GAPS! -// @Test -// public void addFiveToZero() { -// int result = new GettingStarted().addFive(???); -// Assertions.assertEquals(???, result); -// } -// -// @Test -// public void addFiveToMinus20() { -// int result = new GettingStarted().addFive(???); -// Assertions.assertEquals(????,result); -// } + @Test + public void addFiveToZero() { + int result = new GettingStarted().addFive(0); + Assertions.assertEquals(5, result); + } + + @Test + public void addFiveToMinus20() { + int result = new GettingStarted().addFive(-20); + Assertions.assertEquals(-15,result); + } }