Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GalaxyTrucker
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Leonard Haddad
GalaxyTrucker
Commits
5d5aa17d
Commit
5d5aa17d
authored
4 years ago
by
Leonard
Browse files
Options
Downloads
Patches
Plain Diff
fixed gradle, added junit 4
parent
64f7ba2c
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build.gradle
+8
-6
8 additions, 6 deletions
build.gradle
core/src/com/galaxytrucker/galaxytruckerreloaded/Test/Server/Persistence/CrewDAOTest.java
+4
-4
4 additions, 4 deletions
...ytruckerreloaded/Test/Server/Persistence/CrewDAOTest.java
with
12 additions
and
10 deletions
build.gradle
+
8
−
6
View file @
5d5aa17d
buildscript
{
repositories
{
mavenLocal
()
...
...
@@ -10,11 +9,11 @@ buildscript {
google
()
}
dependencies
{
}
}
allprojects
{
apply
plugin:
"eclipse"
...
...
@@ -69,12 +68,14 @@ project(":desktop") {
project
(
":core"
)
{
apply
plugin:
"java-library"
java
{
sourceCompatibility
=
JavaVersion
.
VERSION_1_8
targetCompatibility
=
JavaVersion
.
VERSION_1_8
}
repositories
{
jcenter
()
}
dependencies
{
api
"com.badlogicgames.gdx:gdx:$gdxVersion"
...
...
@@ -104,12 +105,13 @@ project(":core") {
// https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
testCompile
group:
'org.mockito'
,
name:
'mockito-junit-jupiter'
,
version:
'3.3.3'
// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
testCompile
group:
'org.junit.jupiter'
,
name:
'junit-jupiter-engine'
,
version:
'5.7.0-M1'
// ormlite
compile
group:
'com.j256.ormlite'
,
name:
'ormlite-jdbc'
,
version:
'4.48'
compile
'com.j256.ormlite:ormlite-android:4.48'
compile
'com.j256.ormlite:ormlite-core:4.48'
testCompile
'junit:junit:4.12'
compile
'junit:junit:4.12'
}
}
This diff is collapsed.
Click to expand it.
core/src/com/galaxytrucker/galaxytruckerreloaded/Test/Server/Persistence/CrewDAOTest.java
+
4
−
4
View file @
5d5aa17d
...
...
@@ -5,8 +5,8 @@ import com.galaxytrucker.galaxytruckerreloaded.Model.Crew.Crew;
import
com.galaxytrucker.galaxytruckerreloaded.Server.Database.Database
;
import
com.galaxytrucker.galaxytruckerreloaded.Server.Persistence.CrewDAO
;
import
org.junit.
jupiter.api.
Assert
ions
;
import
org.junit.
jupiter.api.
Test
;
import
org.junit.Assert
;
import
org.junit.Test
;
import
javax.persistence.EntityManager
;
import
java.util.UUID
;
...
...
@@ -39,7 +39,7 @@ public class CrewDAOTest {
entityManager
.
getTransaction
().
begin
();
Crew
c2
=
entityManager
.
find
(
Crew
.
class
,
c
.
getId
());
entityManager
.
getTransaction
().
commit
();
Assert
ions
.
assertEquals
(
c2
.
getName
(),
c
.
getName
());
Assert
.
assertEquals
(
c2
.
getName
(),
c
.
getName
());
}
/**
...
...
@@ -62,7 +62,7 @@ public class CrewDAOTest {
entityManager
.
getTransaction
().
begin
();
Crew
c2
=
entityManager
.
find
(
Crew
.
class
,
c
.
getId
());
entityManager
.
getTransaction
().
commit
();
Assert
ions
.
assertEquals
(
c2
.
getName
(),
c
.
getName
());
Assert
.
assertEquals
(
c2
.
getName
(),
c
.
getName
());
}
/**
...
...
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