Skip to content

Commit ec2783f

Browse files
BenRombergBenRomberg
committed
fix test time precision vs database precision
1 parent c4b41fd commit ec2783f

File tree

4 files changed

+34
-31
lines changed

4 files changed

+34
-31
lines changed

‎cordonbleu-data/src/test/java/com/benromberg/cordonbleu/data/dao/CommitDaoTest.java

+22-21
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,36 @@
11
package com.benromberg.cordonbleu.data.dao;
22

3-
import static java.util.Arrays.asList;
4-
import static org.assertj.core.api.Assertions.assertThat;
5-
import static org.assertj.core.api.Assertions.tuple;
3+
import com.benromberg.cordonbleu.data.model.CodeRepositoryMetadata;
4+
import com.benromberg.cordonbleu.data.model.Comment;
65
import com.benromberg.cordonbleu.data.model.CommentFixture;
6+
import com.benromberg.cordonbleu.data.model.Commit;
7+
import com.benromberg.cordonbleu.data.model.CommitApproval;
8+
import com.benromberg.cordonbleu.data.model.CommitAuthor;
79
import com.benromberg.cordonbleu.data.model.CommitFixture;
10+
import com.benromberg.cordonbleu.data.model.CommitId;
11+
import com.benromberg.cordonbleu.data.model.CommitRepository;
12+
import com.benromberg.cordonbleu.data.model.Team;
13+
import com.benromberg.cordonbleu.data.model.User;
814
import com.benromberg.cordonbleu.util.SystemTimeRule;
15+
import com.mongodb.DBObject;
16+
17+
import org.junit.Before;
18+
import org.junit.Ignore;
19+
import org.junit.Rule;
20+
import org.junit.Test;
21+
import org.junit.rules.ExpectedException;
922

1023
import java.time.LocalDateTime;
24+
import java.time.temporal.ChronoUnit;
1125
import java.util.Collections;
1226
import java.util.Date;
1327
import java.util.List;
1428
import java.util.NoSuchElementException;
1529
import java.util.Optional;
1630

17-
import org.junit.Before;
18-
import org.junit.Ignore;
19-
import org.junit.Rule;
20-
import org.junit.Test;
21-
import org.junit.rules.ExpectedException;
22-
23-
import com.benromberg.cordonbleu.data.model.CodeRepositoryMetadata;
24-
import com.benromberg.cordonbleu.data.model.Comment;
25-
import com.benromberg.cordonbleu.data.model.Commit;
26-
import com.benromberg.cordonbleu.data.model.CommitApproval;
27-
import com.benromberg.cordonbleu.data.model.CommitAuthor;
28-
import com.benromberg.cordonbleu.data.model.CommitId;
29-
import com.benromberg.cordonbleu.data.model.CommitRepository;
30-
import com.benromberg.cordonbleu.data.model.Team;
31-
import com.benromberg.cordonbleu.data.model.User;
32-
import com.mongodb.DBObject;
31+
import static java.util.Arrays.asList;
32+
import static org.assertj.core.api.Assertions.assertThat;
33+
import static org.assertj.core.api.Assertions.tuple;
3334

