From b109399da5faff64f56173615a691e069030e4b9 Mon Sep 17 00:00:00 2001
From: famille Thevenot <famille Thevenot@DESKTOP-4DBJ9K3>
Date: Wed, 25 Sep 2024 18:18:10 +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
---
 test/métiers/CommandeTest.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/métiers/CommandeTest.java b/test/métiers/CommandeTest.java
index 91b5c63..c78641a 100644
--- a/test/métiers/CommandeTest.java
+++ b/test/métiers/CommandeTest.java
@@ -109,6 +109,14 @@ public class CommandeTest {
         assertEquals("test6 stock",stockAttendu,stockRes );
     }
 
+    private void assertEquals(String test1_taille, int tailleAttendue, int tailleR) {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+    }
+
+    private void assertEquals(String la_méthode_ajouter_retourne_false, boolean testResultExpected, boolean test) {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+    }
+
         
     /**
      * Test of supprimer method, of class Commande.