From b02b4b8bcf871b8102be9cdbf564da6c34a76921 Mon Sep 17 00:00:00 2001 From: sio Date: Thu, 12 Sep 2024 11:25:21 +0200 Subject: [PATCH 1/7] test cas1 --- nbproject/project.properties | 3 +- src/Test.java | 6 +- test/métiers/CommandeTest.java | 211 +++++++++++++++++++++++++++++++++ 3 files changed, 217 insertions(+), 3 deletions(-) create mode 100644 test/métiers/CommandeTest.java diff --git a/nbproject/project.properties b/nbproject/project.properties index 56854d7..74d784e 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -48,7 +48,8 @@ javac.source=21 javac.target=21 javac.test.classpath=\ ${javac.classpath}:\ - ${build.classes.dir} + ${build.classes.dir}:\ + ${libs.junit_5.classpath} javac.test.modulepath=\ ${javac.modulepath} javac.test.processorpath=\ diff --git a/src/Test.java b/src/Test.java index 6711609..8b1f75b 100644 --- a/src/Test.java +++ b/src/Test.java @@ -25,8 +25,10 @@ public class Test { Commande laCommande = new Commande(1,1,"12/09/2024"); lEntreprise.ajouterCommande(laCommande); - //Ajouter à la commande une ligne de 2 instr1 - laCommande.ajouter(instr1, 2); + //Test Cas0-Ajouter à la commande une ligne de 2 instr1 + System.out.println("Résultat de l'ajout de 2 instr1 à la commande :" + laCommande.ajouter(instr1, 2) ); + System.out.println("Nouveau stock de instr1 : "+instr1.getQteStock()); + System.out.println("Quantité de la ligne de commande de instr1 :"+laCommande.getLesLignes().get(instr1)); } } diff --git a/test/métiers/CommandeTest.java b/test/métiers/CommandeTest.java new file mode 100644 index 0000000..ed03a45 --- /dev/null +++ b/test/métiers/CommandeTest.java @@ -0,0 +1,211 @@ +/* + * 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 + */ +package métiers; + +import java.util.HashMap; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeAll; + +/** + * + * @author sio + */ +public class CommandeTest { + + public CommandeTest() { + } + + @BeforeAll + public static void setUpClass() throws Exception { + } + + @AfterAll + public static void tearDownClass() throws Exception { + } + + @BeforeEach + public void setUp() { + } + + @AfterEach + public void tearDown() throws Exception { + } + + /** + * Test of ajouter method, of class Commande. + */ + @Test + public void testAjouter() { + System.out.println("ajouter"); + Commande instance = null; + Instrument instr1=new Instrument(1,"Piano",10, 8300f); + Instrument instr2=new Instrument(2,"Violon",9, 105f); + Instrument instr3=new Instrument(3,"Guitare",8, 575f); + //Cas0 + instance.ajouter(instr1, 2); + // Cas1 + + instance.ajouter(instr2, 6); + + int nbLignesAttendues=2; + int nbLignes=instance.getLesLignes().size(); + assertEquals("Cas01 : test nb lignes ",nbLignesAttendues,nbLignes); + + + } + + /** + * Test of supprimer method, of class Commande. + */ + @Test + public void testSupprimer() { + System.out.println("supprimer"); + Instrument unInstrument = null; + Commande instance = null; + boolean expResult = false; + boolean result = instance.supprimer(unInstrument); + 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 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 expResult = null; + HashMap 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."); + } + + private void assertEquals(String test_nb_lignes, int nbLignesAttendues, int i) { + throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + } + + private void assertEquals(boolean expResult, boolean result) { + throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + } + + private void assertEquals(int expResult, int result) { + throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + } + + private void assertEquals(String expResult, String result) { + throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + } + + private void assertEquals(HashMap expResult, HashMap result) { + throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + } + + + + +} From 06800433842eb759ce2290c9bd304a9538702c76 Mon Sep 17 00:00:00 2001 From: sio Date: Thu, 12 Sep 2024 11:33:20 +0200 Subject: [PATCH 2/7] test cas1 --- test/métiers/CommandeTest.java | 59 ++++------------------------------ 1 file changed, 7 insertions(+), 52 deletions(-) diff --git a/test/métiers/CommandeTest.java b/test/métiers/CommandeTest.java index ed03a45..e4d515e 100644 --- a/test/métiers/CommandeTest.java +++ b/test/métiers/CommandeTest.java @@ -5,12 +5,9 @@ package métiers; import java.util.HashMap; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; -import org.junit.jupiter.api.BeforeAll; /** * @@ -20,44 +17,25 @@ public class CommandeTest { public CommandeTest() { } - - @BeforeAll - public static void setUpClass() throws Exception { - } - - @AfterAll - public static void tearDownClass() throws Exception { - } @BeforeEach public void setUp() { } - @AfterEach - public void tearDown() throws Exception { - } - /** * Test of ajouter method, of class Commande. */ @Test public void testAjouter() { System.out.println("ajouter"); + Instrument unInstrument = null; + int qte = 0; Commande instance = null; - Instrument instr1=new Instrument(1,"Piano",10, 8300f); - Instrument instr2=new Instrument(2,"Violon",9, 105f); - Instrument instr3=new Instrument(3,"Guitare",8, 575f); - //Cas0 - instance.ajouter(instr1, 2); - // Cas1 - - instance.ajouter(instr2, 6); - - int nbLignesAttendues=2; - int nbLignes=instance.getLesLignes().size(); - assertEquals("Cas01 : test nb lignes ",nbLignesAttendues,nbLignes); - - + 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."); } /** @@ -184,28 +162,5 @@ public class CommandeTest { // TODO review the generated test code and remove the default call to fail. fail("The test case is a prototype."); } - - private void assertEquals(String test_nb_lignes, int nbLignesAttendues, int i) { - throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody - } - - private void assertEquals(boolean expResult, boolean result) { - throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody - } - - private void assertEquals(int expResult, int result) { - throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody - } - - private void assertEquals(String expResult, String result) { - throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody - } - - private void assertEquals(HashMap expResult, HashMap result) { - throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody - } - - - } From 45a93f086a396ded2e272db54d1ee5f66a19f0b7 Mon Sep 17 00:00:00 2001 From: sio Date: Thu, 19 Sep 2024 10:11:37 +0200 Subject: [PATCH 3/7] =?UTF-8?q?mise=20=C3=A0=20jour=20pour=20Commande=20et?= =?UTF-8?q?=20testCommande?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nbproject/project.properties | 4 +- src/métiers/Commande.java | 29 +++++- test/métiers/CommandeTest.java | 178 ++++++++++----------------------- 3 files changed, 81 insertions(+), 130 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index 74d784e..70b68b5 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -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=\ diff --git a/src/métiers/Commande.java b/src/métiers/Commande.java index 2a2829a..8b2190f 100644 --- a/src/métiers/Commande.java +++ b/src/métiers/Commande.java @@ -36,15 +36,40 @@ private final HashMap 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 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 { diff --git a/test/métiers/CommandeTest.java b/test/métiers/CommandeTest.java index e4d515e..1a5f325 100644 --- a/test/métiers/CommandeTest.java +++ b/test/métiers/CommandeTest.java @@ -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 expResult = null; - HashMap 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."); - } - } From 6ed7fb09f23c2bbe5d078ce9c3ba43ba10e4c013 Mon Sep 17 00:00:00 2001 From: "morgann.david" Date: Thu, 19 Sep 2024 10:26:18 +0200 Subject: [PATCH 4/7] test cas 5 --- test/métiers/CommandeTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/métiers/CommandeTest.java b/test/métiers/CommandeTest.java index 1a5f325..a8d9a10 100644 --- a/test/métiers/CommandeTest.java +++ b/test/métiers/CommandeTest.java @@ -67,7 +67,11 @@ public class CommandeTest { 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*/ + laCommande.ajouter(instr2, 0); + stockRes=instr2.getQteStock(); + stockAttendu=9; + assertEquals("test5 stock",stockAttendu,stockRes ); + /*ILONA*/ System.out.println("Cas6 : màj d'une ligne existante avec qté>stock"); } From 8dc9d9d3851e6f2389df310db0a3f02e341c8d87 Mon Sep 17 00:00:00 2001 From: sio Date: Thu, 19 Sep 2024 11:38:57 +0200 Subject: [PATCH 5/7] =?UTF-8?q?mise=20=C3=A0=20jour=20pour=20Commande=20et?= =?UTF-8?q?=20testCommande=20avec=20Ines=20et=20Ilona?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/métiers/CommandeTest.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/test/métiers/CommandeTest.java b/test/métiers/CommandeTest.java index a8d9a10..9006827 100644 --- a/test/métiers/CommandeTest.java +++ b/test/métiers/CommandeTest.java @@ -29,6 +29,7 @@ public class CommandeTest { public void testAjouter() { Instrument instr1=new Instrument(1,"Piano",10, 8300f); Instrument instr2=new Instrument(2,"Violon",9, 105f); + Instrument instr3=new Instrument(3,"piano",8, 105f); Commande laCommande = new Commande(1,1,"12/09/2024"); System.out.println("ajouter"); //cas 0 @@ -63,6 +64,17 @@ public class CommandeTest { /*INES*/ System.out.println("Cas3 : ajout nouvelle ligne avec quantité > stock"); + boolean test= laCommande.ajouter(instr3, 12); + stockRes=instr3.getQteStock(); + stockAttendu=8; + boolean testResultExpected=false; + + assertEquals("test3 stock",stockAttendu,stockRes ); + assertEquals("La méthode ajouter retourne false",testResultExpected,test ); + + System.out.println("Nombre de ligne dans le dictionnaire: "+laCommande.getLesLignes().size()); + System.out.println("Résultat de la méthode ajouter: " + test); + /*MAISSANE*/ System.out.println("Cas4 : ajout nouvelle ligne avec quantité 0"); /*MORGANN*/ @@ -73,6 +85,13 @@ public class CommandeTest { assertEquals("test5 stock",stockAttendu,stockRes ); /*ILONA*/ System.out.println("Cas6 : màj d'une ligne existante avec qté>stock"); + System.out.println("Cas6 : màj d'une ligne existante avec qté>stock"); + boolean resultatMethode = laCommande.ajouter(instr1, 12); + boolean resultatMethodeAttendu=false; + assertEquals("test6 mise à jour",resultatMethodeAttendu,resultatMethode); + stockRes=instr1.getQteStock(); + stockAttendu=2; + assertEquals("test6 stock",stockAttendu,stockRes ); } From 9e6a9cc867cd5cd0325184932fbf21d3b6ff2948 Mon Sep 17 00:00:00 2001 From: "maissane.elmjidi" Date: Thu, 19 Sep 2024 11:42:33 +0200 Subject: [PATCH 6/7] ajout page maissane --- test/métiers/CommandeTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/métiers/CommandeTest.java b/test/métiers/CommandeTest.java index 9006827..ea58235 100644 --- a/test/métiers/CommandeTest.java +++ b/test/métiers/CommandeTest.java @@ -77,6 +77,18 @@ public class CommandeTest { /*MAISSANE*/ System.out.println("Cas4 : ajout nouvelle ligne avec quantité 0"); + System.out.println("Cas4 : ajout nouvelle ligne avec quantité 0"); + laCommande.ajouter(instr3, 0); + boolean Ajouter= false; + assertEquals("Test4 ajout 0 instr3",Ajouter); + int lignes=laCommande.getLesLignes().size(); + int nbLigneAttendu = 2; + assertEquals("Test4 taille",nbLigneAttendu,lignes); + qteRes=laCommande.getLesLignes().get(instr3); + qteAttendu=0; + assertEquals("Test4 quantite", qteAttendu,qteRes); + + /*MORGANN*/ System.out.println("Cas5 : mise à 0 quantité commandée d'une ligne existante"); laCommande.ajouter(instr2, 0); From 6bcc94486fcc83dab1045f87a1d3c38d8a175d90 Mon Sep 17 00:00:00 2001 From: sio Date: Thu, 19 Sep 2024 11:55:10 +0200 Subject: [PATCH 7/7] =?UTF-8?q?mise=20=C3=A0=20jour=20Morgann?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/métiers/Commande.java | 60 +++++++++++++++++----------------- test/métiers/CommandeTest.java | 9 +++-- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/métiers/Commande.java b/src/métiers/Commande.java index 8b2190f..aa86c01 100644 --- a/src/métiers/Commande.java +++ b/src/métiers/Commande.java @@ -40,36 +40,36 @@ private final HashMap lesLignes = new HashMap<>(); //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 (qteDisponiblestock"); System.out.println("Cas6 : màj d'une ligne existante avec qté>stock");