Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ out
.classpath
.project
.settings
.vscode/settings.json

# Compiled class file
*.class
Expand Down
4 changes: 0 additions & 4 deletions .vscode/settings.json

This file was deleted.

18 changes: 7 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions src/main/java/com/tetras/Carre.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.tetras;

public class Carre {
public void dessiner() {
System.out.println("Carré dessiné");
}
}
13 changes: 13 additions & 0 deletions src/main/java/com/tetras/Dessin.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.tetras;

public class Dessin {
public void dessiner() {
System.out.println("Dessin dessiné");
}

public void ajouter(Carre carre) {
}

public void ajouter(Rond rond) {
}
}
7 changes: 7 additions & 0 deletions src/main/java/com/tetras/Rond.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.tetras;

public class Rond {
public void dessiner() {
System.out.println("Rond dessiné");
}
}
1 change: 1 addition & 0 deletions src/main/resources/TODO.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove me
45 changes: 45 additions & 0 deletions src/test/java/com/tetras/DessinTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
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() {
//
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("Rond dessiné");
writer.println("Carré dessiné");
writer.println("Dessin dessiné");
//
assertEquals(out.toString(), outContent.toString());
}
}
13 changes: 13 additions & 0 deletions src/uml/composition.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@startuml Composite
class Carre {
+ dessiner() :void
}
class Rond {
+ dessiner() :void
}
class Dessin {
+ dessiner():void
+ ajouter(Rond): void
+ ajouter(Carre): void
}
@enduml