ajout gestion entreprise

nbproject/project.properties

@@ -49,7 +49,10 @@ javac.target=21
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${libs.testng.classpath}
+    ${libs.testng.classpath}:\
+    ${libs.junit_5.classpath}:\
+    ${libs.junit_4.classpath}:\
+    ${libs.hamcrest.classpath}
 javac.test.modulepath=\
     ${javac.modulepath}
 javac.test.processorpath=\

src/Test.java

@@ -19,14 +19,10 @@ public class Test {
      */
     public static void main(String[] args) {
         Entreprise lEntreprise=new Entreprise("MusicAndCo");
-        Instrument instr1=new Instrument(1,"Piano",10, 8300f);
-        Instrument instr2=new Instrument(2,"Violon",9, 105f);
-        Instrument instr3=new Instrument(3,"Guitare",8, 575f);
         Commande laCommande = new Commande(1,1,"12/09/2024");
         lEntreprise.ajouterCommande(laCommande);
         
-        //Ajouter à la commande une ligne de 2 instr1
+        //ajouter 3 piano droit et 2 violon alto dans la commande
-        laCommande.ajouter(instr1, 2);
     }
     
 }

src/métiers/Entreprise.java

@@ -5,6 +5,8 @@
 package métiers;
 
 import java.util.ArrayList;
+import métiers.Commande;
+import métiers.Instrument;
 
 /**
  *
@@ -13,10 +15,17 @@ import java.util.ArrayList;
 public class Entreprise {
     private String raisonSociale;
     private ArrayList<Commande> lesCommandes = new ArrayList<>();
-    private ArrayList<Instrument> lesInstruments = new ArrayList<>();
 
     public Entreprise(String raisonSociale) {
         this.raisonSociale = raisonSociale;
+        
+        ArrayList<Instrument> lesInstruments = new ArrayList<>();
+        Instrument instr1=new Instrument(23,"Piano droit",3, 8300f);
+         Instrument instr2=new Instrument(54,"Violon Alto",5, 105f);
+         Instrument instr3=new Instrument(67,"Guitare Classique",8, 575f);
+         lesInstruments.add(instr3);
+         lesInstruments.add(instr2);
+         lesInstruments.add(instr1);
     }
 
     public String getRaisonSociale() {
@@ -38,6 +47,9 @@ public class Entreprise {
     }
     
     public void supprimerCommande(Commande uneCommande){
+        //parcours pour supprimer les instruments de la commande
+        
+        //suppression de la commande
         lesCommandes.remove(uneCommande);
     }
     

test/métiers/CommandeNGTest.java

@@ -1,52 +0,0 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/UnitTests/EmptyTestNGTest.java to edit this template
- */
-package métiers;
-
-import java.util.HashMap;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author ines.benalia
- */
-public class CommandeNGTest {
-    
-    public CommandeNGTest() {
-    }
-
-    @BeforeMethod
-    public void setUpMethod() throws Exception {
-    }
-
-    @Test
-    public void testAjouter() {
-        System.out.println("ajouter");
-       Instrument instr2=new Instrument(2,"Violon",9, 105f);
-       //  Instrument instr3=new Instrument(3,"Guitare",8, 575f);
-       Commande laCommande = new Commande(1,1,"12/09/2024");
-        boolean expResult = true;
-        boolean result = laCommande.ajouter(instr2, 5);
-        
-        assertEquals(result, expResult);
-       
-    }
-
-
-    @Test
-    public void testSupprimer() {
-        System.out.println("supprimer");
-        Instrument unInstrument = null;
-        Commande instance = null;
-        boolean expResult = false;
-        boolean result = instance.supprimer(unInstrument);
-        assertEquals(result, expResult);
-        fail("The test case is a prototype.");
-    }
-
-   
-    
-}

test/métiers/EntrepriseNGTest.java

