From 66a78013a3420f6b8d2205466658afe79ba70cd4 Mon Sep 17 00:00:00 2001
From: Jens Schauder <jschauder@vmware.com>
Date: Fri, 29 Jan 2021 10:41:19 +0100
Subject: [PATCH] Polishing

Adding `@author` tags to modified files.
Remove Hamcrest usage.

Original pull request #602
Related tickest #583
---
 .../java/example/users/AbstractIntegrationTests.java  |  1 +
 .../example/users/UserManagementIntegrationTests.java |  9 +++++----
 .../example/users/UserRepositoryIntegrationTests.java |  1 +
 .../java/example/users/UserControllerClientTests.java | 11 ++++++-----
 .../example/users/UserControllerIntegrationTests.java |  1 +
 .../src/test/java/example/users/ApplicationTests.java |  1 +
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/web/example/src/test/java/example/users/AbstractIntegrationTests.java b/web/example/src/test/java/example/users/AbstractIntegrationTests.java
index cd9a7f24..8eb8efa2 100644
--- a/web/example/src/test/java/example/users/AbstractIntegrationTests.java
+++ b/web/example/src/test/java/example/users/AbstractIntegrationTests.java
@@ -23,6 +23,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
  * Integration tests to bootstrap the application.
  *
  * @author Oliver Gierke
+ * @author Divya Srivastava
  */
 @ExtendWith(SpringExtension.class)
 @SpringBootTest
diff --git a/web/example/src/test/java/example/users/UserManagementIntegrationTests.java b/web/example/src/test/java/example/users/UserManagementIntegrationTests.java
index e72a1591..c8ea0136 100644
--- a/web/example/src/test/java/example/users/UserManagementIntegrationTests.java
+++ b/web/example/src/test/java/example/users/UserManagementIntegrationTests.java
@@ -15,16 +15,17 @@
  */
 package example.users;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.MatcherAssert.*;
-
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import static org.assertj.core.api.Assertions.*;
+
 /**
  * Integration tests for {@link UserManagement}.
  *
  * @author Oliver Gierke
+ * @author Divya Srivastava
+ * @author Jens Schauder
  */
 public class UserManagementIntegrationTests extends AbstractIntegrationTests {
 
@@ -38,6 +39,6 @@ public class UserManagementIntegrationTests extends AbstractIntegrationTests {
 
 		User user = userManagement.register(new Username("olivergierke"), Password.raw("foobar"));
 
-		assertThat(user.getPassword().isEncrypted(), is(true));
+		assertThat(user.getPassword().isEncrypted()).isTrue();
 	}
 }
diff --git a/web/example/src/test/java/example/users/UserRepositoryIntegrationTests.java b/web/example/src/test/java/example/users/UserRepositoryIntegrationTests.java
index 447d380e..adad9095 100644
--- a/web/example/src/test/java/example/users/UserRepositoryIntegrationTests.java
+++ b/web/example/src/test/java/example/users/UserRepositoryIntegrationTests.java
@@ -24,6 +24,7 @@ import org.springframework.dao.InvalidDataAccessApiUsageException;
  * Integration tests for {@link UserRepository}.
  *
  * @author Oliver Gierke
+ * @author Divya Srivastava
  */
 public class UserRepositoryIntegrationTests extends AbstractIntegrationTests {
 
diff --git a/web/projection/src/test/java/example/users/UserControllerClientTests.java b/web/projection/src/test/java/example/users/UserControllerClientTests.java
index d54d6dda..6b7d14fd 100644
--- a/web/projection/src/test/java/example/users/UserControllerClientTests.java
+++ b/web/projection/src/test/java/example/users/UserControllerClientTests.java
@@ -15,9 +15,6 @@
  */
 package example.users;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.MatcherAssert.*;
-
 import example.users.UserController.UserPayload;
 
 import org.junit.jupiter.api.Test;
@@ -39,11 +36,15 @@ import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+import static org.assertj.core.api.Assertions.*;
+
 /**
  * Integration tests for {@link UserController} to demonstrate client-side resilience of the payload type against
  * changes in the representation.
  *
  * @author Oliver Gierke
+ * @author Divya Srivastava
+ * @author Jens Schauder
  */
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@@ -99,7 +100,7 @@ public class UserControllerClientTests {
 
 	private static void assertDave(UserPayload payload) {
 
-		assertThat(payload.getFirstname(), is("Dave"));
-		assertThat(payload.getLastname(), is("Matthews"));
+		assertThat(payload.getFirstname()).isEqualTo("Dave");
+		assertThat(payload.getLastname()).isEqualTo("Matthews");
 	}
 }
diff --git a/web/projection/src/test/java/example/users/UserControllerIntegrationTests.java b/web/projection/src/test/java/example/users/UserControllerIntegrationTests.java
index edea5f93..797dff70 100644
--- a/web/projection/src/test/java/example/users/UserControllerIntegrationTests.java
+++ b/web/projection/src/test/java/example/users/UserControllerIntegrationTests.java
@@ -34,6 +34,7 @@ import org.springframework.test.web.servlet.ResultActions;
  * Integration tests for {@link UserController}.
  *
  * @author Oliver Gierke
+ * @author Divya Srivastava
  */
 @ExtendWith(SpringExtension.class)
 @SpringBootTest
diff --git a/web/querydsl/src/test/java/example/users/ApplicationTests.java b/web/querydsl/src/test/java/example/users/ApplicationTests.java
index 7946e270..6ed45f42 100644
--- a/web/querydsl/src/test/java/example/users/ApplicationTests.java
+++ b/web/querydsl/src/test/java/example/users/ApplicationTests.java
@@ -23,6 +23,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * @author Oliver Gierke
+ * @author Divya Srivastava
  */
 @ExtendWith(SpringExtension.class)
 @SpringBootTest