DjalimSimaila/SAE201-DevApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix do DAO de Test

Browse Source
This commit is contained in:
Thomas Rubini 2022-06-07 16:42:45 +02:00
parent 55d132ae0f
commit 9e57c45497
No known key found for this signature in database
GPG Key ID: C7D287C8C1CAC373
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/fr/univ_amu/iut/Donnees.java
View File

@ -10,7 +10,7 @@ import fr.univ_amu.iut.model.Usage;
public class Donnees { public class Donnees {
private static Academie academieSelectionee = null; private static Academie academieSelectionee = null;
private static Thematique thematiqueSelectionee = null; private static Thematique thematiqueSelectionee = null;
private static Discipline disciplineSelectionee = Discipline.Toutes; private static Discipline disciplineSelectionee = null;
private static List<Usage> usagesObtenus; private static List<Usage> usagesObtenus;
public static List<Usage> getUsagesObtenus() { public static List<Usage> getUsagesObtenus() {
@ -36,7 +36,7 @@ public class Donnees {
if(thematiqueSelectionee == Donnees.thematiqueSelectionee){ if(thematiqueSelectionee == Donnees.thematiqueSelectionee){
thematiqueSelectionee = null; thematiqueSelectionee = null;
} }
System.out.println("Thematique selectionée : %s".formatted((thematiqueSelectionee == null)? "Aucune Thematique" : thematiqueSelectionee.getNom())); System.out.println("Thematique selectionée : %s".formatted(thematiqueSelectionee));
Donnees.thematiqueSelectionee = thematiqueSelectionee; Donnees.thematiqueSelectionee = thematiqueSelectionee;
} }
public static Discipline getDisciplineSelectionee() { public static Discipline getDisciplineSelectionee() {
@ -44,9 +44,9 @@ public class Donnees {
} }
public static void setDisciplineSelectionee(Discipline disciplineSelectionee) { public static void setDisciplineSelectionee(Discipline disciplineSelectionee) {
if(disciplineSelectionee == Donnees.disciplineSelectionee){ if(disciplineSelectionee == Donnees.disciplineSelectionee){
disciplineSelectionee = Discipline.Toutes; disciplineSelectionee = null;
} }
System.out.println("Discipline Selectionee : %s".formatted(disciplineSelectionee.getNom())); System.out.println("Discipline Selectionee : %s".formatted(disciplineSelectionee));
Donnees.disciplineSelectionee = disciplineSelectionee; Donnees.disciplineSelectionee = disciplineSelectionee;
} }

2
src/main/java/fr/univ_amu/iut/model/Discipline.java
View File

@ -16,8 +16,6 @@ public class Discipline implements Serializable {
private static final List<Discipline> INSTANCES = new ArrayList<>(); private static final List<Discipline> INSTANCES = new ArrayList<>();
public static Discipline Toutes = new Discipline("Toutes disciplines");
public static Discipline HistoireGeographie = new Discipline("Histoire-géographie"); public static Discipline HistoireGeographie = new Discipline("Histoire-géographie");
public static Discipline PhysiqueChimie = new Discipline("Physique-chimie"); public static Discipline PhysiqueChimie = new Discipline("Physique-chimie");

14
src/main/java/fr/univ_amu/iut/test/DAOUsageTest.java
View File

@ -21,10 +21,11 @@ public class DAOUsageTest implements DAOUsage{
@Override @Override
public List<Usage> findAll() { public List<Usage> findAll() {
List<Usage> usages = new ArrayList<>(); List<Usage> usages = new ArrayList<>();
for( int i = 0; i < 69 ; i++){ for( int i = 0; i < 42 ; i++){
Usage tmp = new Usage(); Usage tmp = new Usage();
tmp.setNom(String.valueOf(i)); tmp.setNom(String.valueOf(i));
tmp.setDiscipline(Discipline.Technologie); tmp.setDiscipline(Discipline.Technologie);
tmp.setThematique(Thematique.CreationNumerique);
tmp.setNiveau(Niveau.Tous); tmp.setNiveau(Niveau.Tous);
tmp.setDescription("je suis un commentaire tres long mais surtout tres utile, je sert a tester l'interface graphique et la mettre au bout de ses limtes"); tmp.setDescription("je suis un commentaire tres long mais surtout tres utile, je sert a tester l'interface graphique et la mettre au bout de ses limtes");
usages.add(tmp); usages.add(tmp);
@ -52,8 +53,15 @@ public class DAOUsageTest implements DAOUsage{
@Override @Override
public List<Usage> findByCriterias(Thematique thematique, Discipline discipline, Academie academie) { public List<Usage> findByCriterias(Thematique thematique, Discipline discipline, Academie academie) {
// TODO Auto-generated method stub List<Usage> list = new ArrayList<>();
return null; for(Usage usage : findAll()){
if((thematique==null||thematique==usage.getThematique())&&
(discipline==null||discipline==usage.getDiscipline())&&
(academie==null||academie==usage.getAcademie())){
list.add(usage);
}
}
return list;
} }
@Override @Override