Classe test

build.xml

@@ -7,8 +7,8 @@
 <!-- the Compile on Save feature is turned off for the project. -->
 <!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
 <!-- in the project's Project Properties dialog box.-->
-<project name="MusicAndCo" default="default" basedir=".">
+<project name="MusicAndCoV3" default="default" basedir=".">
-    <description>Builds, tests, and runs the project MusicAndCo.</description>
+    <description>Builds, tests, and runs the project MusicAndCoV3.</description>
     <import file="nbproject/build-impl.xml"/>
     <!--
 
@@ -58,7 +58,7 @@
 
     An example of overriding the target for project execution could look like this:
 
-        <target name="run" depends="MusicAndCo-impl.jar">
+        <target name="run" depends="MusicAndCoV3-impl.jar">
             <exec dir="bin" executable="launcher.exe">
                 <arg file="${dist.jar}"/>
             </exec>

nbproject/build-impl.xml

@@ -19,7 +19,7 @@ is divided into following sections:
   - cleanup
 
         -->
-<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" xmlns:unless="ant:unless" basedir=".." default="default" name="MusicAndCo-impl">
+<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" xmlns:unless="ant:unless" basedir=".." default="default" name="MusicAndCoV3-impl">
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
             <not>
@@ -619,7 +619,7 @@ is divided into following sections:
                     </fileset>
                 </union>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="MusicAndCo" testname="TestNG tests" workingDir="${work.dir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="MusicAndCoV3" testname="TestNG tests" workingDir="${work.dir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -716,7 +716,7 @@ is divided into following sections:
                 <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
                     <isset property="test.method"/>
                 </condition>
-                <condition else="-suitename MusicAndCo -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                <condition else="-suitename MusicAndCoV3 -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
                     <matches pattern=".*\.xml" string="@{testClass}"/>
                 </condition>
                 <delete dir="${build.test.results.dir}" quiet="true"/>
@@ -1057,7 +1057,7 @@ is divided into following sections:
         <delete file="${built-jar.properties}" quiet="true"/>
     </target>
     <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: MusicAndCo was already built"/>
+        <echo level="warn" message="Cycle detected: MusicAndCoV3 was already built"/>
     </target>
     <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
         <mkdir dir="${build.dir}"/>
@@ -1728,7 +1728,7 @@ is divided into following sections:
         <delete file="${built-clean.properties}" quiet="true"/>
     </target>
     <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: MusicAndCo was already built"/>
+        <echo level="warn" message="Cycle detected: MusicAndCoV3 was already built"/>
     </target>
     <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
         <mkdir dir="${build.dir}"/>

nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=ad09f6ef
+build.xml.data.CRC32=0e137893
-build.xml.script.CRC32=fbce868f
+build.xml.script.CRC32=e04698ea
-build.xml.stylesheet.CRC32=f85dc8f2@1.109.0.48
+build.xml.stylesheet.CRC32=f85dc8f2@1.111.0.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=ad09f6ef
+nbproject/build-impl.xml.data.CRC32=0e137893
-nbproject/build-impl.xml.script.CRC32=4c0de17b
+nbproject/build-impl.xml.script.CRC32=63f48240
-nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.109.0.48
+nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.111.0.48

nbproject/project.properties

@@ -28,10 +28,10 @@ debug.test.modulepath=\
 dist.archive.excludes=
 # This directory is removed when the project is cleaned:
 dist.dir=dist
-dist.jar=${dist.dir}/MusicAndCo.jar
+dist.jar=${dist.dir}/MusicAndCoV3.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 dist.jlink.dir=${dist.dir}/jlink
-dist.jlink.output=${dist.jlink.dir}/MusicAndCo
+dist.jlink.output=${dist.jlink.dir}/MusicAndCoV3
 excludes=
 includes=**
 jar.compress=false
@@ -74,7 +74,7 @@ jlink.additionalmodules=
 # The jlink additional command line parameters
 jlink.additionalparam=
 jlink.launcher=true
-jlink.launcher.name=MusicAndCo
+jlink.launcher.name=MusicAndCoV3
 main.class=Test
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF

nbproject/project.xml

@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>MusicAndCo</name>
+            <name>MusicAndCoV3</name>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>

src/NewClass.java

@@ -0,0 +1,63 @@
+
+import java.util.ArrayList;
+import java.util.Scanner;
+import métiers.Commande;
+import métiers.Entreprise;
+import métiers.Instrument;
+
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+
+/**
+ *VERSION SANS PLUSIEURS MENU
+ * @author ilona.cardot
+ */
+public class NewClass {
+     /** 
+     * @param args the command line arguments
+     */
+    public static void main(String[] args) {
+       Entreprise lEntreprise=new Entreprise("MusicAndCo");
+        Commande laCommande = new Commande(1,1,"12/09/2024");
+        ArrayList<Instrument> lesInstrumentsEnt = lEntreprise.getLesInstruments();
+        Scanner clavier = new Scanner(System.in);
+         String choixUtil0="";
+         lEntreprise.ajouterCommande(laCommande);
+         while(!choixUtil0.equals("N")){
+           System.out.println("Commande numero : "+laCommande.getNoCom()+("\t\t Date : "+laCommande.getDateCom()));
+           System.out.println("----------------------------------------------------------------");
+           System.out.println("Instruments disponible : ");
+           for (int i = 0; i < lesInstrumentsEnt.size(); i ++) {
+               System.out.println("Instrument "+(i+1)+" : "+lesInstrumentsEnt.get(i));//on ajoute 1 à l'index pour ne pas afficher instrument 0 
+            }
+           System.out.println("Quel instrument souhaitez vous ajouter? (entrez son numero)");
+           int instrAjoutSaisie = clavier.nextInt()-1; //on supprime 1 pour avoir le bon index
+           System.out.println("Combien souhaitez vous en ajouter?");
+           int instrQteAjout = clavier.nextInt();
+           if (laCommande.ajouter(lesInstrumentsEnt.get(instrAjoutSaisie), instrQteAjout)==true){
+               System.out.println("Instrument ajoute avec succes");
+               laCommande.ajouter(lesInstrumentsEnt.get(instrAjoutSaisie), instrQteAjout);
+           } else {
+               System.out.println("Ajout impossible, instrument non existant ou quantite choisie superieur à la quantite disponible");
+           }
+           System.out.println("----------------------------------------------------------------");
+           System.out.println("Souhaitez vous ajouter des instruments à la commande? (O/N)");
+           choixUtil0 = clavier.next();
+       }
+        //finalisation de la commande
+        System.out.println("---------------------------Contenu de la commande numero "+laCommande.getNoCom()+"------------------------------");
+        System.out.println(laCommande.getLesLignes());
+        System.out.println("Validez vous la commande?(O/N)");
+        String choixUtil2 = clavier.next();
+        if (choixUtil0.equals("O")){
+            System.out.println("Commande validée");
+            lEntreprise.ajouterCommande(laCommande);
+        }else {
+            System.out.println("Commande annulée");
+        }
+        System.out.println("----------------------------------------------------------------");
+
+    }
+}

src/Test.java

@@ -1,7 +1,7 @@
 
-import métiers.Commande;
+import java.util.ArrayList;
-import métiers.Entreprise;
+import métiers.*;
-import métiers.Instrument;
+import java.util.Scanner;
 
 /*
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
@@ -13,16 +13,77 @@ import métiers.Instrument;
  * @author sio
  */
 public class Test {
+        Entreprise lEntreprise=new Entreprise("MusicAndCo");
+        Commande laCommande = new Commande(1,1,"12/09/2024");
+        ArrayList<Instrument> lesInstrumentsEnt = lEntreprise.getLesInstruments();
+        Scanner clavier = new Scanner(System.in);
+    /**
+     * Création d'une nouvelle commande et ajout si validée
+     */
+    public Test(){
+    }
+    public void nouvelleCommande(){
+         String choixUtil0="";
+         lEntreprise.ajouterCommande(laCommande);
+         while(!choixUtil0.equals("N")){
+           System.out.println("Commande numero : "+laCommande.getNoCom()+("\t\t Date : "+laCommande.getDateCom()));
+           System.out.println("----------------------------------------------------------------");
+           System.out.println("Instruments disponible : ");
+           for (int i = 0; i < lesInstrumentsEnt.size(); i ++) {
+               System.out.println("Instrument "+(i+1)+" : "+lesInstrumentsEnt.get(i));//on ajoute 1 à l'index pour ne pas afficher instrument 0 
+            }
+           System.out.println("Quel instrument souhaitez vous ajouter? (entrez son numero)");
+           int instrAjoutSaisie = clavier.nextInt()-1; //on supprime 1 pour avoir le bon index
+           System.out.println("Combien souhaitez vous en ajouter?");
+           int instrQteAjout = clavier.nextInt();
+           if (laCommande.ajouter(lesInstrumentsEnt.get(instrAjoutSaisie), instrQteAjout)==true){
+               System.out.println("Instrument ajoute avec succes");
+               laCommande.ajouter(lesInstrumentsEnt.get(instrAjoutSaisie), instrQteAjout);
+           } else {
+               System.out.println("Ajout impossible, instrument non existant ou quantite choisie superieur à la quantite disponible");
+           }
+           System.out.println("----------------------------------------------------------------");
+           System.out.println("Souhaitez vous ajouter des instruments à la commande? (O/N)");
+           choixUtil0 = clavier.next();
+       }
+        //finalisation de la commande
+        System.out.println("---------------------------Contenu de la commande numero "+laCommande.getNoCom()+"------------------------------");
+        System.out.println(laCommande.getLesLignes());
+        System.out.println("Validez vous la commande?(O/N)");
+        String choixUtil2 = clavier.next();
+        if (choixUtil0.equals("O")){
+            System.out.println("Commande validée");
+            lEntreprise.ajouterCommande(laCommande);
+        }else {
+            System.out.println("Commande annulée");
+        }
+        System.out.println("----------------------------------------------------------------");
 
+    }
+    public void commandesExistantes(){
+
+}
+    }
     /** 
      * @param args the command line arguments
      */
     public static void main(String[] args) {
-        Entreprise lEntreprise=new Entreprise("MusicAndCo");
+        Test test1;
-        Commande laCommande = new Commande(1,1,"12/09/2024");
+        test1 = new Test();
-        lEntreprise.ajouterCommande(laCommande);
+        int choixUtil=0;
-        
+        while(choixUtil!=3){
-        //ajouter 3 piano droit et 2 violon alto dans la commande
+        System.out.println("Que souhaitez vous faire?\n\t1 : Créer une nouvelle commande \n\t 2: Annuler une commande existante\n\t 3: Fermer l'application");
+        switch(choixUtil){
+            case 1 :
+                test1.nouvelleCommande();
+                break;
+            /*case 2 :
+                test1.commandesExistantes;
+                break;*/
+             case 3 :
+                break;
         }
+}
+    
     
 }

src/métiers/Commande.java

@@ -57,12 +57,14 @@ private final HashMap<Instrument, Integer> lesLignes = new HashMap<>();
     */
     public boolean supprimer(Instrument unInstrument){
         //lesLignes.remove(unInstrument);
-        boolean suppOK;
+        
+        boolean suppOK = false;
         if (lesLignes.containsKey(unInstrument) == true){
             suppOK = true;
+            int qteCommande = lesLignes.get(unInstrument);
             lesLignes.remove(unInstrument);
-        } else {
+            int qteDisponible = unInstrument.getQteStock();
-            suppOK = false;
+            unInstrument.setQteStock(qteDisponible+qteCommande);
         }
         return suppOK;
     }
@@ -119,5 +121,10 @@ private final HashMap<Instrument, Integer> lesLignes = new HashMap<>();
         return Objects.equals(this.dateCom, other.dateCom);
     }
 
