From a5c46d395a1b03e8dcd35540b484dc0af0f2502c Mon Sep 17 00:00:00 2001 From: PicToWeb Date: Fri, 7 Jun 2024 12:20:08 +0200 Subject: [PATCH 1/6] essai --- src/test/java/java17/ex01/Method_01_Test.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/java/java17/ex01/Method_01_Test.java b/src/test/java/java17/ex01/Method_01_Test.java index 5dbe9d0a..665a8d3b 100644 --- a/src/test/java/java17/ex01/Method_01_Test.java +++ b/src/test/java/java17/ex01/Method_01_Test.java @@ -16,9 +16,13 @@ public class Method_01_Test { // tag::IDao[] interface IDao { List findAll(); - + // TODO créer une méthode int sumAge() // TODO Cette méthode retourne le résultat de l'addition des ages des personnes + public default int sumAge(int a,int b) { + return a +b; + } + } // end::IDao[] From 7f2099f4e9419642d50a2fc8ea4f82dc1c003ae6 Mon Sep 17 00:00:00 2001 From: PicToWeb Date: Fri, 7 Jun 2024 12:40:48 +0200 Subject: [PATCH 2/6] ex01- method_01_test --- src/test/java/java17/ex01/Method_01_Test.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/test/java/java17/ex01/Method_01_Test.java b/src/test/java/java17/ex01/Method_01_Test.java index 665a8d3b..ccb319e4 100644 --- a/src/test/java/java17/ex01/Method_01_Test.java +++ b/src/test/java/java17/ex01/Method_01_Test.java @@ -2,8 +2,11 @@ import java.util.List; + import org.junit.Test; + + import java17.data.Data; import java17.data.Person; @@ -15,12 +18,17 @@ public class Method_01_Test { // tag::IDao[] interface IDao { + List findAll(); // TODO créer une méthode int sumAge() // TODO Cette méthode retourne le résultat de l'addition des ages des personnes - public default int sumAge(int a,int b) { - return a +b; + public default int sumAge() { + int result = 0; + for (Person personne :findAll()) { + result += personne.getAge(); + } + return result; } } @@ -46,13 +54,17 @@ public List findAll() { } } + @Test public void test_daoA_sumAge() throws Exception { DaoA daoA = new DaoA(); // TODO invoquer la méthode sumAge pour que le test soit passant - int result = 0; + DaoA ex1 = new DaoA(); + int result = ex1.sumAge(); + + assert result == 210; } @@ -63,7 +75,9 @@ public void test_daoB_sumAge() throws Exception { DaoB daoB = new DaoB(); // TODO invoquer la méthode sumAge pour que le test soit passant - int result = 0; + DaoB ex1 = new DaoB(); + int result = ex1.sumAge(); + assert result == 5050; From b273c876f9d5d0434282f74748daf78ca51f382c Mon Sep 17 00:00:00 2001 From: PicToWeb Date: Fri, 7 Jun 2024 12:56:43 +0200 Subject: [PATCH 3/6] ex1 et 2 ->01-default-method --- src/test/java/java17/ex01/Method_01_Test.java | 8 ++++---- src/test/java/java17/ex02/Method_02_Test.java | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/test/java/java17/ex01/Method_01_Test.java b/src/test/java/java17/ex01/Method_01_Test.java index ccb319e4..91edfee6 100644 --- a/src/test/java/java17/ex01/Method_01_Test.java +++ b/src/test/java/java17/ex01/Method_01_Test.java @@ -61,8 +61,8 @@ public void test_daoA_sumAge() throws Exception { DaoA daoA = new DaoA(); // TODO invoquer la méthode sumAge pour que le test soit passant - DaoA ex1 = new DaoA(); - int result = ex1.sumAge(); + + int result = daoA.sumAge(); @@ -75,8 +75,8 @@ public void test_daoB_sumAge() throws Exception { DaoB daoB = new DaoB(); // TODO invoquer la méthode sumAge pour que le test soit passant - DaoB ex1 = new DaoB(); - int result = ex1.sumAge(); + + int result = daoB.sumAge(); assert result == 5050; diff --git a/src/test/java/java17/ex02/Method_02_Test.java b/src/test/java/java17/ex02/Method_02_Test.java index c4375d92..407280cb 100644 --- a/src/test/java/java17/ex02/Method_02_Test.java +++ b/src/test/java/java17/ex02/Method_02_Test.java @@ -15,10 +15,12 @@ public class Method_02_Test { // tag::IDao[] interface IDao { List findAll(); + // TODO créer une méthode String format() // TODO la méthode retourne une chaîne de la forme [ persons] // TODO exemple de résultat : "[14 persons]", "[30 persons]" + public String format(); } // end::IDao[] @@ -32,10 +34,16 @@ public List findAll() { return people; } + // TODO redéfinir la méthode String format() // TODO la méthode retourne une chaîne de la forme DaoA[ persons] // TODO exemple de résultat : "DaoA[14 persons]", "DaoA[30 persons]" // TODO l'implémentation réutilise la méthode format() de l'interface + + @Override + public String format() { + return "DaoA[" + findAll().size()+ " persons]"; + } } // end::DaoA[] @@ -46,7 +54,7 @@ public void test_daoA_format() throws Exception { DaoA daoA = new DaoA(); // TODO invoquer la méthode format() pour que le test soit passant - String result = null; + String result = daoA.format(); assert "DaoA[20 persons]".equals(result); } From 2a61a7bb8f13afd298a2f64bfd0d866ffe96a11c Mon Sep 17 00:00:00 2001 From: PicToWeb Date: Fri, 7 Jun 2024 23:02:51 +0200 Subject: [PATCH 4/6] verif --- src/test/java/java17/ex02/Method_02_Test.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/java17/ex02/Method_02_Test.java b/src/test/java/java17/ex02/Method_02_Test.java index 407280cb..afff2898 100644 --- a/src/test/java/java17/ex02/Method_02_Test.java +++ b/src/test/java/java17/ex02/Method_02_Test.java @@ -27,7 +27,7 @@ interface IDao { // tag::DaoA[] class DaoA implements IDao { - List people = Data.buildPersonList(20); + List people = Data.buildPersonList(30); @Override public List findAll() { @@ -55,7 +55,7 @@ public void test_daoA_format() throws Exception { // TODO invoquer la méthode format() pour que le test soit passant String result = daoA.format(); - - assert "DaoA[20 persons]".equals(result); + System.out.println(result); + assert "DaoA[30 persons]".equals(result); } } From f61993e1ed9eadfcacd9ca684039ca2fd3e3a261 Mon Sep 17 00:00:00 2001 From: PicToWeb Date: Fri, 7 Jun 2024 23:36:48 +0200 Subject: [PATCH 5/6] essai command git --- src/test/java/java17/ex02/Method_02_Test.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/java17/ex02/Method_02_Test.java b/src/test/java/java17/ex02/Method_02_Test.java index afff2898..a6138b87 100644 --- a/src/test/java/java17/ex02/Method_02_Test.java +++ b/src/test/java/java17/ex02/Method_02_Test.java @@ -57,5 +57,6 @@ public void test_daoA_format() throws Exception { String result = daoA.format(); System.out.println(result); assert "DaoA[30 persons]".equals(result); + } } From 574f7ed513dc5c64acfa2ddcbcb19768cd54d101 Mon Sep 17 00:00:00 2001 From: PicToWeb Date: Fri, 7 Jun 2024 23:38:32 +0200 Subject: [PATCH 6/6] add-commit-push --- src/test/java/java17/ex02/Method_02_Test.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/java17/ex02/Method_02_Test.java b/src/test/java/java17/ex02/Method_02_Test.java index a6138b87..0aec598a 100644 --- a/src/test/java/java17/ex02/Method_02_Test.java +++ b/src/test/java/java17/ex02/Method_02_Test.java @@ -58,5 +58,6 @@ public void test_daoA_format() throws Exception { System.out.println(result); assert "DaoA[30 persons]".equals(result); + } }