Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Team 14 - IDATT1002
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eirik Steira
Team 14 - IDATT1002
Commits
b8919922
Commit
b8919922
authored
5 years ago
by
Mads Lundegaard
Committed by
Lars Brodin Østby
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Added test
parent
cba048bd
No related branches found
No related tags found
1 merge request
!165
Weekly merge to Master
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/NTNU/IDATT1002/service/ImageService.java
+3
-0
3 additions, 0 deletions
src/main/java/NTNU/IDATT1002/service/ImageService.java
src/test/java/NTNU/IDATT1002/service/ImageServiceTest.java
+126
-0
126 additions, 0 deletions
src/test/java/NTNU/IDATT1002/service/ImageServiceTest.java
with
129 additions
and
0 deletions
src/main/java/NTNU/IDATT1002/service/ImageService.java
+
3
−
0
View file @
b8919922
...
...
@@ -45,6 +45,9 @@ public class ImageService {
GeoLocation
geoLocation
=
metaDataExtractor
.
getGeoLocation
(
file
);
if
(
file
==
null
)
return
Optional
.
empty
();
Image
image
=
new
Image
();
Metadata
metadata
=
new
Metadata
();
metadata
.
setImage
(
image
);
...
...
This diff is collapsed.
Click to expand it.
src/test/java/NTNU/IDATT1002/service/ImageServiceTest.java
0 → 100644
+
126
−
0
View file @
b8919922
package
NTNU.IDATT1002.service
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.*;
import
NTNU.IDATT1002.models.Image
;
import
NTNU.IDATT1002.models.Tag
;
import
NTNU.IDATT1002.models.User
;
import
java.io.File
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Optional
;
import
javax.persistence.EntityManager
;
import
javax.persistence.EntityManagerFactory
;
import
javax.persistence.Persistence
;
import
org.junit.jupiter.api.BeforeEach
;
import
org.junit.jupiter.api.Test
;
/**
* Test for {@link ImageService}
*
* @author madslun
* @version 1.0 06.04.20
*/
class
ImageServiceTest
{
private
UserService
userService
;
private
final
String
EMAIL
=
"test@test.no"
;
private
final
String
USERNAME
=
"Test_Username"
;
private
final
String
USERNAME2
=
"Test_Username2"
;
private
final
String
FIRST_NAME
=
"Test_First_Name"
;
private
final
String
LAST_NAME
=
"Test_Last_Name"
;
private
final
String
CALLING_CODE
=
"Test_Calling_Code"
;
private
final
String
PHONE_NUMBER
=
"Test_Phone_Number"
;
private
final
Date
DATE
=
new
Date
(
System
.
currentTimeMillis
());
private
final
String
PASSWORD
=
"Test123"
;
private
File
testImage1
;
private
File
testImage2
;
private
User
user
;
private
User
user2
;
private
List
<
Tag
>
tags
;
private
Tag
tag
;
private
static
final
Long
IMAGE_INITIAL_ID
=
1L
;
private
ImageService
imageService
;
/**
* Sets up necessary data for testing
* To be able to save a image a user has to be saved first, therefore i also include UserService
* This test unfortunately relies on UserService because of this
*/
@BeforeEach
void
setUp
()
{
testImage1
=
new
File
(
"src/test/resources/Images/plsWork.jpg"
);
testImage2
=
new
File
(
"src/test/java/tmp/test_image_2.jpg"
);
tags
=
new
ArrayList
<>();
tag
=
new
Tag
(
"Test"
);
tags
.
add
(
tag
);
EntityManagerFactory
entityManagerFactory
=
Persistence
.
createEntityManagerFactory
(
"ImageApplicationTest"
);
EntityManager
entityManager
=
entityManagerFactory
.
createEntityManager
();
imageService
=
new
ImageService
(
entityManager
);
userService
=
new
UserService
(
entityManager
);
user
=
userService
.
createUser
(
EMAIL
,
USERNAME
,
FIRST_NAME
,
LAST_NAME
,
CALLING_CODE
,
PHONE_NUMBER
,
DATE
,
PASSWORD
).
get
();
user2
=
userService
.
createUser
(
EMAIL
,
USERNAME2
,
FIRST_NAME
,
LAST_NAME
,
CALLING_CODE
,
PHONE_NUMBER
,
DATE
,
PASSWORD
).
get
();
}
/**
* Tests that you can create a image with valid input
*/
@Test
void
testCreateImageReturnsOptionalWithImage
()
{
Optional
<
Image
>
createdImage
=
imageService
.
createImage
(
user
,
testImage1
,
tags
);
assertTrue
(
createdImage
.
isPresent
());
assertEquals
(
IMAGE_INITIAL_ID
,
createdImage
.
get
().
getId
());
}
/**
* Test that you cannot create a image when the file is null
*/
@Test
void
testCreateImageReturnsEmptyOptionalWithInvalidEntity
()
{
Optional
<
Image
>
createdImage
;
createdImage
=
imageService
.
createImage
(
user
,
null
,
tags
);
assertTrue
(
createdImage
.
isEmpty
());
}
/**
* Test that all images from a user it returned as a list
*/
@Test
void
testGetImageFromUserReturnsCorrectImages
()
{
imageService
.
createImage
(
user
,
testImage1
,
tags
);
imageService
.
createImage
(
user
,
testImage1
,
tags
);
List
<
Image
>
foundImages
=
imageService
.
getImageFromUser
(
user
);
assertEquals
(
2
,
foundImages
.
size
());
assertEquals
(
IMAGE_INITIAL_ID
,
foundImages
.
get
(
0
).
getId
());
}
/**
* Test that makes sure only one image is returned when two different users saves an image
*/
@Test
void
testGetImageFromUserOnlyReturnsOneInstance
()
{
imageService
.
createImage
(
user
,
testImage1
,
tags
);
imageService
.
createImage
(
user2
,
testImage2
,
tags
);
List
<
Image
>
foundImages
=
imageService
.
getImageFromUser
(
user
);
assertEquals
(
1
,
foundImages
.
size
());
assertEquals
(
IMAGE_INITIAL_ID
,
foundImages
.
get
(
0
).
getId
());
}
/**
* Test that all images ever created is returned
*/
@Test
void
testGetAllImagesReturnsAllImages
()
{
imageService
.
createImage
(
user
,
testImage1
,
tags
);
imageService
.
createImage
(
user2
,
testImage2
,
tags
);
List
<
Image
>
foundImages
=
imageService
.
getAllImages
();
assertEquals
(
2
,
foundImages
.
size
());
}
}
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