+    @Override
+    public String toString() {
+        return "numero de commande : " + noCom + "\t \t date de la commadne : " + dateCom + "\n contenu de la commande : " + lesLignes + '}';
+    }
+    
     
 }

src/métiers/Entreprise.java

@@ -15,17 +15,17 @@ import métiers.Instrument;
 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);
+         lesInstruments.add(instr2);
+         lesInstruments.add(instr3);
     }
 
     public String getRaisonSociale() {
@@ -63,4 +63,23 @@ public class Entreprise {
         }
         return uneCommande;
     }
+
+    public ArrayList<Commande> getLesCommandes() {
+        return lesCommandes;
+    }
+
+    public ArrayList<Instrument> getLesInstruments() {
+        return lesInstruments;
+    }
+
+    public void setLesCommandes(ArrayList<Commande> lesCommandes) {
+        this.lesCommandes = lesCommandes;
+    }
+
+    public void setLesInstruments(ArrayList<Instrument> lesInstruments) {
+        this.lesInstruments = lesInstruments;
+    }
+   
 }
+    
+

src/métiers/Instrument.java

@@ -25,7 +25,7 @@ public class Instrument {
 
     @Override
     public String toString() {
-        return "Instrument{" + "ref=" + ref + ", designation=" + designation + ", qteStock=" + qteStock + ", prix=" + prix + '}';
+        return "reference : " + ref + "\t designation : " + designation + "\t quantite en stock : " + qteStock + "\t prix : " + prix + '}';
     }
 
     public void setRef(int ref) {

test/métiers/CommandeTest.java

@@ -48,7 +48,7 @@ public class CommandeTest {
        int tailleAttendue=2;
        assertEquals("Test1 taille",tailleAttendue,tailleR);
        
-       System.out.println("Cas2 : màj quantité commandée d'une ligne existante");
+      /* System.out.println("Cas2 : màj quantité commandée d'une ligne existante");
        laCommande.ajouter(instr2, 5);
        stockRes=instr2.getQteStock();
        stockAttendu=4;
@@ -56,31 +56,36 @@ public class CommandeTest {
        
        /*qteRes=laCommande.getLesLignes().get(instr2);
        qteAttendu=5;
-       assertEquals("Test2 quantite", qteAttendu,qteRes);*/
+       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");
+        System.out.println("Cas6 : màj d'une ligne existante avec qté>stock");*/
     }
 
-    /**
-     * Test of supprimer method, of class Commande.
-     
     @Test
-    public void testSupprimer() {
+    public void testSupprimer(){
-        System.out.println("supprimer");
+        Instrument instr1 = new Instrument(1,"Piano",10,8300f);
-        Instrument unInstrument = null;
+        Instrument instr2 = new Instrument(2,"Violon",9,105f);
-        Commande instance = null;
+        Commande laCommande2 = new Commande(1,1,"12/09/2024");
-        boolean expResult = false;
+        laCommande2.ajouter(instr1,2);
-        boolean result = instance.supprimer(unInstrument);
+        boolean expectedResult=false;
-        assertEquals("test supprimer",expResult, result);
+        boolean expectedResult2=true;
-        // TODO review the generated test code and remove the default call to fail.
+        int stockAttendu=10;
-        fail("The test case is a prototype.");
+        System.out.println("Test de la méthode supprimer");
-    }*/
+        boolean test = laCommande2.supprimer(instr2); 
+        boolean test2 = laCommande2.supprimer(instr1);
+        int test3 = instr1.getQteStock();
+        assertEquals("suppression impossible : ",expectedResult,test);
+        assertEquals("suppression possible : ",expectedResult2,test2);
+        assertEquals("Quantité d'instr1 en stock",stockAttendu,test3);
+    }
+        
+
 
 }