delphine.thevenot/MusicAndCo
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Compare commits

base: delphine.thevenot:09a7279d52bb390b2f9601256019d30f46407db4
Branches Tags
delphine.thevenot:master
delphine.thevenot:Maissane2
delphine.thevenot:morgannV2BcYeag
delphine.thevenot:ilona
delphine.thevenot:dt2
delphine.thevenot:dt
delphine.thevenot:inesV2
delphine.thevenot:ines
..
compare: delphine.thevenot:6bcc94486fcc83dab1045f87a1d3c38d8a175d90
Branches Tags
delphine.thevenot:Maissane2
delphine.thevenot:morgannV2BcYeag
delphine.thevenot:ilona
delphine.thevenot:dt2
delphine.thevenot:master
delphine.thevenot:dt
delphine.thevenot:inesV2
delphine.thevenot:ines

No commits in common. "09a7279d52bb390b2f9601256019d30f46407db4" and "6bcc94486fcc83dab1045f87a1d3c38d8a175d90" have entirely different histories.
09a7279d52 ... 6bcc94486f

5 changed files with 113 additions and 163 deletions
Show Stats Expand all files Collapse all files

197
nbproject/project.properties
View File

@ -1,99 +1,98 @@
annotation.processing.enabled=true annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false annotation.processing.enabled.in.editor=false
annotation.processing.processor.options= annotation.processing.processor.options=
annotation.processing.processors.list= annotation.processing.processors.list=
annotation.processing.run.all.processors=true annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
build.classes.dir=${build.dir}/classes build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned: # This directory is removed when the project is cleaned:
build.dir=build build.dir=build
build.generated.dir=${build.dir}/generated build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here: # Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport: # Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket #debug.transport=dt_socket
debug.classpath=\ debug.classpath=\
${run.classpath} ${run.classpath}
debug.modulepath=\ debug.modulepath=\
${run.modulepath} ${run.modulepath}
debug.test.classpath=\ debug.test.classpath=\
${run.test.classpath} ${run.test.classpath}
debug.test.modulepath=\ debug.test.modulepath=\
${run.test.modulepath} ${run.test.modulepath}
# Files in build.classes.dir which should be excluded from distribution jar # Files in build.classes.dir which should be excluded from distribution jar
dist.archive.excludes= dist.archive.excludes=
# This directory is removed when the project is cleaned: # This directory is removed when the project is cleaned:
dist.dir=dist dist.dir=dist
dist.jar=${dist.dir}/MusicAndCo.jar dist.jar=${dist.dir}/MusicAndCo.jar
dist.javadoc.dir=${dist.dir}/javadoc dist.javadoc.dir=${dist.dir}/javadoc
dist.jlink.dir=${dist.dir}/jlink dist.jlink.dir=${dist.dir}/jlink
dist.jlink.output=${dist.jlink.dir}/MusicAndCo dist.jlink.output=${dist.jlink.dir}/MusicAndCo
excludes= excludes=
includes=** includes=**
jar.compress=false jar.compress=false
javac.classpath= javac.classpath=
# Space-separated list of extra javac options # Space-separated list of extra javac options
javac.compilerargs=\ --enable-preview --enable-preview javac.compilerargs=\ --enable-preview --enable-preview
javac.deprecation=false javac.deprecation=false
javac.external.vm=true javac.external.vm=true
javac.modulepath= javac.modulepath=
javac.processormodulepath= javac.processormodulepath=
javac.processorpath=\ javac.processorpath=\
${javac.classpath} ${javac.classpath}
javac.source=21 javac.source=21
javac.target=21 javac.target=21
javac.test.classpath=\ javac.test.classpath=\
${javac.classpath}:\ ${javac.classpath}:\
${build.classes.dir}:\ ${build.classes.dir}:\
${libs.testng.classpath}:\ ${libs.junit_5.classpath}:\
${libs.junit_5.classpath}:\ ${libs.junit_4.classpath}:\
${libs.junit_4.classpath}:\ ${libs.hamcrest.classpath}
${libs.hamcrest.classpath} javac.test.modulepath=\
javac.test.modulepath=\ ${javac.modulepath}
${javac.modulepath} javac.test.processorpath=\
javac.test.processorpath=\ ${javac.test.classpath}
${javac.test.classpath} javadoc.additionalparam=
javadoc.additionalparam= javadoc.author=false
javadoc.author=false javadoc.encoding=${source.encoding}
javadoc.encoding=${source.encoding} javadoc.html5=false
javadoc.html5=false javadoc.noindex=false
javadoc.noindex=false javadoc.nonavbar=false
javadoc.nonavbar=false javadoc.notree=false
javadoc.notree=false javadoc.private=false
javadoc.private=false javadoc.splitindex=true
javadoc.splitindex=true javadoc.use=true
javadoc.use=true javadoc.version=false
javadoc.version=false javadoc.windowtitle=
javadoc.windowtitle= # The jlink additional root modules to resolve
# The jlink additional root modules to resolve jlink.additionalmodules=
jlink.additionalmodules= # The jlink additional command line parameters
# The jlink additional command line parameters jlink.additionalparam=
jlink.additionalparam= jlink.launcher=true
jlink.launcher=true jlink.launcher.name=MusicAndCo
jlink.launcher.name=MusicAndCo main.class=Test
main.class=Test manifest.file=manifest.mf
manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF
meta.inf.dir=${src.dir}/META-INF mkdist.disabled=false
mkdist.disabled=false platform.active=default_platform
platform.active=default_platform run.classpath=\
run.classpath=\ ${javac.classpath}:\
${javac.classpath}:\ ${build.classes.dir}
${build.classes.dir} # Space-separated list of JVM arguments used when running the project.
# Space-separated list of JVM arguments used when running the project. # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value. # To set system properties for unit tests define test-sys-prop.name=value:
# To set system properties for unit tests define test-sys-prop.name=value: run.jvmargs=\ --enable-preview
run.jvmargs=\ --enable-preview run.modulepath=\
run.modulepath=\ ${javac.modulepath}
${javac.modulepath} run.test.classpath=\
run.test.classpath=\ ${javac.test.classpath}:\
${javac.test.classpath}:\ ${build.test.classes.dir}
${build.test.classes.dir} run.test.modulepath=\
run.test.modulepath=\ ${javac.test.modulepath}
${javac.test.modulepath} source.encoding=UTF-8
source.encoding=UTF-8 src.dir=src
src.dir=src test.src.dir=test
test.src.dir=test

