From d26c39d86f057435befbebb45e22f6098c61da52 Mon Sep 17 00:00:00 2001 From: BARRY Guillaume Date: Sun, 1 Dec 2019 12:50:20 +0100 Subject: [PATCH 1/9] Push empty structure --- src/main/java/TODO.txt | 1 + src/main/resources/TODO.txt | 1 + src/test/java/TODO.txt | 1 + src/test/resources/TODO.txt | 1 + src/uml/TODO.txt | 1 + 5 files changed, 5 insertions(+) create mode 100644 src/main/java/TODO.txt create mode 100644 src/main/resources/TODO.txt create mode 100644 src/test/java/TODO.txt create mode 100644 src/test/resources/TODO.txt create mode 100644 src/uml/TODO.txt diff --git a/src/main/java/TODO.txt b/src/main/java/TODO.txt new file mode 100644 index 0000000..390c386 --- /dev/null +++ b/src/main/java/TODO.txt @@ -0,0 +1 @@ +Remove me \ No newline at end of file diff --git a/src/main/resources/TODO.txt b/src/main/resources/TODO.txt new file mode 100644 index 0000000..390c386 --- /dev/null +++ b/src/main/resources/TODO.txt @@ -0,0 +1 @@ +Remove me \ No newline at end of file diff --git a/src/test/java/TODO.txt b/src/test/java/TODO.txt new file mode 100644 index 0000000..390c386 --- /dev/null +++ b/src/test/java/TODO.txt @@ -0,0 +1 @@ +Remove me \ No newline at end of file diff --git a/src/test/resources/TODO.txt b/src/test/resources/TODO.txt new file mode 100644 index 0000000..390c386 --- /dev/null +++ b/src/test/resources/TODO.txt @@ -0,0 +1 @@ +Remove me \ No newline at end of file diff --git a/src/uml/TODO.txt b/src/uml/TODO.txt new file mode 100644 index 0000000..390c386 --- /dev/null +++ b/src/uml/TODO.txt @@ -0,0 +1 @@ +Remove me \ No newline at end of file From 933d70e97bfc5a52158a837de17066857bfab0f7 Mon Sep 17 00:00:00 2001 From: BARRY Guillaume Date: Thu, 12 Dec 2019 22:41:12 +0100 Subject: [PATCH 2/9] Composite start point --- src/main/java/TODO.txt | 1 - src/main/java/com/tetras/Carre.java | 7 +++++ src/main/java/com/tetras/Dessin.java | 7 +++++ src/main/java/com/tetras/Rond.java | 7 +++++ src/test/java/TODO.txt | 1 - src/test/java/com/tetras/DessinTest.java | 39 ++++++++++++++++++++++++ src/uml/TODO.txt | 1 - src/uml/composition.puml | 11 +++++++ 8 files changed, 71 insertions(+), 3 deletions(-) delete mode 100644 src/main/java/TODO.txt create mode 100644 src/main/java/com/tetras/Carre.java create mode 100644 src/main/java/com/tetras/Dessin.java create mode 100644 src/main/java/com/tetras/Rond.java delete mode 100644 src/test/java/TODO.txt create mode 100644 src/test/java/com/tetras/DessinTest.java delete mode 100644 src/uml/TODO.txt create mode 100644 src/uml/composition.puml diff --git a/src/main/java/TODO.txt b/src/main/java/TODO.txt deleted file mode 100644 index 390c386..0000000 --- a/src/main/java/TODO.txt +++ /dev/null @@ -1 +0,0 @@ -Remove me \ No newline at end of file diff --git a/src/main/java/com/tetras/Carre.java b/src/main/java/com/tetras/Carre.java new file mode 100644 index 0000000..58f8c52 --- /dev/null +++ b/src/main/java/com/tetras/Carre.java @@ -0,0 +1,7 @@ +package com.tetras; + +public class Carre { + public void dessiner() { + System.out.println("Carré dessiné"); + } +} \ No newline at end of file diff --git a/src/main/java/com/tetras/Dessin.java b/src/main/java/com/tetras/Dessin.java new file mode 100644 index 0000000..70ed98b --- /dev/null +++ b/src/main/java/com/tetras/Dessin.java @@ -0,0 +1,7 @@ +package com.tetras; + +public class Dessin { + public void dessiner() { + System.out.println("Dessin dessiné"); + } +} \ No newline at end of file diff --git a/src/main/java/com/tetras/Rond.java b/src/main/java/com/tetras/Rond.java new file mode 100644 index 0000000..c9cf841 --- /dev/null +++ b/src/main/java/com/tetras/Rond.java @@ -0,0 +1,7 @@ +package com.tetras; + +public class Rond { + public void dessiner() { + System.out.println("Rond dessiné"); + } +} \ No newline at end of file diff --git a/src/test/java/TODO.txt b/src/test/java/TODO.txt deleted file mode 100644 index 390c386..0000000 --- a/src/test/java/TODO.txt +++ /dev/null @@ -1 +0,0 @@ -Remove me \ No newline at end of file diff --git a/src/test/java/com/tetras/DessinTest.java b/src/test/java/com/tetras/DessinTest.java new file mode 100644 index 0000000..3a5425d --- /dev/null +++ b/src/test/java/com/tetras/DessinTest.java @@ -0,0 +1,39 @@ +package com.tetras; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.io.StringWriter; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class DessinTest { + + private final ByteArrayOutputStream outContent = new ByteArrayOutputStream(); + private final PrintStream originalOut = System.out; + + @BeforeEach + public void setUpStreams() { + System.setOut(new PrintStream(outContent)); + } + + @AfterEach + public void restoreStreams() { + System.setOut(originalOut); + } + + @Test + public void testDessiner() { + StringWriter out = new StringWriter(); + PrintWriter writer = new PrintWriter(out); + writer.println("Rond dessiné"); + writer.println("Carré dessiné"); + writer.println("Dessin dessiné"); + new Dessin().dessiner(); + assertEquals(out.toString(), outContent.toString()); + } +} \ No newline at end of file diff --git a/src/uml/TODO.txt b/src/uml/TODO.txt deleted file mode 100644 index 390c386..0000000 --- a/src/uml/TODO.txt +++ /dev/null @@ -1 +0,0 @@ -Remove me \ No newline at end of file diff --git a/src/uml/composition.puml b/src/uml/composition.puml new file mode 100644 index 0000000..3bdfcc8 --- /dev/null +++ b/src/uml/composition.puml @@ -0,0 +1,11 @@ +@startuml +class Carre { + + dessiner() :void +} +class Dessin { + + dessiner() :void +} +class Rond { + + dessiner() :void +} +@enduml \ No newline at end of file From c7f93c62ec535587c814d5976b7cf292b0e4da99 Mon Sep 17 00:00:00 2001 From: BARRY Guillaume Date: Thu, 12 Dec 2019 22:42:11 +0100 Subject: [PATCH 3/9] test --- src/test/resources/TODO.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/test/resources/TODO.txt diff --git a/src/test/resources/TODO.txt b/src/test/resources/TODO.txt deleted file mode 100644 index 390c386..0000000 --- a/src/test/resources/TODO.txt +++ /dev/null @@ -1 +0,0 @@ -Remove me \ No newline at end of file From f8bda136f5c94b15ef0df05495536a0f6bca31b7 Mon Sep 17 00:00:00 2001 From: BARRY Guillaume Date: Thu, 12 Dec 2019 23:07:36 +0100 Subject: [PATCH 4/9] Minor fix --- src/main/java/com/tetras/Dessin.java | 6 ++++++ src/test/java/com/tetras/DessinTest.java | 5 ++++- src/uml/composition.puml | 10 ++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/tetras/Dessin.java b/src/main/java/com/tetras/Dessin.java index 70ed98b..fa63415 100644 --- a/src/main/java/com/tetras/Dessin.java +++ b/src/main/java/com/tetras/Dessin.java @@ -4,4 +4,10 @@ public class Dessin { public void dessiner() { System.out.println("Dessin dessiné"); } + + public void ajouter(Carre carre) { + } + + public void ajouter(Rond rond) { + } } \ No newline at end of file diff --git a/src/test/java/com/tetras/DessinTest.java b/src/test/java/com/tetras/DessinTest.java index 3a5425d..db3cee2 100644 --- a/src/test/java/com/tetras/DessinTest.java +++ b/src/test/java/com/tetras/DessinTest.java @@ -33,7 +33,10 @@ public void testDessiner() { writer.println("Rond dessiné"); writer.println("Carré dessiné"); writer.println("Dessin dessiné"); - new Dessin().dessiner(); + Dessin dessin = new Dessin(); + dessin.ajouter(new Rond()); + dessin.ajouter(new Carre()); + dessin.dessiner(); assertEquals(out.toString(), outContent.toString()); } } \ No newline at end of file diff --git a/src/uml/composition.puml b/src/uml/composition.puml index 3bdfcc8..8ded402 100644 --- a/src/uml/composition.puml +++ b/src/uml/composition.puml @@ -1,11 +1,13 @@ -@startuml +@startuml Composite class Carre { + dessiner() :void } -class Dessin { - + dessiner() :void -} class Rond { + dessiner() :void } +class Dessin { + + dessiner():void + + ajouter(Rond): void + + ajouter(Carre): void +} @enduml \ No newline at end of file From 63983d40a170c1eba5c9374dc9aa841b2909c45d Mon Sep 17 00:00:00 2001 From: BARRY Guillaume Date: Mon, 30 Dec 2019 20:28:09 +0100 Subject: [PATCH 5/9] Remove vscode settings --- .gitignore | 1 + .vscode/settings.json | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 96ca049..d4601a2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ out .classpath .project .settings +.vscode/settings.json # Compiled class file *.class diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 52a1bb5..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "java.configuration.updateBuildConfiguration": "automatic", - "plantuml.server": "https://www.plantuml.com/plantuml" -} From 7ee24a08f1161117cbde6f098d4ccd55a5b72568 Mon Sep 17 00:00:00 2001 From: BARRY Guillaume Date: Fri, 31 Jan 2020 17:36:08 +0100 Subject: [PATCH 6/9] Change test order --- src/test/java/com/tetras/DessinTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/tetras/DessinTest.java b/src/test/java/com/tetras/DessinTest.java index db3cee2..67db52b 100644 --- a/src/test/java/com/tetras/DessinTest.java +++ b/src/test/java/com/tetras/DessinTest.java @@ -30,9 +30,9 @@ public void restoreStreams() { public void testDessiner() { StringWriter out = new StringWriter(); PrintWriter writer = new PrintWriter(out); + writer.println("Dessin dessiné"); writer.println("Rond dessiné"); writer.println("Carré dessiné"); - writer.println("Dessin dessiné"); Dessin dessin = new Dessin(); dessin.ajouter(new Rond()); dessin.ajouter(new Carre()); From 9a4c34d712983fb3e2e8d30d50cae4bf477c7f0b Mon Sep 17 00:00:00 2001 From: BARRY Guillaume Date: Fri, 31 Jan 2020 17:37:05 +0100 Subject: [PATCH 7/9] change test --- src/test/java/com/tetras/DessinTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/tetras/DessinTest.java b/src/test/java/com/tetras/DessinTest.java index 67db52b..d817a41 100644 --- a/src/test/java/com/tetras/DessinTest.java +++ b/src/test/java/com/tetras/DessinTest.java @@ -28,15 +28,17 @@ public void restoreStreams() { @Test public void testDessiner() { + // + Dessin dessin = new Dessin(); + dessin.ajouter(new Rond()); + dessin.ajouter(new Carre()); + dessin.dessiner(); + // StringWriter out = new StringWriter(); PrintWriter writer = new PrintWriter(out); writer.println("Dessin dessiné"); writer.println("Rond dessiné"); writer.println("Carré dessiné"); - Dessin dessin = new Dessin(); - dessin.ajouter(new Rond()); - dessin.ajouter(new Carre()); - dessin.dessiner(); assertEquals(out.toString(), outContent.toString()); } } \ No newline at end of file From 162171756e0e1bee6f3b1c6baa90f8f8c8a87c7d Mon Sep 17 00:00:00 2001 From: BARRY Guillaume Date: Fri, 31 Jan 2020 17:39:13 +0100 Subject: [PATCH 8/9] comment test --- src/test/java/com/tetras/DessinTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/tetras/DessinTest.java b/src/test/java/com/tetras/DessinTest.java index d817a41..96342bf 100644 --- a/src/test/java/com/tetras/DessinTest.java +++ b/src/test/java/com/tetras/DessinTest.java @@ -36,9 +36,10 @@ public void testDessiner() { // StringWriter out = new StringWriter(); PrintWriter writer = new PrintWriter(out); - writer.println("Dessin dessiné"); writer.println("Rond dessiné"); writer.println("Carré dessiné"); + writer.println("Dessin dessiné"); + // assertEquals(out.toString(), outContent.toString()); } } \ No newline at end of file From 7334a2eba9cfa0d986a3522048bc95049d386874 Mon Sep 17 00:00:00 2001 From: BARRY Guillaume Date: Mon, 1 Feb 2021 09:58:38 +0100 Subject: [PATCH 9/9] Update junit & gradle --- build.gradle | 18 +++++++----------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 70fef4e..195ac77 100644 --- a/build.gradle +++ b/build.gradle @@ -18,17 +18,13 @@ repositories { } dependencies { - // This dependency is exported to consumers, that is to say found on their compile classpath. - api 'org.apache.commons:commons-math3:3.6.1' - - // This dependency is used internally, and not exposed to consumers on their own compile classpath. - implementation 'com.google.guava:guava:28.0-jre' - - // Use JUnit Jupiter API for testing. - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2' - - // Use JUnit Jupiter Engine for testing. - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2' + api(platform("org.junit:junit-bom:5.7.0")) + api("org.junit.jupiter:junit-jupiter-api") { + because 'building extensions in "main" using JUnit Jupiter API' + } + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") { + because 'at least one engine is needed at test runtime' + } } test { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5028f28..28ff446 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists