School-DUT-info/M431-ShadowHunterGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ConditionTests 100% Coverage

Browse Source
This commit is contained in:
Paul Gross
2020-04-20 13:48:13 +02:00
parent e829dc7de6
commit 0633478389
15 changed files with 224 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/condition/ConditionMultiple.java
View File

@@ -1,7 +1,6 @@
package condition;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import main.Joueur;
@@ -10,16 +9,17 @@ public class ConditionMultiple extends Condition {
private List<Condition> conditions;
public ConditionMultiple(Condition ...conditions) {
public ConditionMultiple(List<Condition> conditions) {
this.conditions = new ArrayList<Condition>();
this.conditions.addAll(Arrays.asList(conditions));
this.conditions.addAll(conditions);
}
/**
* Vérifie que toutes les conditions soient vraies
* @param joueur Le joueur sur lequel on vérifie les conditions.
* @return boolean
* @throws Exception
*/
@Override
public boolean isTrue(Joueur joueur)
@@ -35,10 +35,5 @@ public class ConditionMultiple extends Condition {
public List<Condition> getConditions() {
return conditions;
}
public void setConditions(List<Condition> conditions) {
this.conditions = conditions;
}
}