mise à jour pour Commande et testCommande
This commit is contained in:
sio
parent
0680043384
commit
45a93f086a
@ -49,7 +49,9 @@ javac.target=21
|
||||
javac.test.classpath=\
|
||||
${javac.classpath}:\
|
||||
${build.classes.dir}:\
|
||||
${libs.junit_5.classpath}
|
||||
${libs.junit_5.classpath}:\
|
||||
${libs.junit_4.classpath}:\
|
||||
${libs.hamcrest.classpath}
|
||||
javac.test.modulepath=\
|
||||
${javac.modulepath}
|
||||
javac.test.processorpath=\
|
||||
|
||||
@ -36,15 +36,40 @@ private final HashMap<Instrument, Integer> lesLignes = new HashMap<>();
|
||||
* @return true si l'ajout est bon
|
||||
*/
|
||||
public boolean ajouter(Instrument unInstrument, int qte){
|
||||
boolean ajoutOK;
|
||||
|
||||
//il faut empêcher l'ajout d'une ligne avec une quantité à 0
|
||||
//bien s'assurer que le stock est suffisant
|
||||
boolean ajoutOK=false;
|
||||
//ajout d'un instrument existant dans la commande, ce sera une mise à jour de la ligne
|
||||
if (lesLignes.containsKey(unInstrument))//l'instrument existe
|
||||
{
|
||||
//récupération de la quantité en stock
|
||||
int oldQte=unInstrument.getQteStock();
|
||||
//réaffectation dans le stock de la quantité commandée
|
||||
int qteStock=oldQte+ this.getLesLignes().get(unInstrument);
|
||||
unInstrument.setQteStock(qteStock);
|
||||
//suppression ligne commande
|
||||
lesLignes.remove(unInstrument);
|
||||
//nouvel ajout
|
||||
this.ajouter(unInstrument,qte);
|
||||
|
||||
}
|
||||
else //nouvel instrument
|
||||
{
|
||||
//on s'assure qu'il y a assez de stock pour la commande
|
||||
|
||||
int qteDisponible = unInstrument.getQteStock();
|
||||
if (qteDisponible<qte){
|
||||
ajoutOK = false;
|
||||
}else {
|
||||
ajoutOK = true;
|
||||
lesLignes.put(unInstrument,qte);
|
||||
//màj qté stock pour déduire la qté commandée
|
||||
unInstrument.setQteStock(qteDisponible-qte);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return ajoutOK;
|
||||
}
|
||||
/**
|
||||
@ -55,7 +80,7 @@ private final HashMap<Instrument, Integer> lesLignes = new HashMap<>();
|
||||
public boolean supprimer(Instrument unInstrument){
|
||||
//lesLignes.remove(unInstrument);
|
||||
boolean suppOK;
|
||||
if (lesLignes.containsValue(unInstrument) == true){
|
||||
if (lesLignes.containsKey(unInstrument) == true){
|
||||
suppOK = true;
|
||||
lesLignes.remove(unInstrument);
|
||||
} else {
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
/*
|
||||
* Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
|
||||
* Click nbfs://nbhost/SystemFileSystem/Templates/UnitTests/JUnit5TestClass.java to edit this template
|
||||
* Click nbfs://nbhost/SystemFileSystem/Templates/UnitTests/JUnit4TestClass.java to edit this template
|
||||
*/
|
||||
package métiers;
|
||||
|
||||
import java.util.HashMap;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author sio
|
||||
* @author famille Thevenot
|
||||
*/
|
||||
public class CommandeTest {
|
||||
|
||||
public CommandeTest() {
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
@Before
|
||||
public void setUp() {
|
||||
}
|
||||
|
||||
@ -27,20 +27,54 @@ public class CommandeTest {
|
||||
*/
|
||||
@Test
|
||||
public void testAjouter() {
|
||||
Instrument instr1=new Instrument(1,"Piano",10, 8300f);
|
||||
Instrument instr2=new Instrument(2,"Violon",9, 105f);
|
||||
Commande laCommande = new Commande(1,1,"12/09/2024");
|
||||
System.out.println("ajouter");
|
||||
Instrument unInstrument = null;
|
||||
int qte = 0;
|
||||
Commande instance = null;
|
||||
boolean expResult = false;
|
||||
boolean result = instance.ajouter(unInstrument, qte);
|
||||
assertEquals(expResult, result);
|
||||
// TODO review the generated test code and remove the default call to fail.
|
||||
fail("The test case is a prototype.");
|
||||
//cas 0
|
||||
boolean ajoutRes= laCommande.ajouter(instr1, 2);
|
||||
boolean ajoutAttendu = true;
|
||||
System.out.println("cas0 : cas normal, ajout une ligne de commande");
|
||||
assertEquals("Test0 ajout 2 instr1",ajoutAttendu,ajoutRes);
|
||||
int stockRes=instr1.getQteStock();
|
||||
int stockAttendu=8;
|
||||
assertEquals("Test0 stock",stockAttendu,stockRes);
|
||||
int qteRes=laCommande.getLesLignes().get(instr1);
|
||||
int qteAttendu=2;
|
||||
assertEquals("Test0 quantite",qteRes, qteAttendu);
|
||||
|
||||
//cas 1
|
||||
System.out.println("Cas1 : ajout autre ligne de commande");
|
||||
laCommande.ajouter(instr2, 6);
|
||||
int tailleR=laCommande.getLesLignes().size();
|
||||
int tailleAttendue=2;
|
||||
assertEquals("Test1 taille",tailleAttendue,tailleR);
|
||||
|
||||
//Cas2
|
||||
System.out.println("Cas2 : màj quantité commandée d'une ligne existante");
|
||||
laCommande.ajouter(instr2, 5);
|
||||
stockRes=instr2.getQteStock();
|
||||
stockAttendu=4;
|
||||
assertEquals("test2 stock",stockAttendu,stockRes );
|
||||
|
||||
qteRes=laCommande.getLesLignes().get(instr2);
|
||||
qteAttendu=5;
|
||||
assertEquals("Test2 quantite", qteAttendu,qteRes);
|
||||
|
||||
/*INES*/
|
||||
System.out.println("Cas3 : ajout nouvelle ligne avec quantité > stock");
|
||||
/*MAISSANE*/
|
||||
System.out.println("Cas4 : ajout nouvelle ligne avec quantité 0");
|
||||
/*MORGANN*/
|
||||
System.out.println("Cas5 : mise à 0 quantité commandée d'une ligne existante");
|
||||
/*INES*/
|
||||
System.out.println("Cas6 : màj d'une ligne existante avec qté>stock");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Test of supprimer method, of class Commande.
|
||||
*/
|
||||
|
||||
@Test
|
||||
public void testSupprimer() {
|
||||
System.out.println("supprimer");
|
||||
@ -48,119 +82,9 @@ public class CommandeTest {
|
||||
Commande instance = null;
|
||||
boolean expResult = false;
|
||||
boolean result = instance.supprimer(unInstrument);
|
||||
assertEquals(expResult, result);
|
||||
assertEquals("test supprimer",expResult, result);
|
||||
// TODO review the generated test code and remove the default call to fail.
|
||||
fail("The test case is a prototype.");
|
||||
}
|
||||
}*/
|
||||
|
||||
/**
|
||||
* Test of getNoCom method, of class Commande.
|
||||
*/
|
||||
@Test
|
||||
public void testGetNoCom() {
|
||||
System.out.println("getNoCom");
|
||||
Commande instance = null;
|
||||
int expResult = 0;
|
||||
int result = instance.getNoCom();
|
||||
assertEquals(expResult, result);
|
||||
// TODO review the generated test code and remove the default call to fail.
|
||||
fail("The test case is a prototype.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Test of getNoVendeur method, of class Commande.
|
||||
*/
|
||||
@Test
|
||||
public void testGetNoVendeur() {
|
||||
System.out.println("getNoVendeur");
|
||||
Commande instance = null;
|
||||
int expResult = 0;
|
||||
int result = instance.getNoVendeur();
|
||||
assertEquals(expResult, result);
|
||||
// TODO review the generated test code and remove the default call to fail.
|
||||
fail("The test case is a prototype.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Test of getDateCom method, of class Commande.
|
||||
*/
|
||||
@Test
|
||||
public void testGetDateCom() {
|
||||
System.out.println("getDateCom");
|
||||
Commande instance = null;
|
||||
String expResult = "";
|
||||
String result = instance.getDateCom();
|
||||
assertEquals(expResult, result);
|
||||
// TODO review the generated test code and remove the default call to fail.
|
||||
fail("The test case is a prototype.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Test of getLesLignes method, of class Commande.
|
||||
*/
|
||||
@Test
|
||||
public void testGetLesLignes() {
|
||||
System.out.println("getLesLignes");
|
||||
Commande instance = null;
|
||||
HashMap<Instrument, Integer> expResult = null;
|
||||
HashMap<Instrument, Integer> result = instance.getLesLignes();
|
||||
assertEquals(expResult, result);
|
||||
// TODO review the generated test code and remove the default call to fail.
|
||||
fail("The test case is a prototype.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Test of setNoCom method, of class Commande.
|
||||
*/
|
||||
@Test
|
||||
public void testSetNoCom() {
|
||||
System.out.println("setNoCom");
|
||||
int noCom = 0;
|
||||
Commande instance = null;
|
||||
instance.setNoCom(noCom);
|
||||
// TODO review the generated test code and remove the default call to fail.
|
||||
fail("The test case is a prototype.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Test of setNoVendeur method, of class Commande.
|
||||
*/
|
||||
@Test
|
||||
public void testSetNoVendeur() {
|
||||
System.out.println("setNoVendeur");
|
||||
int noVendeur = 0;
|
||||
Commande instance = null;
|
||||
instance.setNoVendeur(noVendeur);
|
||||
// TODO review the generated test code and remove the default call to fail.
|
||||
fail("The test case is a prototype.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Test of setDateCom method, of class Commande.
|
||||
*/
|
||||
@Test
|
||||
public void testSetDateCom() {
|
||||
System.out.println("setDateCom");
|
||||
String dateCom = "";
|
||||
Commande instance = null;
|
||||
instance.setDateCom(dateCom);
|
||||
// TODO review the generated test code and remove the default call to fail.
|
||||
fail("The test case is a prototype.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Test of equals method, of class Commande.
|
||||
*/
|
||||
@Test
|
||||
public void testEquals() {
|
||||
System.out.println("equals");
|
||||
Object obj = null;
|
||||
Commande instance = null;
|
||||
boolean expResult = false;
|
||||
boolean result = instance.equals(obj);
|
||||
assertEquals(expResult, result);
|
||||
// TODO review the generated test code and remove the default call to fail.
|
||||
fail("The test case is a prototype.");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user