@@ -1,82 +0,0 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/UnitTests/EmptyTestNGTest.java to edit this template
- */
-package métiers;
-
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author ines.benalia
- */
-public class EntrepriseNGTest {
-    
-    public EntrepriseNGTest() {
-    }
-
-    @BeforeMethod
-    public void setUpMethod() throws Exception {
-    }
-
-    @Test
-    public void testGetRaisonSociale() {
-        System.out.println("getRaisonSociale");
-        Entreprise instance = null;
-        String expResult = "";
-        String result = instance.getRaisonSociale();
-        assertEquals(result, expResult);
-        fail("The test case is a prototype.");
-    }
-
-    @Test
-    public void testSetRaisonSociale() {
-        System.out.println("setRaisonSociale");
-        String raisonSociale = "";
-        Entreprise instance = null;
-        instance.setRaisonSociale(raisonSociale);
-        fail("The test case is a prototype.");
-    }
-
-    @Test
-    public void testToString() {
-        System.out.println("toString");
-        Entreprise instance = null;
-        String expResult = "";
-        String result = instance.toString();
-        assertEquals(result, expResult);
-        fail("The test case is a prototype.");
-    }
-
-    @Test
-    public void testAjouterCommande() {
-        System.out.println("ajouterCommande");
-        Commande uneCommande = null;
-        Entreprise instance = null;
-        instance.ajouterCommande(uneCommande);
-        fail("The test case is a prototype.");
-    }
-
-    @Test
-    public void testSupprimerCommande() {
-        System.out.println("supprimerCommande");
-        Commande uneCommande = null;
-        Entreprise instance = null;
-        instance.supprimerCommande(uneCommande);
-        fail("The test case is a prototype.");
-    }
-
-    @Test
-    public void testRechercherCommande() {
-        System.out.println("rechercherCommande");
-        int noCom = 0;
-        Entreprise instance = null;
-        Commande expResult = null;
-        Commande result = instance.rechercherCommande(noCom);
-        assertEquals(result, expResult);
-        fail("The test case is a prototype.");
-    }
-    
-}

test/métiers/InstrumentNGTest.java

@@ -1,110 +0,0 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/UnitTests/EmptyTestNGTest.java to edit this template
- */
-package métiers;
-
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author ines.benalia
- */
-public class InstrumentNGTest {
-    
-    public InstrumentNGTest() {
-    }
-
-    @BeforeMethod
-    public void setUpMethod() throws Exception {
-    }
-
-    @Test
-    public void testToString() {
-        System.out.println("toString");
-        Instrument instance = null;
-        String expResult = "";
-        String result = instance.toString();
-        assertEquals(result, expResult);
-        fail("The test case is a prototype.");
-    }
-
-    @Test
-    public void testSetRef() {
-        System.out.println("setRef");
-        int ref = 0;
-        Instrument instance = null;
-        instance.setRef(ref);
-        fail("The test case is a prototype.");
-    }
-
-    @Test
-    public void testSetDesignation() {
-        System.out.println("setDesignation");
-        String designation = "";
-        Instrument instance = null;
-        instance.setDesignation(designation);
-        fail("The test case is a prototype.");
-    }
-
-    @Test
-    public void testSetQteStock() {
-        System.out.println("setQteStock");
-        int qteStock = 0;
-        Instrument instance = null;
-        instance.setQteStock(qteStock);
-        fail("The test case is a prototype.");
-    }
-
-    @Test
-    public void testSetPrix() {
-        System.out.println("setPrix");
-        float prix = 0.0F;
-        Instrument instance = null;
-        instance.setPrix(prix);
-        fail("The test case is a prototype.");
-    }
-
-    @Test
-    public void testGetRef() {
-        System.out.println("getRef");
-        Instrument instance = null;
-        int expResult = 0;
-        int result = instance.getRef();
-        assertEquals(result, expResult);
-        fail("The test case is a prototype.");
-    }
-
-    @Test
-    public void testGetDesignation() {
-        System.out.println("getDesignation");
-        Instrument instance = null;
-        String expResult = "";
-        String result = instance.getDesignation();
-        assertEquals(result, expResult);
-        fail("The test case is a prototype.");
-    }
-
-    @Test
-    public void testGetQteStock() {
-        System.out.println("getQteStock");
-        Instrument instance = null;
-        int expResult = 0;
-        int result = instance.getQteStock();
-        assertEquals(result, expResult);
-        fail("The test case is a prototype.");
-    }
-
-    @Test
-    public void testGetPrix() {
-        System.out.println("getPrix");
-        Instrument instance = null;
-        float expResult = 0.0F;
-        float result = instance.getPrix();
-        assertEquals(result, expResult, 0.0);
-        fail("The test case is a prototype.");
-    }
-    
-}