3435
public class CommitDaoTest implements CommitFixture, CommentFixture {
3536
private static final Team OTHER_TEAM = new TeamBuilder().name("other-team").build();
@@ -40,8 +41,8 @@ public class CommitDaoTest implements CommitFixture, CommentFixture {
4041
private static final String FIRST_AUTHOR_NAME = "aaaauthor";
4142
private static final String UPPERCASE_AUTHOR = "Uppercase Author";
4243
private static final String OTHER_TEXT = "other text";
43-
private static final LocalDateTime COMMIT_APPROVAL_TIME = LocalDateTime.now();
44-
private static final LocalDateTime COMMIT_CREATION_TIME = LocalDateTime.now();
44+
private static final LocalDateTime COMMIT_APPROVAL_TIME = LocalDateTime.now().truncatedTo(ChronoUnit.MILLIS);
45+
private static final LocalDateTime COMMIT_CREATION_TIME = LocalDateTime.now().truncatedTo(ChronoUnit.MILLIS);
4546
private static final String OTHER_COMMIT_HASH = "other commit hash";
4647
private static final List<String> OTHER_COMMIT_BRANCHES = asList("other commit branch");
4748
private static final CodeRepositoryMetadata OTHER_REPOSITORY = new RepositoryBuilder().name(OTHER_REPOSITORY_NAME)

‎cordonbleu-data/src/test/java/com/benromberg/cordonbleu/data/dao/UserSessionDaoTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.benromberg.cordonbleu.data.dao;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
3+
import com.benromberg.cordonbleu.data.model.User;
4+
import com.benromberg.cordonbleu.data.model.UserSession;
45
import com.benromberg.cordonbleu.util.SystemTimeRule;
56

67
import org.junit.Rule;
78
import org.junit.Test;
89

9-
import com.benromberg.cordonbleu.data.dao.UserDao;
10-
import com.benromberg.cordonbleu.data.dao.UserSessionDao;
11-
import com.benromberg.cordonbleu.data.model.User;
12-
import com.benromberg.cordonbleu.data.model.UserSession;
10+
import java.time.temporal.ChronoUnit;
11+
12+
import static org.assertj.core.api.Assertions.assertThat;
1313

1414
public class UserSessionDaoTest {
1515
private static final String SESSION_ID = "session id";
@@ -32,6 +32,6 @@ public void insertedUser_CanBeFoundByEmail() throws Exception {
3232
dao.insert(new UserSession(SESSION_ID, user));
3333
UserSession foundSession = dao.findById(SESSION_ID).get();
3434
assertThat(foundSession.getUser()).isEqualTo(user);
35-
assertThat(foundSession.getCreated()).isEqualTo(systemTimeRule.getDateTime());
35+
assertThat(foundSession.getCreated()).isEqualTo(systemTimeRule.getDateTime().truncatedTo(ChronoUnit.MILLIS));
3636
}
3737
}

‎cordonbleu-data/src/test/java/com/benromberg/cordonbleu/data/model/CommitFixture.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
package com.benromberg.cordonbleu.data.model;
22

3-
import static java.util.Arrays.asList;
43
import com.benromberg.cordonbleu.util.ClockService;
54

6-
import java.time.Instant;
75
import java.time.LocalDateTime;
6+
import java.time.temporal.ChronoUnit;
87
import java.util.List;
98
import java.util.Optional;
109

10+
import static java.util.Arrays.asList;
11+
1112
public interface CommitFixture extends RepositoryFixture {
1213
String COMMIT_HASH = "commit-hash";
1314
CommitId COMMIT_ID = new CommitId(COMMIT_HASH, TEAM);
1415
String COMMIT_AUTHOR_EMAIL = "[email protected]";
1516
String COMMIT_AUTHOR_NAME = "author-name";
16-
LocalDateTime COMMIT_CREATED = ClockService.now();
17+
LocalDateTime COMMIT_CREATED = ClockService.now().truncatedTo(ChronoUnit.MILLIS);
1718
String COMMIT_MESSAGE = "commit message";
1819
String COMMIT_BRANCH = "commit-branch";
1920
List<String> COMMIT_BRANCHES = asList(COMMIT_BRANCH);

‎cordonbleu-service/src/test/java/com/benromberg/cordonbleu/service/commit/CommitServiceTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.junit.Test;
2121

2222
import java.time.LocalDateTime;
23+
import java.time.temporal.ChronoUnit;
2324
import java.util.Arrays;
2425
import java.util.Collections;
2526
import java.util.List;
@@ -213,6 +214,6 @@ private void findAndAssertNotifications(User notificationUser, boolean prompt,
213214
assertThat(notification.isPrompt()).isEqualTo(prompt);
214215
assertThat(notification.getLastAction().getType()).isEqualTo(lastActionType);
215216
assertThat(notification.getLastAction().getUser().getEmail()).isEqualTo(lastActionUser.getEmail());
216-
assertThat(notification.getLastAction().getTime()).isEqualTo(systemTimeRule.getDateTime());
217+
assertThat(notification.getLastAction().getTime()).isEqualTo(systemTimeRule.getDateTime().truncatedTo(ChronoUnit.MILLIS));
217218
}
218219
}

0 commit comments

Comments
 (0)