Commit a39e1e2
Changed files (2)
assignments
assignment1
src
main
java
ca
mokhan
assignment1
test
java
ca
mokhan
assignment1
assignments/assignment1/src/main/java/ca/mokhan/assignment1/Candidate.java
@@ -55,9 +55,12 @@ public class Candidate extends AddressBook {
}
public boolean isEligible() {
- return this.grade >= 85.0
- || (this.regulatoryCapability >= 0.5
- && this.communication.isAtLeast(Communication.Average));
+ if (this.grade >= 85.0) {
+ return this.communication.isAtLeast(Communication.Average) || this.isInnovative();
+ } else {
+ return (this.regulatoryCapability >= 0.5
+ && this.communication.isAtLeast(Communication.Average));
+ }
}
public static ArrayList<Candidate> getEligibleCandidates(Candidate[] candidates) {
assignments/assignment1/src/test/java/ca/mokhan/assignment1/CandidateTest.java
@@ -43,4 +43,9 @@ public class CandidateTest extends TestCase {
assertFalse(new Candidate("Tsuyoshi", "Garrett", 84.9, "average", false, 0.0).isEligible());
assertTrue(new Candidate("Tsuyoshi", "Garrett", 84.9, "average", false, 0.5).isEligible());
}
+
+ public void testIsElligibleWithPoorCommunication() {
+ assertTrue(new Candidate("Tsuyoshi", "Garrett", 85.0, "poor", true, 0.0).isEligible());
+ assertFalse(new Candidate("Tsuyoshi", "Garrett", 85.0, "poor", false, 0.0).isEligible());
+ }
}