From c000fb78eeffdcf4fd28343fd23e4236eb8f65dd Mon Sep 17 00:00:00 2001
From: famille Thevenot <famille Thevenot@DESKTOP-4DBJ9K3>
Date: Wed, 25 Sep 2024 18:22:52 +0200
Subject: [PATCH] Merge origin/master
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	nbproject/project.properties
#	src/métiers/Commande.java
---
 src/métiers/Commande.java      | 120 ---------------------------------
 test/métiers/CommandeTest.java |   8 +--
 2 files changed, 3 insertions(+), 125 deletions(-)

diff --git a/src/métiers/Commande.java b/src/métiers/Commande.java
index f59c9f5..aa86c01 100644
--- a/src/métiers/Commande.java
+++ b/src/métiers/Commande.java
@@ -19,126 +19,6 @@ private int noCom, noVendeur;
 private String dateCom;
 
 
-private final HashMap<Instrument, Integer> lesLignes = new HashMap<>(); 
-
-
-    public Commande(int noCom, int noVendeur, String dateCom) {
-        this.noCom = noCom;
-        this.noVendeur = noVendeur;
-        this.dateCom = dateCom;
-    }
-
-
-    /**
-    * Ajoute une quantité donnée d'un instrument à la commande
-    * @param unInstrument instrument à ajouter
-    * @param qte quantité à ajouter 
-    * @return true si l'ajout est bon
-    */
-    public boolean ajouter(Instrument unInstrument, int qte){
-        boolean ajoutOK;
-        int qteDisponible = unInstrument.getQteStock();
-        if (qteDisponible<qte){
-            ajoutOK = false;
-        }else {
-            ajoutOK = true;
-            lesLignes.put(unInstrument,qte);
-            unInstrument.setQteStock(qteDisponible-qte);
-        }
-        return ajoutOK;
-    }
-    /**
-    * Supprimer un instrument de la commande
-    * @param unInstrument instrument à supprimer
-    * @return true si la suppression est effectuée
-    */
-    public boolean supprimer(Instrument unInstrument){
-        //lesLignes.remove(unInstrument);
-        boolean suppOK;
-        if (lesLignes.containsKey(unInstrument) == true){
-            suppOK = true;
-            lesLignes.remove(unInstrument);
-        } else {
-            suppOK = false;
-        }
-        return suppOK;
-    }
-   
-/////////////////////////////////////////////////////////////////////////////////
-    
-    public int getNoCom() {
-        return noCom;
-    }
-
-    public int getNoVendeur() {
-        return noVendeur;
-    }
-
-    public String getDateCom() {
-        return dateCom;
-    }
-
-    public HashMap<Instrument, Integer> getLesLignes() {
-        return lesLignes;
-    }
-    
-
-    public void setNoCom(int noCom) {
-        this.noCom = noCom;
-    }
-
-    public void setNoVendeur(int noVendeur) {
-        this.noVendeur = noVendeur;
-    }
-
-    public void setDateCom(String dateCom) {
-        this.dateCom = dateCom;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Commande other = (Commande) obj;
-        if (this.noCom != other.noCom) {
-            return false;
-        }
-        if (this.noVendeur != other.noVendeur) {
-            return false;
-        }
-        return Objects.equals(this.dateCom, other.dateCom);
-    }
-    
-    
-}
-/*
- * 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
- */
-
-package métiers;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- *
- * @author ilona
- */
-public class Commande {
-    
-private int noCom, noVendeur;
-private String dateCom;
-
-
 private final HashMap<Instrument, Integer> lesLignes = new HashMap<>(); 
 
 
diff --git a/test/métiers/CommandeTest.java b/test/métiers/CommandeTest.java
index c78641a..fa10839 100644
--- a/test/métiers/CommandeTest.java
+++ b/test/métiers/CommandeTest.java
@@ -5,9 +5,7 @@
 package métiers;
 
 import java.util.HashMap;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+
 
 /**
  *
@@ -18,14 +16,14 @@ public class CommandeTest {
     public CommandeTest() {
     }
     
-    @Before
+   
     public void setUp() {
     }
 
     /**
      * Test of ajouter method, of class Commande.
      */
-    @Test
+   
     public void testAjouter() {
          Instrument instr1=new Instrument(1,"Piano",10, 8300f);
           Instrument instr2=new Instrument(2,"Violon",9, 105f);