Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
ivagonz-practica4
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ivagonz
ivagonz-practica4
Commits
8dc070ca
There was a problem fetching the pipeline summary.
Commit
8dc070ca
authored
Jan 11, 2018
by
Ivan Gonzalez
Browse files
Options
Downloads
Patches
Plain Diff
Se ha implementado el metodo pedirVez()
parent
a0719df3
Branches
Branches containing commit
No related tags found
2 merge requests
!3
Develop
,
!2
Cola
Pipeline
#
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/inf/uva/es/ivagonz/practica4/ColaDeAmigos.java
+12
-5
12 additions, 5 deletions
src/main/java/inf/uva/es/ivagonz/practica4/ColaDeAmigos.java
src/test/java/inf/uva/es/ivagonz/practica4/ColaDeAmigosTDDTest.java
+1
-1
1 addition, 1 deletion
...ava/inf/uva/es/ivagonz/practica4/ColaDeAmigosTDDTest.java
with
13 additions
and
6 deletions
src/main/java/inf/uva/es/ivagonz/practica4/ColaDeAmigos.java
+
12
−
5
View file @
8dc070ca
...
...
@@ -206,8 +206,8 @@ public class ColaDeAmigos {
*
* @param persona
* Persona que entra en la cola. Debe ser correcta: No null, no
* puede estar ya en la cola y no puede
tener el mismo id que una
*
Persona que esté ya en la cola
.
* puede estar ya en la cola y no puede
haber ya una persona en
*
la cola con su mismo id.
.
* @param maxAmigos
* Cantidad máxima de amigos que puede colar this. Debe ser
* correcto: Positivo y menor de 10.
...
...
@@ -216,8 +216,16 @@ public class ColaDeAmigos {
* los parámetros.
*/
public
void
pedirVez
(
Persona
persona
,
int
maxAmigos
)
{
// TODO Auto-generated method stub
if
(
persona
==
null
)
throw
new
IllegalArgumentException
(
"La persona no puede ser null"
);
if
(
containsPersona
(
persona
.
getId
()))
throw
new
IllegalArgumentException
(
"La persona ya está en la cola o hay alguien con su mismo id."
);
if
(
maxAmigos
<
0
)
throw
new
IllegalArgumentException
(
"maxAmigos debe ser positivo."
);
if
(
maxAmigos
>
10
)
throw
new
IllegalArgumentException
(
"maxAmigos debe ser menor o igual de 10."
);
persona
.
setMaxAmigos
(
maxAmigos
);
getCola
().
add
(
getCola
().
size
(),
persona
);
}
/**
...
...
@@ -234,7 +242,6 @@ public class ColaDeAmigos {
* si se incumple alguna de las condiones puestas al parámetro.
*/
public
void
colarse
(
Persona
persona
)
{
// TODO Auto-generated method stub
}
...
...
This diff is collapsed.
Click to expand it.
src/test/java/inf/uva/es/ivagonz/practica4/ColaDeAmigosTDDTest.java
+
1
−
1
View file @
8dc070ca
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment