Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
tok-chef
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Antoine HAZEBROUCK
tok-chef
Commits
fa03581c
Commit
fa03581c
authored
Sep 13, 2024
by
Antoine Hazebrouck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rangement dans packages
parent
2c9fa1ff
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
34 additions
and
18 deletions
+34
-18
Concours.java
src/main/java/imt/concours/Concours.java
+2
-1
FileConcours.java
src/main/java/imt/concours/FileConcours.java
+3
-1
Proposition.java
src/main/java/imt/concours/Proposition.java
+3
-1
Plat.java
src/main/java/imt/ingredients/Plat.java
+1
-5
Chef.java
src/main/java/imt/personnes/Chef.java
+2
-1
Genre.java
src/main/java/imt/personnes/Genre.java
+1
-1
Jury.java
src/main/java/imt/personnes/Jury.java
+1
-1
Padawan.java
src/main/java/imt/personnes/Padawan.java
+1
-1
Person.java
src/main/java/imt/personnes/Person.java
+1
-1
Specialite.java
src/main/java/imt/personnes/Specialite.java
+1
-1
ConcoursTest.java
src/test/java/imt/concours/ConcoursTest.java
+6
-1
FileConcoursTest.java
src/test/java/imt/concours/FileConcoursTest.java
+12
-3
No files found.
src/main/java/imt/Concours.java
→
src/main/java/imt/
concours/
Concours.java
View file @
fa03581c
package
imt
;
package
imt
.
concours
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Optional
;
import
java.util.Optional
;
import
java.util.Set
;
import
java.util.Set
;
import
imt.personnes.Jury
;
import
lombok.Data
;
import
lombok.Data
;
@Data
@Data
...
...
src/main/java/imt/FileConcours.java
→
src/main/java/imt/
concours/
FileConcours.java
View file @
fa03581c
package
imt
;
package
imt
.
concours
;
import
java.util.LinkedList
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Queue
;
import
java.util.Queue
;
import
java.util.stream.Stream
;
import
java.util.stream.Stream
;
import
imt.personnes.Chef
;
public
class
FileConcours
{
public
class
FileConcours
{
private
final
Queue
<
Concours
>
concours
;
private
final
Queue
<
Concours
>
concours
;
...
...
src/main/java/imt/Proposition.java
→
src/main/java/imt/
concours/
Proposition.java
View file @
fa03581c
package
imt
;
package
imt
.
concours
;
import
java.util.Optional
;
import
java.util.Optional
;
import
imt.ingredients.Plat
;
import
imt.personnes.Chef
;
import
lombok.Data
;
import
lombok.Data
;
@Data
@Data
...
...
src/main/java/imt/Plat.java
→
src/main/java/imt/
ingredients/
Plat.java
View file @
fa03581c
package
imt
;
package
imt
.
ingredients
;
import
imt.ingredients.Consigne
;
import
imt.ingredients.Ingredient
;
import
imt.ingredients.Legume
;
import
imt.ingredients.ViandePoisson
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
@EqualsAndHashCode
@EqualsAndHashCode
...
...
src/main/java/imt/Chef.java
→
src/main/java/imt/
personnes/
Chef.java
View file @
fa03581c
package
imt
;
package
imt
.
personnes
;
import
java.util.Set
;
import
java.util.Set
;
import
imt.ingredients.Plat
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
lombok.ToString
;
import
lombok.ToString
;
...
...
src/main/java/imt/Genre.java
→
src/main/java/imt/
personnes/
Genre.java
View file @
fa03581c
package
imt
;
package
imt
.
personnes
;
public
enum
Genre
{
public
enum
Genre
{
HOMME
,
FEMME
HOMME
,
FEMME
...
...
src/main/java/imt/Jury.java
→
src/main/java/imt/
personnes/
Jury.java
View file @
fa03581c
package
imt
;
package
imt
.
personnes
;
public
class
Jury
extends
Person
{
public
class
Jury
extends
Person
{
...
...
src/main/java/imt/Padawan.java
→
src/main/java/imt/
personnes/
Padawan.java
View file @
fa03581c
package
imt
;
package
imt
.
personnes
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
...
...
src/main/java/imt/Person.java
→
src/main/java/imt/
personnes/
Person.java
View file @
fa03581c
package
imt
;
package
imt
.
personnes
;
import
lombok.Data
;
import
lombok.Data
;
...
...
src/main/java/imt/Specialite.java
→
src/main/java/imt/
personnes/
Specialite.java
View file @
fa03581c
package
imt
;
package
imt
.
personnes
;
public
enum
Specialite
{
public
enum
Specialite
{
CUISINIER
,
PATISSIER
,
TRAVAIL_A_DISTANCE
CUISINIER
,
PATISSIER
,
TRAVAIL_A_DISTANCE
...
...
src/test/java/imt/ConcoursTest.java
→
src/test/java/imt/
concours/
ConcoursTest.java
View file @
fa03581c
package
imt
;
package
imt
.
concours
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertEquals
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertEquals
;
...
@@ -12,6 +12,11 @@ import java.util.Set;
...
@@ -12,6 +12,11 @@ import java.util.Set;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
imt.ingredients.Ingredient
;
import
imt.ingredients.Ingredient
;
import
imt.ingredients.Plat
;
import
imt.personnes.Chef
;
import
imt.personnes.Genre
;
import
imt.personnes.Jury
;
import
imt.personnes.Specialite
;
public
class
ConcoursTest
{
public
class
ConcoursTest
{
public
static
Jury
jury1
=
new
Jury
(
1
,
"nom1"
,
"prenom1"
,
"06"
,
Genre
.
HOMME
);
public
static
Jury
jury1
=
new
Jury
(
1
,
"nom1"
,
"prenom1"
,
"06"
,
Genre
.
HOMME
);
...
...
src/test/java/imt/FileConcoursTest.java
→
src/test/java/imt/
concours/
FileConcoursTest.java
View file @
fa03581c
package
imt
;
package
imt
.
concours
;
import
static
imt
.
ConcoursTest
.*;
import
static
imt
.
concours
.
ConcoursTest
.
chef1
;
import
static
imt
.
concours
.
ConcoursTest
.
jury1
;
import
static
imt
.
concours
.
ConcoursTest
.
jury2
;
import
static
imt
.
concours
.
ConcoursTest
.
jury3
;
import
static
imt
.
concours
.
ConcoursTest
.
proposition1
;
import
static
imt
.
concours
.
ConcoursTest
.
propositions
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
java.util.HashSet
;
import
java.util.HashSet
;
...
@@ -10,6 +15,10 @@ import java.util.Set;
...
@@ -10,6 +15,10 @@ import java.util.Set;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
imt.ingredients.Ingredient
;
import
imt.ingredients.Ingredient
;
import
imt.ingredients.Plat
;
import
imt.personnes.Chef
;
import
imt.personnes.Genre
;
import
imt.personnes.Specialite
;
public
class
FileConcoursTest
{
public
class
FileConcoursTest
{
@Test
@Test
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment