diff --git a/tp1/TeachingUnitResult.java b/tp1/TeachingUnitResult.java index c052586a62e9513c55979121bb6ff8b67972fc71..ada666bce17b3a3929c11d8753c119f681eb964e 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 grade; } /** @@ -34,5 +35,6 @@ public class TeachingUnitResult { */ @Override public String toString() { + return (teachingUnitName+" : "+grade+":20"); } } diff --git a/tp1/TestTeachingUnitResult.java b/tp1/TestTeachingUnitResult.java new file mode 100644 index 0000000000000000000000000000000000000000..5a571c869dd1afc05706b80a59762d11a20ad608 --- /dev/null +++ b/tp1/TestTeachingUnitResult.java @@ -0,0 +1,35 @@ +import java.util.ArrayList; + +public class TestTeachingUnitResult { + public static void main(String[] args){ + TestTeachingUnitResult test = new TestTeachingUnitResult(); + if(test.testToString() == true) + System.out.println("testToString : correct"); + else + System.out.println("testToString : incorrect"); + + if (test.testGetGrade() == true) + System.out.println("testGetGrade : correct"); + else + System.out.println("testGetGrade : incorrect"); + + } + + + private boolean testGetGrade() { + Grade grade = new Grade(12.5); + double val = grade.getValue(); + if(val == 12.5) + return true; + else + return false; + + } + private boolean testToString(){ + Grade grade = new Grade(16.80); + String gradeString = grade.toString(); + if (gradeString.equals("16;80/20")) + return true; + else + return false; +}}