From b83aafa4b85970626d9e2400bbec461324c9981d Mon Sep 17 00:00:00 2001
From: Hai Dang <hai-dang.le@etu.univ-amu.fr>
Date: Sat, 12 Sep 2020 19:40:02 +0200
Subject: [PATCH] =?UTF-8?q?Updated=20TeachingUnitResult=20Impl=C3=A9mentat?=
=?UTF-8?q?ion=20des=20m=C3=A9thodes=20toString,=20equals,=20getGrade,=20e?=
=?UTF-8?q?t=20ajout=20d'une=20class=20TestTeachingUnitResult?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
tp1/TeachingUnitResult.java | 10 +++++++++
tp1/TestTeachingUnitResult.java | 37 +++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+)
create mode 100644 tp1/TestTeachingUnitResult.java
diff --git a/tp1/TeachingUnitResult.java b/tp1/TeachingUnitResult.java
index c052586..ef76d75 100644
--- a/tp1/TeachingUnitResult.java
+++ b/tp1/TeachingUnitResult.java
@@ -26,6 +26,7 @@ public class TeachingUnitResult {
* @return the grade associated to the result
*/
public Grade getGrade() {
+ return this.grade;
}
/**
@@ -34,5 +35,14 @@ public class TeachingUnitResult {
*/
@Override
public String toString() {
+ return this.teachingUnitName;
}
+
+ public boolean equals(Grade grade){
+ if (this.grade.getValue() == grade.getValue()){
+ return true;
+ }
+ return false;
+ }
+
}
diff --git a/tp1/TestTeachingUnitResult.java b/tp1/TestTeachingUnitResult.java
new file mode 100644
index 0000000..a14026c
--- /dev/null
+++ b/tp1/TestTeachingUnitResult.java
@@ -0,0 +1,37 @@
+public class TestTeachingUnitResult {
+ public static void main(String[] args) {
+ TestTeachingUnitResult test = new TestTeachingUnitResult();
+
+ if (test.TestToString()){
+ System.out.println("ok");
+ }
+ System.out.println(test.TestEquals());
+
+
+ }
+
+
+
+ public boolean TestToString(){
+ TeachingUnitResult teachingUnitResult = new TeachingUnitResult("programmation2", new Grade(0));
+ String teachingUnitResultString = teachingUnitResult.toString();
+ if(teachingUnitResultString == "programmation2"){
+ return true;
+ }
+ return false;
+ }
+
+ public boolean TestEquals(){
+ TeachingUnitResult teachingUnitResult = new TeachingUnitResult("",new Grade(15));
+ TeachingUnitResult teachingUnitResult1 = new TeachingUnitResult( "", new Grade(15));
+ if(teachingUnitResult.equals(teachingUnitResult1.getGrade()))
+ {
+ return true;
+ }
+ return false;
+ }
+
+
+
+
+}
\ No newline at end of file
--
GitLab