Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 2adf8d91 authored by Sébastian Le Merdy's avatar Sébastian Le Merdy
Browse files

remove joda time dependency

parent 4927e260
No related branches found
No related tags found
No related merge requests found
...@@ -66,11 +66,6 @@ ...@@ -66,11 +66,6 @@
<artifactId>jackson-jaxrs-json-provider</artifactId> <artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.7.4</version> <version>2.7.4</version>
</dependency> </dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.9.4</version>
</dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
......
package elevator.server; package elevator.server;
import elevator.user.User; import elevator.user.User;
import org.joda.time.DateTime;
import org.joda.time.Duration; import java.time.Duration;
import java.time.LocalDateTime;
import static java.lang.Math.*; import static java.lang.Math.*;
import static java.time.LocalDateTime.now;
class Score { class Score {
Integer score; Integer score;
DateTime started = new DateTime(); LocalDateTime started = now();
Score() { Score() {
this(0); this(0);
...@@ -68,12 +70,11 @@ class Score { ...@@ -68,12 +70,11 @@ class Score {
} }
int getAverageScore() { int getAverageScore() {
DateTime now = new DateTime(); return getAverageScore(now());
return getAverageScore(now);
} }
protected int getAverageScore(DateTime now) { int getAverageScore(LocalDateTime now) {
long elapsed = (int) new Duration(started, now).getStandardSeconds(); long elapsed = Duration.between(started, now).getSeconds();
return (int) (score * (15f * 60 / elapsed)); return (int) (score * (15f * 60 / elapsed));
} }
......
package elevator.server; package elevator.server;
import elevator.user.User; import elevator.user.User;
import org.joda.time.DateTime;
import org.junit.Test; import org.junit.Test;
import java.time.LocalDateTime;
import static java.lang.String.format; import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
...@@ -96,9 +97,9 @@ public class ScoreTest { ...@@ -96,9 +97,9 @@ public class ScoreTest {
public void should_compute_average_score() { public void should_compute_average_score() {
Score score = new Score(); Score score = new Score();
score.score = 100; score.score = 100;
score.started = new DateTime(2013, 9, 28, 9, 0); score.started = LocalDateTime.of(2013, 9, 28, 9, 0);
Integer averageScore = score.getAverageScore(new DateTime(2013, 9, 28, 9, 1)); Integer averageScore = score.getAverageScore(LocalDateTime.of(2013, 9, 28, 9, 1));
assertThat(averageScore).isEqualTo(1500); assertThat(averageScore).isEqualTo(1500);
} }
...@@ -107,9 +108,9 @@ public class ScoreTest { ...@@ -107,9 +108,9 @@ public class ScoreTest {
public void should_compute_average_score_with_precision() { public void should_compute_average_score_with_precision() {
Score score = new Score(); Score score = new Score();
score.score = 202; score.score = 202;
score.started = new DateTime(2013, 9, 28, 9, 0); score.started = LocalDateTime.of(2013, 9, 28, 9, 0);
Integer averageScore = score.getAverageScore(new DateTime(2013, 9, 28, 9, 2)); Integer averageScore = score.getAverageScore(LocalDateTime.of(2013, 9, 28, 9, 2));
assertThat(averageScore).isEqualTo(1515); assertThat(averageScore).isEqualTo(1515);
} }
...@@ -118,9 +119,9 @@ public class ScoreTest { ...@@ -118,9 +119,9 @@ public class ScoreTest {
public void should_compute_average_score_after_15min() { public void should_compute_average_score_after_15min() {
Score score = new Score(); Score score = new Score();
score.score = 1600; score.score = 1600;
score.started = new DateTime(2013, 9, 28, 9, 0); score.started = LocalDateTime.of(2013, 9, 28, 9, 0);
Integer averageScore = score.getAverageScore(new DateTime(2013, 9, 28, 9, 16)); Integer averageScore = score.getAverageScore(LocalDateTime.of(2013, 9, 28, 9, 16));
assertThat(averageScore).isEqualTo(1500); assertThat(averageScore).isEqualTo(1500);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment