diff --git a/src/fr/test/test.java b/src/fr/test/test.java index 0856a9f..112c472 100644 --- a/src/fr/test/test.java +++ b/src/fr/test/test.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.HashSet; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.BeforeEach; @@ -15,33 +15,33 @@ import src.fr.api.*; public class test { - Category Engine = new CategoryImpl("Engine"); - Category Transmission = new CategoryImpl("Transmission"); - Category Exterior= new CategoryImpl("Exterior"); - Category Interior= new CategoryImpl("Interior"); + Category Engine; + Category Transmission; + Category Exterior; + Category Interior; //PartType - PartType EG100= new PartTypeImpl("EG100", Engine); - PartType EG133= new PartTypeImpl("EG133", Engine); - PartType EG210= new PartTypeImpl("EG210", Engine); - PartType ED110= new PartTypeImpl("ED110", Engine); - PartType ED180= new PartTypeImpl("ED180", Engine); - PartType EH120= new PartTypeImpl("EH120", Engine); + PartType EG100; + PartType EG133; + PartType EG210; + PartType ED110; + PartType ED180; + PartType EH120; - PartType TM5= new PartTypeImpl("TM5", Transmission); - PartType TM6= new PartTypeImpl("TM6", Transmission); - PartType TA5= new PartTypeImpl("TA5", Transmission); - PartType TS6= new PartTypeImpl("TS6", Transmission); - PartType TSF7= new PartTypeImpl("TSF7", Transmission); - PartType TC120= new PartTypeImpl("TC120", Transmission); + PartType TM5; + PartType TM6; + PartType TA5; + PartType TS6; + PartType TSF7; + PartType TC120; - PartType XC= new PartTypeImpl("XC", Exterior); - PartType XM= new PartTypeImpl("XM", Exterior); - PartType XS= new PartTypeImpl("XS", Exterior); + PartType XC; + PartType XM; + PartType XS; - PartType IN= new PartTypeImpl("IN", Interior); - PartType IH= new PartTypeImpl("IH", Interior); - PartType IS= new PartTypeImpl("IS", Interior); + PartType IN; + PartType IH; + PartType IS; CompatibilityManager cm; @@ -50,6 +50,34 @@ public class test { @BeforeEach public void init(){ + Engine = new CategoryImpl("Engine"); + Transmission = new CategoryImpl("Transmission"); + Exterior= new CategoryImpl("Exterior"); + Interior= new CategoryImpl("Interior"); + + Engine = new CategoryImpl("Engine"); + Transmission = new CategoryImpl("Transmission"); + Exterior= new CategoryImpl("Exterior"); + Interior= new CategoryImpl("Interior"); + EG100= new PartTypeImpl("EG100", Engine); + EG133= new PartTypeImpl("EG133", Engine); + EG210= new PartTypeImpl("EG210", Engine); + ED110= new PartTypeImpl("ED110", Engine); + ED180= new PartTypeImpl("ED180", Engine); + EH120= new PartTypeImpl("EH120", Engine); + TM5= new PartTypeImpl("TM5", Transmission); + TM6= new PartTypeImpl("TM6", Transmission); + TA5= new PartTypeImpl("TA5", Transmission); + TS6= new PartTypeImpl("TS6", Transmission); + TSF7= new PartTypeImpl("TSF7", Transmission); + TC120= new PartTypeImpl("TC120", Transmission); + XC= new PartTypeImpl("XC", Exterior); + XM= new PartTypeImpl("XM", Exterior); + XS= new PartTypeImpl("XS", Exterior); + IN= new PartTypeImpl("IN", Interior); + IH= new PartTypeImpl("IH", Interior); + IS= new PartTypeImpl("IS", Interior); + cm = new CompatibilityManagerImpl(); Set EH120Requirement = new HashSet();