From f62ca87ef31f22f518d9961c7c45948fa330b12f Mon Sep 17 00:00:00 2001 From: trochas Date: Mon, 25 Nov 2024 15:20:15 +0100 Subject: [PATCH] correction impl des Parts (engine, Exterio ,...) --- src/fr/impl/Parts/Engine.java | 6 ++- src/fr/impl/Parts/Exterior.java | 7 +-- src/fr/impl/Parts/Interior.java | 7 +-- src/fr/impl/Parts/Transmission.java | 7 +-- src/fr/test/test.java | 69 +++++++++-------------------- 5 files changed, 37 insertions(+), 59 deletions(-) diff --git a/src/fr/impl/Parts/Engine.java b/src/fr/impl/Parts/Engine.java index 69e8739..3587291 100644 --- a/src/fr/impl/Parts/Engine.java +++ b/src/fr/impl/Parts/Engine.java @@ -1,10 +1,12 @@ package src.fr.impl.Parts; import src.fr.api.PartType; +import src.fr.impl.CategoryImpl; import src.fr.impl.PartImpl; +import src.fr.impl.PartTypeImpl; public class Engine extends PartImpl { - public Engine(PartType partType){ - super(partType); + public Engine(String name, CategoryImpl category){ + super(new PartTypeImpl(name,Engine.class, category)); } } diff --git a/src/fr/impl/Parts/Exterior.java b/src/fr/impl/Parts/Exterior.java index 6774bbb..04ffe3a 100644 --- a/src/fr/impl/Parts/Exterior.java +++ b/src/fr/impl/Parts/Exterior.java @@ -1,10 +1,11 @@ package src.fr.impl.Parts; -import src.fr.api.PartType; +import src.fr.impl.CategoryImpl; import src.fr.impl.PartImpl; +import src.fr.impl.PartTypeImpl; public class Exterior extends PartImpl { - public Exterior(PartType partType){ - super(partType); + public Exterior(String name, CategoryImpl category){ + super(new PartTypeImpl(name,Engine.class, category)); } } diff --git a/src/fr/impl/Parts/Interior.java b/src/fr/impl/Parts/Interior.java index 60674d1..3c3beb2 100644 --- a/src/fr/impl/Parts/Interior.java +++ b/src/fr/impl/Parts/Interior.java @@ -1,10 +1,11 @@ package src.fr.impl.Parts; -import src.fr.api.PartType; +import src.fr.impl.CategoryImpl; import src.fr.impl.PartImpl; +import src.fr.impl.PartTypeImpl; public class Interior extends PartImpl { - public Interior(PartType partType){ - super(partType); + public Interior(String name, CategoryImpl category){ + super(new PartTypeImpl(name,Engine.class, category)); } } diff --git a/src/fr/impl/Parts/Transmission.java b/src/fr/impl/Parts/Transmission.java index 7bd1f2d..1c71bb6 100644 --- a/src/fr/impl/Parts/Transmission.java +++ b/src/fr/impl/Parts/Transmission.java @@ -1,10 +1,11 @@ package src.fr.impl.Parts; -import src.fr.api.PartType; +import src.fr.impl.CategoryImpl; import src.fr.impl.PartImpl; +import src.fr.impl.PartTypeImpl; public class Transmission extends PartImpl { - public Transmission(PartType partType){ - super(partType); + public Transmission(String name, CategoryImpl category){ + super(new PartTypeImpl(name,Engine.class, category)); } } diff --git a/src/fr/test/test.java b/src/fr/test/test.java index e419fd5..f048e13 100644 --- a/src/fr/test/test.java +++ b/src/fr/test/test.java @@ -9,13 +9,30 @@ import org.junit.Before; import org.junit.Test; import src.fr.impl.*; +import src.fr.impl.Parts.*; import src.fr.api.*; public class test { - /* -======= + CategoryImpl engine = new CategoryImpl("Engine"); + CategoryImpl transmission = new CategoryImpl("Transmission"); + + Engine EG100 = new Engine("EG100",engine); + Engine EG133 = new Engine("EG133",engine); + Engine EG210= new Engine("EG210", engine); + Engine ED110= new Engine("ED110", engine); + Engine ED180= new Engine("ED180", engine); + Engine EH120= new Engine("EH120", engine); + + Transmission TM5= new Transmission("TM5", transmission); + Transmission TM6= new Transmission("TM6", transmission); + Transmission TA5= new Transmission("TA5", transmission); + Transmission TS6= new Transmission("TS6", transmission); + Transmission TSF7= new Transmission("TSF7", transmission); + Transmission TC120= new Transmission("TC120", transmission); + + /* Category Engine = new CategoryImpl("Engine"); Category Transmission = new CategoryImpl("Transmission"); Category Exterior= new CategoryImpl("Exterior"); @@ -44,7 +61,6 @@ public class test { PartType IH= new PartTypeImpl("IH", Interior); PartType IS= new PartTypeImpl("IS", Interior); - CompatibilityManager cm = new CompatibilityManagerImpl(); */ @Before @@ -93,8 +109,7 @@ public class test { cm.addIncompatibilities(IS, ISIncompatibilities); cm.addRequirements(IS, ISRequirement); - - + */ } @@ -103,46 +118,4 @@ public class test { public void test_1_Incompatibilities_1(){ assertTrue(true); } - - @Test - public void test_multiple_Incompatibilities_2(){ - assertTrue( - cm.getIncompatibilities(TSF7).contains(EG100)&& - cm.getIncompatibilities(TSF7).contains(EG133)&& - cm.getIncompatibilities(TSF7).contains(ED110) - ); - } - - @Test - public void test_1_Requirements_3(){ - assertTrue(cm.getRequirements(EH120).contains(TC120)); - } - - @Test - public void test_Empty_Incompatibilities_4(){ - assertTrue(cm.getIncompatibilities(EH120).isEmpty()); - } - - @Test - public void test_Empty_Requirements_5(){ - assertTrue(cm.getRequirements(ED180).isEmpty()); - } - - @Test - public void test_Remove(){ - assertTrue(cm.getIncompatibilities(XM).contains(EG100)); - cm.removeIncompatibility(XM, EG100); - assertFalse(cm.getIncompatibilities(XM).contains(EG100)); - Set setEG100 = new HashSet(); - setEG100.add(EG100); - cm.addIncompatibilities(EG100, setEG100); - System.out.println(cm.getIncompatibilities(XM) + "//////////"); - //assertTrue(cm.getIncompatibilities(XM).contains(EG100)); - - } - */ - - -} -} - +} \ No newline at end of file