Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 837 → Rev 838

/trunk/src/org/tela_botanica/del/test/services/CalculVoteDeterminationServiceTest.java
9,6 → 9,7
import org.junit.Test;
import org.tela_botanica.del.client.modeles.Contributeur;
import org.tela_botanica.del.client.modeles.MoyenneVote;
import org.tela_botanica.del.client.modeles.Observation;
import org.tela_botanica.del.client.modeles.PropositionDetermination;
import org.tela_botanica.del.client.modeles.VoteDetermination;
import org.tela_botanica.del.client.services.CalculVoteDeterminationService;
23,7 → 24,7
voteDetermination.setDate(new Date());
voteDetermination.setContributeur("benjamin");
 
PropositionDetermination propositionDetermination = new PropositionDetermination();
PropositionDetermination propositionDetermination = new PropositionDetermination(new Observation());
propositionDetermination.setEspece("Iris lutescens subsp. lutescens");
propositionDetermination.setContributeur(new Contributeur("contrib", "test", "contrib@test.com"));
propositionDetermination.setId("1");
64,7 → 65,7
voteDetermination4.setDate(new Date());
voteDetermination4.setContributeur("benjamin");
 
PropositionDetermination propositionDetermination = new PropositionDetermination();
PropositionDetermination propositionDetermination = new PropositionDetermination(new Observation());
propositionDetermination.setEspece("Iris lutescens subsp. lutescens");
propositionDetermination.setContributeur(new Contributeur("contrib", "test", "contrib@test.com"));
propositionDetermination.setId("1");
73,7 → 74,7
propositionDetermination.ajouterVoteDetermination(voteDetermination3);
propositionDetermination.ajouterVoteDetermination(voteDetermination4);
PropositionDetermination propositionDetermination2 = new PropositionDetermination();
PropositionDetermination propositionDetermination2 = new PropositionDetermination(new Observation());
propositionDetermination2.setEspece("Iris urticans");
propositionDetermination2.setContributeur(new Contributeur("contrib", "test", "contrib@test.com"));
propositionDetermination2.setId("2");
/trunk/src/org/tela_botanica/del/test/composants/votes/BarreRepartitionVotePresenteurTest.java
13,6 → 13,7
import org.tela_botanica.del.client.composants.votes.barrerepartition.BarreRepartitionVotePresenteur.Vue;
import org.tela_botanica.del.client.modeles.Contributeur;
import org.tela_botanica.del.client.modeles.MoyenneVote;
import org.tela_botanica.del.client.modeles.Observation;
import org.tela_botanica.del.client.modeles.PropositionDetermination;
import org.tela_botanica.del.client.modeles.VoteDetermination;
import org.tela_botanica.del.client.services.CalculVoteDeterminationService;
40,7 → 41,7
voteDetermination.setDate(new Date());
voteDetermination.setContributeur("benjamin");
 
PropositionDetermination propositionDetermination = new PropositionDetermination();
PropositionDetermination propositionDetermination = new PropositionDetermination(new Observation());
propositionDetermination.setEspece("Iris lutescens subsp. lutescens");
propositionDetermination.setContributeur(new Contributeur("contrib", "test", "contrib@test.com"));
propositionDetermination.setId("1");
/trunk/src/org/tela_botanica/del/test/modeles/MoyenneVoteTest.java
8,6 → 8,7
 
import org.junit.Test;
import org.tela_botanica.del.client.modeles.MoyenneVote;
import org.tela_botanica.del.client.modeles.Observation;
import org.tela_botanica.del.client.modeles.PropositionDetermination;
 
public class MoyenneVoteTest {
15,16 → 16,16
@Test
public void testCompareTo() {
PropositionDetermination propositionDetermination = new PropositionDetermination();
PropositionDetermination propositionDetermination = new PropositionDetermination(new Observation());
MoyenneVote mv1 = new MoyenneVote(100, propositionDetermination);
PropositionDetermination propositionDetermination2 = new PropositionDetermination();
PropositionDetermination propositionDetermination2 = new PropositionDetermination(new Observation());
MoyenneVote mv2 = new MoyenneVote(75, propositionDetermination2);
PropositionDetermination propositionDetermination3 = new PropositionDetermination();
PropositionDetermination propositionDetermination3 = new PropositionDetermination(new Observation());
MoyenneVote mv3 = new MoyenneVote(50, propositionDetermination3);
PropositionDetermination propositionDetermination4 = new PropositionDetermination();
PropositionDetermination propositionDetermination4 = new PropositionDetermination(new Observation());
MoyenneVote mv4 = new MoyenneVote(50, propositionDetermination4);
int mv1SuperieurMv2 = mv1.compareTo(mv2);
/trunk/src/org/tela_botanica/del/test/modeles/PropositionDeterminationTest.java
11,6 → 11,7
import org.junit.Test;
import org.tela_botanica.del.client.modeles.Commentaire;
import org.tela_botanica.del.client.modeles.Contributeur;
import org.tela_botanica.del.client.modeles.Observation;
import org.tela_botanica.del.client.modeles.PropositionDetermination;
import org.tela_botanica.del.client.modeles.VoteDetermination;
 
26,7 → 27,7
@Before
public void setUp() {
propositionDetermination = new PropositionDetermination();
propositionDetermination = new PropositionDetermination(new Observation());
Contributeur contributeur = new Contributeur("peronnet", "Aurélien", "aurelien@tela-botanica.org");
propositionDetermination.setContributeur(contributeur);
propositionDetermination.setId("5");