Merge branch 'master' into selenium (4681b9d1) · Commits · ARSnova / ARSnova Backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ARSnova Backend
- Activity
- Members
- Labels
- Releases
- Environments
- Incidents

Snippets Groups Projects

4681b9d1

Commit 4681b9d1 authored 12 years ago by

Christoph Thelen

Downloads
- Plain Diff

Merge branch 'master' into selenium

parents c5e404e6 38532557

Branches

Tags

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

ARSnova-checkstyle-checker.xml 4 additions, 4 deletions

ARSnova-checkstyle-checker.xml
src/main/java/de/thm/arsnova/services/SessionService.java 15 additions, 20 deletions

src/main/java/de/thm/arsnova/services/SessionService.java
src/main/java/de/thm/arsnova/services/UserService.java 7 additions, 7 deletions

src/main/java/de/thm/arsnova/services/UserService.java
src/site/site.xml 1 addition, 0 deletions

src/site/site.xml
src/test/java/de/thm/arsnova/controller/StatisticsControllerTest.java 2 additions, 2 deletions

...a/de/thm/arsnova/controller/StatisticsControllerTest.java
src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java 5 additions, 5 deletions

src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java 19 additions, 2 deletions

...t/java/de/thm/arsnova/services/StatisticsServiceTest.java
src/test/java/de/thm/arsnova/services/StubUserService.java 2 additions, 0 deletions

src/test/java/de/thm/arsnova/services/StubUserService.java

with 55 additions and 40 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment