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
9dde11cd
There was a problem fetching the pipeline summary.
Commit
9dde11cd
authored
Jan 10, 2018
by
Ivan Gonzalez
Browse files
Options
Downloads
Patches
Plain Diff
Se ha terminado la implementación de la clase persona
parent
1ab988f8
No related branches found
No related tags found
2 merge requests
!3
Develop
,
!1
Persona
Pipeline
#
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/inf/uva/es/ivagonz/practica4/Persona.java
+17
-4
17 additions, 4 deletions
src/main/java/inf/uva/es/ivagonz/practica4/Persona.java
src/test/java/inf/uva/es/ivagonz/practica4/PersonaOperacionesTDDTest.java
+0
-3
0 additions, 3 deletions
...f/uva/es/ivagonz/practica4/PersonaOperacionesTDDTest.java
with
17 additions
and
7 deletions
src/main/java/inf/uva/es/ivagonz/practica4/Persona.java
+
17
−
4
View file @
9dde11cd
...
@@ -131,7 +131,14 @@ public class Persona {
...
@@ -131,7 +131,14 @@ public class Persona {
* parámetro.
* parámetro.
*/
*/
public
void
addAmigo
(
Persona
persona
)
{
public
void
addAmigo
(
Persona
persona
)
{
// TODO Auto-generated method stub
if
(
persona
==
null
)
throw
new
IllegalArgumentException
(
"La Persona no puede ser null."
);
if
(!
isConocido
(
persona
))
throw
new
IllegalArgumentException
(
"La Persona debe ser un conocido."
);
if
(
isAmigo
(
persona
))
throw
new
IllegalArgumentException
(
"La Persona no puede ser ya un amigo."
);
getAmigos
().
add
(
persona
);
getConocidos
().
remove
(
persona
);
}
}
...
@@ -147,8 +154,9 @@ public class Persona {
...
@@ -147,8 +154,9 @@ public class Persona {
* parámetro.
* parámetro.
*/
*/
public
boolean
isAmigo
(
Persona
persona
)
{
public
boolean
isAmigo
(
Persona
persona
)
{
// TODO Auto-generated method stub
if
(
persona
==
null
)
return
false
;
throw
new
IllegalArgumentException
(
"La Persona no puede ser null."
);
return
getAmigos
().
contains
(
persona
);
}
}
/**
/**
...
@@ -162,7 +170,12 @@ public class Persona {
...
@@ -162,7 +170,12 @@ public class Persona {
* parámetro.
* parámetro.
*/
*/
public
void
removeAmigo
(
Persona
persona
)
{
public
void
removeAmigo
(
Persona
persona
)
{
// TODO Auto-generated method stub
if
(
persona
==
null
)
throw
new
IllegalArgumentException
(
"La persona no puede ser null."
);
if
(!
isAmigo
(
persona
))
throw
new
IllegalArgumentException
(
"La persona debe ser un amigos."
);
getAmigos
().
remove
(
persona
);
getConocidos
().
add
(
persona
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/test/java/inf/uva/es/ivagonz/practica4/PersonaOperacionesTDDTest.java
+
0
−
3
View file @
9dde11cd
...
@@ -78,7 +78,6 @@ public class PersonaOperacionesTDDTest {
...
@@ -78,7 +78,6 @@ public class PersonaOperacionesTDDTest {
@Test
@Test
public
void
addAmigoCorrectoTest
()
{
public
void
addAmigoCorrectoTest
()
{
fail
(
"Quitar en implementación"
);
Persona
p2
=
new
Persona
(
"Manu"
,
2
,
amigos
,
conocidos
);
Persona
p2
=
new
Persona
(
"Manu"
,
2
,
amigos
,
conocidos
);
Persona
p
=
new
Persona
(
nombre
,
id
,
amigos
,
conocidos
);
Persona
p
=
new
Persona
(
nombre
,
id
,
amigos
,
conocidos
);
p
.
addConocido
(
p2
);
p
.
addConocido
(
p2
);
...
@@ -111,7 +110,6 @@ public class PersonaOperacionesTDDTest {
...
@@ -111,7 +110,6 @@ public class PersonaOperacionesTDDTest {
@Test
@Test
public
void
isAmigoCorrectoTest
()
{
public
void
isAmigoCorrectoTest
()
{
fail
(
"Quitar en implementación"
);
Persona
p2
=
new
Persona
(
"Manu"
,
2
,
amigos
,
conocidos
);
Persona
p2
=
new
Persona
(
"Manu"
,
2
,
amigos
,
conocidos
);
Persona
p
=
new
Persona
(
nombre
,
id
,
amigos
,
conocidos
);
Persona
p
=
new
Persona
(
nombre
,
id
,
amigos
,
conocidos
);
p
.
addConocido
(
p2
);
p
.
addConocido
(
p2
);
...
@@ -128,7 +126,6 @@ public class PersonaOperacionesTDDTest {
...
@@ -128,7 +126,6 @@ public class PersonaOperacionesTDDTest {
@Test
@Test
public
void
removeAmigoCorrectoTest
()
{
public
void
removeAmigoCorrectoTest
()
{
fail
(
"Quitar en implementación"
);
Persona
p2
=
new
Persona
(
"Manu"
,
2
,
amigos
,
conocidos
);
Persona
p2
=
new
Persona
(
"Manu"
,
2
,
amigos
,
conocidos
);
Persona
p
=
new
Persona
(
nombre
,
id
,
amigos
,
conocidos
);
Persona
p
=
new
Persona
(
nombre
,
id
,
amigos
,
conocidos
);
p
.
addConocido
(
p2
);
p
.
addConocido
(
p2
);
...
...
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
register
or
sign in
to comment