22
src/Test.java
View File

@ -19,20 +19,16 @@ public class Test {
*/ */
public static void main(String[] args) { public static void main(String[] args) {
Entreprise lEntreprise=new Entreprise("MusicAndCo"); Entreprise lEntreprise=new Entreprise("MusicAndCo");
Commande laCommande1 = new Commande(1,1,"12/09/2024"); Instrument instr1=new Instrument(1,"Piano",10, 8300f);
Instrument instr2=new Instrument(2,"Violon",9, 105f);
Instrument instr3=new Instrument(3,"Guitare",8, 575f);
Commande laCommande = new Commande(1,1,"12/09/2024");
lEntreprise.ajouterCommande(laCommande);
//ajouter des instruments de l'entreprise à la commande //Test Cas0-Ajouter à la commande une ligne de 2 instr1
System.out.println("Résultat de l'ajout de 2 instr1 à la commande :" + laCommande.ajouter(instr1, 2) );
//affecter la commande à l'entreprise si la comamnde est possible System.out.println("Nouveau stock de instr1 : "+instr1.getQteStock());
lEntreprise.ajouterCommande(laCommande1); System.out.println("Quantité de la ligne de commande de instr1 :"+laCommande.getLesLignes().get(instr1));
//créer une autre commande
//rechercher et afficher une commande
//supprimer une des 2 commande
} }
} }

14
src/métiers/Entreprise.java
View File

@ -5,8 +5,6 @@
package métiers; package métiers;
import java.util.ArrayList; import java.util.ArrayList;
import métiers.Commande;
import métiers.Instrument;
/** /**
* *
@ -16,16 +14,9 @@ public class Entreprise {
private String raisonSociale; private String raisonSociale;
private ArrayList<Commande> lesCommandes = new ArrayList<>(); private ArrayList<Commande> lesCommandes = new ArrayList<>();
private ArrayList<Instrument> lesInstruments = new ArrayList<>(); private ArrayList<Instrument> lesInstruments = new ArrayList<>();
public Entreprise(String raisonSociale) { public Entreprise(String raisonSociale) {
this.raisonSociale = raisonSociale; this.raisonSociale = raisonSociale;
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);
} }
public String getRaisonSociale() { public String getRaisonSociale() {
@ -47,9 +38,6 @@ public class Entreprise {
} }
public void supprimerCommande(Commande uneCommande){ public void supprimerCommande(Commande uneCommande){
//parcours pour supprimer les instruments de la commande
//suppression de la commande
lesCommandes.remove(uneCommande); lesCommandes.remove(uneCommande);
} }

16
test/métiers/CommandeTest.java
View File

@ -5,7 +5,9 @@
package métiers; package métiers;
import java.util.HashMap; import java.util.HashMap;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
/** /**
* *
@ -16,14 +18,14 @@ public class CommandeTest {
public CommandeTest() { public CommandeTest() {
} }
@Before
public void setUp() { public void setUp() {
} }
/** /**
* Test of ajouter method, of class Commande. * Test of ajouter method, of class Commande.
*/ */
@Test
public void testAjouter() { public void testAjouter() {
Instrument instr1=new Instrument(1,"Piano",10, 8300f); Instrument instr1=new Instrument(1,"Piano",10, 8300f);
Instrument instr2=new Instrument(2,"Violon",9, 105f); Instrument instr2=new Instrument(2,"Violon",9, 105f);
@ -107,14 +109,6 @@ public class CommandeTest {
assertEquals("test6 stock",stockAttendu,stockRes ); 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. * Test of supprimer method, of class Commande.

27
test/métiers/MétiersSuite.xml
View File

@ -1,27 +0,0 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
<suite name="MusicAndCo">
<!--
see examples at http://testng.org/doc/documentation-main.html#testng-xml
<suite-files>
<suite-file path="./junit-suite.xml" />
</suite-files>
<test name="TimeOut">
<classes>
<class name="test.timeout.TimeOutTest" />
<class name="test.timeout.TimeOutFromXmlTest"/>
<class name="test.timeout.TimeOutThreadLocalSampleTest"/>
</classes>
</test>
-->
<test name="métiers suite">
<packages>
<package name="métiers"/>
</packages>
</test>
</suite>