updated tests with jassertj

.gitlab-ci.yml

-image: gradle:jdk16
+image: gradle:jdk17
 
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle

build.gradle

@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2', "org.assertj:assertj-core:3.22.0"
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
 }
 

gradle/wrapper/gradle-wrapper.properties

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

src/main/java/Grade.java

@@ -55,7 +55,7 @@ public class Grade {
   }
 
   /**
-   * Determines whether or not two grades are equal. Two instances of Grade are equal if the values
+   * Determines whether two grades are equal. Two instances of Grade are equal if the values
    * of their {@code value} member field are the same.
    * @param o  an object to be compared with this Grade
    * @return {@code true} if the object to be compared is an instance of Grade and has the same value; {@code false}

src/test/java/StandardOutputSandbox.java

@@ -5,7 +5,7 @@ import java.io.PrintStream;
 
 public class StandardOutputSandbox implements Runnable {
   static String NEW_LINE = System.getProperty("line.separator");
-  private Runnable runnable;
+  private final Runnable runnable;
   private OutputStream outputStream;
 
   StandardOutputSandbox(Runnable runnable) {

src/test/java/TestCohort.java

@@ -3,41 +3,54 @@ import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 class TestCohort {
-  private static Cohort cohort = new Cohort("L2 informatique");
+  private static final Cohort cohort = new Cohort("L2 informatique");
+  private static final Student davidGoodenough = new Student("David", "Goodenough");
+  private static final Student jeanMichelBruitage = new Student("Jean-Michel", "Bruitage");
+  private static final Cohort l1Descartes = new Cohort("L1 Descartes");
 
   @BeforeAll
   static void addStudentsToCohort(){
-    Student paulCalcul = new Student("Paul", "Calcul");
-    Student pierreKiroul = new Student("Pierre", "Kiroul");
-    pierreKiroul.addResult("Programmation 2", TestGrade.ten);
-    pierreKiroul.addResult("Structures discrètes", TestGrade.zero);
-    paulCalcul.addResult("Programmation 2", TestGrade.ten);
-    paulCalcul.addResult("Structures discrètes", TestGrade.twenty);
-    cohort.addStudent(paulCalcul);
-    cohort.addStudent(pierreKiroul);
+    jeanMichelBruitage.addResult("Programmation 2", TestGrade.zero);
+    jeanMichelBruitage.addResult("Structures discrètes", TestGrade.twenty);
+    davidGoodenough.addResult("Programmation 2", TestGrade.ten);
+    davidGoodenough.addResult("Structures discrètes", TestGrade.ten);
+    cohort.addStudent(davidGoodenough);
+    cohort.addStudent(jeanMichelBruitage);
+  }
+  @Test
+  void testGetStudentsIsEmpty_whenEmptyCohort(){
+    assertThat(l1Descartes.getStudents()).isEmpty();
   }
 
   @Test
-  void testGetStudents(){
-    assertEquals(List.of(TestStudent.paulCalcul, TestStudent.pierreKiroul), cohort.getStudents());
+  void testGetStudents_whenCohortContainsStudents(){
+    assertThat(cohort.getStudents()).isEqualTo(List.of(davidGoodenough, jeanMichelBruitage));
   }
 
   @Test
-  void testPrintStudentsResults() {
-    StandardOutputSandbox standardOutputSandbox = new StandardOutputSandbox(() ->cohort.printStudentsResults());
+  void testPrintStudentsResults_whenCohortIsEmpty() {
+    StandardOutputSandbox standardOutputSandbox = new StandardOutputSandbox(l1Descartes::printStudentsResults);
+    String expectedOutput = "L1 Descartes" + StandardOutputSandbox.NEW_LINE + StandardOutputSandbox.NEW_LINE;
+    standardOutputSandbox.run();
+    assertThat(standardOutputSandbox.getProducedOutput()).isEqualTo(expectedOutput);
+  }
+
+  @Test
+  void testPrintStudentsResults_whenCohortContainsStudents() {
+    StandardOutputSandbox standardOutputSandbox = new StandardOutputSandbox(cohort::printStudentsResults);
     String expectedOutput = "L2 informatique" + StandardOutputSandbox.NEW_LINE + StandardOutputSandbox.NEW_LINE
-            + "Paul Calcul" + StandardOutputSandbox.NEW_LINE
+            + "David Goodenough" + StandardOutputSandbox.NEW_LINE
             + "Programmation 2 : 10.0/20" + StandardOutputSandbox.NEW_LINE
+            + "Structures discrètes : 10.0/20" + StandardOutputSandbox.NEW_LINE
+            + "Note moyenne : 10.0/20" + StandardOutputSandbox.NEW_LINE + StandardOutputSandbox.NEW_LINE
+            + "Jean-Michel Bruitage" + StandardOutputSandbox.NEW_LINE
+            + "Programmation 2 : 0.0/20" + StandardOutputSandbox.NEW_LINE
             + "Structures discrètes : 20.0/20" + StandardOutputSandbox.NEW_LINE
-            + "Note moyenne : 15.0/20" + StandardOutputSandbox.NEW_LINE + StandardOutputSandbox.NEW_LINE
-            + "Pierre Kiroul" + StandardOutputSandbox.NEW_LINE
-            + "Programmation 2 : 10.0/20" + StandardOutputSandbox.NEW_LINE
-            + "Structures discrètes : 0.0/20" + StandardOutputSandbox.NEW_LINE
-            + "Note moyenne : 5.0/20" + StandardOutputSandbox.NEW_LINE + StandardOutputSandbox.NEW_LINE;
+            + "Note moyenne : 10.0/20" + StandardOutputSandbox.NEW_LINE + StandardOutputSandbox.NEW_LINE;
     standardOutputSandbox.run();
-    assertEquals(expectedOutput, standardOutputSandbox.getProducedOutput());
+    assertThat(standardOutputSandbox.getProducedOutput()).isEqualTo(expectedOutput);
   }
 }

src/test/java/TestGrade.java

-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.within;
+
 class TestGrade {
   static Grade twenty = new Grade(20);
   static Grade zero = new Grade(0);
   static Grade ten = new Grade(10);
-  private static List<Grade> grades = List.of(zero, twenty, ten);
-  private static List<Grade> gradesZero = List.of(zero, zero);
+  private static final double EPSILON = 0.000001d;
+  private static final List<Grade> grades = List.of(zero, twenty, ten);
+  private static final List<Grade> gradesZero = List.of(zero, zero);
+
+  @Test
+  void testHashCode(){
+    assertThat(twenty.hashCode()).isEqualTo(new Grade(20).hashCode())
+            .isNotEqualTo(ten.hashCode())
+            .isNotEqualTo(zero.hashCode());
+  }
+
+  @Test
+  void testEquals(){
+    assertThat(twenty).isEqualTo(new Grade(20))
+            .isNotEqualTo(ten)
+            .isNotEqualTo(zero)
+            .isNotEqualTo(null)
+            .isNotEqualTo("20.0/20")
+            .isNotEqualTo(20.0);
+  }
 
   @Test
   void testGetValue() {
-    assertEquals(20, twenty.getValue());
-    assertEquals(0, zero.getValue());
+    assertThat(twenty.getValue()).isCloseTo(20, within(EPSILON));
+    assertThat(zero.getValue()).isCloseTo(0, within(EPSILON));
   }
 
   @Test
   void testToString() {
-    assertEquals("20.0/20", twenty.toString());
-    assertEquals("0.0/20", zero.toString());
+    assertThat(twenty.toString()).isEqualTo("20.0/20");
+    assertThat(zero.toString()).isEqualTo("0.0/20");
+
   }
 
   @Test
   void testAverageGrade(){
-    assertEquals(ten, Grade.averageGrade(grades));
-    assertEquals(zero, Grade.averageGrade(gradesZero));
+    assertThat(Grade.averageGrade(grades)).isEqualTo(ten);
+    assertThat(Grade.averageGrade(gradesZero)).isEqualTo(zero);
   }
 }

src/test/java/TestStudent.java

-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 class TestStudent {
-  private static Student arnaudLabourel = new Student("Arnaud", "Labourel");
-  static Student paulCalcul = new Student("Paul", "Calcul");
-  static Student pierreKiroul = new Student("Pierre", "Kiroul");
+  private static final Student arnaudLabourel = new Student("Arnaud", "Labourel");
+  private static final Student jeanMichelBruitage = new Student("Jean-Michel", "Bruitage");
+  private static final Student davidGoodenough = new Student("David", "Goodenough");
 
   @BeforeAll
   static void addResultsToStudents(){
     arnaudLabourel.addResult("Programmation 2", TestGrade.twenty);
     arnaudLabourel.addResult("Structures discrètes", TestGrade.twenty);
-    pierreKiroul.addResult("Programmation 2", TestGrade.ten);
-    pierreKiroul.addResult("Structures discrètes", TestGrade.zero);
-    paulCalcul.addResult("Programmation 2", TestGrade.ten);
-    paulCalcul.addResult("Structures discrètes", TestGrade.twenty);
+    davidGoodenough.addResult("Programmation 2", TestGrade.ten);
+    davidGoodenough.addResult("Structures discrètes", TestGrade.zero);
+    jeanMichelBruitage.addResult("Programmation 2", TestGrade.ten);
+    jeanMichelBruitage.addResult("Structures discrètes", TestGrade.twenty);
+  }
+
+  @Test
+  void testHashCode(){
+    assertThat(jeanMichelBruitage.hashCode()).isEqualTo(new Student("Jean-Michel", "Bruitage").hashCode())
+            .isNotEqualTo(davidGoodenough.hashCode());
+  }
+
+  @Test
+  void testEquals(){
+    assertThat(jeanMichelBruitage).isEqualTo(new Student("Jean-Michel", "Bruitage"))
+            .isNotEqualTo(davidGoodenough)
+            .isNotEqualTo(null)
+            .isNotEqualTo("Jean-Michel Bruitage");
   }
 
   @Test
   void testToString() {
-    assertEquals("Paul Calcul", paulCalcul.toString());
-    assertEquals("Pierre Kiroul", pierreKiroul.toString());
+    assertThat(jeanMichelBruitage.toString()).isEqualTo("Jean-Michel Bruitage");
+    assertThat(davidGoodenough.toString()).isEqualTo("David Goodenough");
   }
 
   @Test
   void testGetGrades() {
-    assertEquals(List.of(TestGrade.twenty, TestGrade.twenty), arnaudLabourel.getGrades());
-    assertEquals(List.of(TestGrade.ten, TestGrade.zero), pierreKiroul.getGrades());
-    assertEquals(List.of(TestGrade.ten, TestGrade.twenty), paulCalcul.getGrades());
+    assertThat(arnaudLabourel.getGrades()).isEqualTo(List.of(TestGrade.twenty, TestGrade.twenty));
+    assertThat(davidGoodenough.getGrades()).isEqualTo(List.of(TestGrade.ten, TestGrade.zero));
+    assertThat(jeanMichelBruitage.getGrades()).isEqualTo(List.of(TestGrade.ten, TestGrade.twenty));
   }
 
   @Test
   void testGetAverageGrade() {
-    assertEquals(TestGrade.twenty, arnaudLabourel.averageGrade());
-    assertEquals(new Grade(5), pierreKiroul.averageGrade());
-    assertEquals(new Grade(15), paulCalcul.averageGrade());
+    assertThat(arnaudLabourel.averageGrade()).isEqualTo(TestGrade.twenty);
+    assertThat(davidGoodenough.averageGrade()).isEqualTo(new Grade(5));
+    assertThat(jeanMichelBruitage.averageGrade()).isEqualTo(new Grade(15));
   }
 
   @Test
   void testPrintResults() {
-    StandardOutputSandbox standardOutputSandbox = new StandardOutputSandbox(() ->arnaudLabourel.printResults());
+    StandardOutputSandbox standardOutputSandbox = new StandardOutputSandbox(arnaudLabourel::printResults);
     String expectedOutput =
             "Arnaud Labourel" + StandardOutputSandbox.NEW_LINE
             + "Programmation 2 : 20.0/20" + StandardOutputSandbox.NEW_LINE
             + "Structures discrètes : 20.0/20" + StandardOutputSandbox.NEW_LINE
             + "Note moyenne : 20.0/20" + StandardOutputSandbox.NEW_LINE;
     standardOutputSandbox.run();
-    assertEquals(expectedOutput, standardOutputSandbox.getProducedOutput());
+    assertThat(standardOutputSandbox.getProducedOutput()).isEqualTo(expectedOutput);
   }
 }
\ No newline at end of file

src/test/java/TestTeachingUnitResult.java

-import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 class TestTeachingUnitResult {
-  private static TeachingUnitResult twentyAtProg =
+  private static final TeachingUnitResult twentyAtProg =
           new TeachingUnitResult("Programmation 2", TestGrade.twenty);
-  private static TeachingUnitResult zeroAtStructDiscrete =
+  private static final TeachingUnitResult zeroAtStructDiscrete =
           new TeachingUnitResult("Structures discrètes", TestGrade.zero);
 
   @Test
   void testGetGrade() {
-    assertEquals(TestGrade.twenty, twentyAtProg.getGrade());
-    assertEquals(TestGrade.zero, zeroAtStructDiscrete.getGrade());
+    assertThat(twentyAtProg.getGrade()).isEqualTo(TestGrade.twenty);
+    assertThat(zeroAtStructDiscrete.getGrade()).isEqualTo(TestGrade.zero);
   }
 
   @Test
   void testToString() {
-    assertEquals("Programmation 2 : 20.0/20", twentyAtProg.toString());
-    assertEquals("Structures discrètes : 0.0/20", zeroAtStructDiscrete.toString());
+    assertThat(twentyAtProg.toString()).isEqualTo("Programmation 2 : 20.0/20");
+    assertThat(zeroAtStructDiscrete.toString()).isEqualTo("Structures discrètes : 0.0/20");
   }
 }