Replace ifs with assert in FeignPageableEncodingTests

spring-cloud · Feb 8, 2021 · 86785dc · 86785dc
1 parent 4a08f2f
commit 86785dc
Showing 1 changed file with 25 additions and 18 deletions.
diff --git a/...rc/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java b/...rc/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java
@@ -103,13 +103,17 @@ public void testPageableWithDescDirection() {
 		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(response.getBody()).isNotNull();
 		assertThat(pageable.getPageSize()).isEqualTo(response.getBody().getSize());
-		assertThat(response.getBody().getPageable().getSort()).hasSize(1);
-		Optional<Sort.Order> optionalOrder = response.getBody().getPageable().getSort().get().findFirst();
-		if (optionalOrder.isPresent()) {
-			Sort.Order order = optionalOrder.get();
-			assertThat(order.getDirection()).isEqualTo(Sort.Direction.DESC);
-			assertThat(order.getProperty()).isEqualTo("sortProperty");
-		}
+
+		Sort sort = response.getBody().getPageable().getSort();
+		assertThat(sort).hasSize(1);
+		assertThat(sort.get()).hasSize(1);
+
+		Optional<Sort.Order> optionalOrder = sort.get().findFirst();
+		assertThat(optionalOrder.isPresent()).isTrue();
+
+		Sort.Order order = optionalOrder.get();
+		assertThat(order.getDirection()).isEqualTo(Sort.Direction.DESC);
+		assertThat(order.getProperty()).isEqualTo("sortProperty");
 
 	}
 
@@ -128,17 +132,20 @@ public void testPageableWithMultipleSort() {
 		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(response.getBody()).isNotNull();
 		assertThat(pageable.getPageSize()).isEqualTo(response.getBody().getSize());
-		assertThat(response.getBody().getPageable().getSort()).hasSize(2);
-		List<Sort.Order> orderList = response.getBody().getPageable().getSort().toList();
-		if (!orderList.isEmpty()) {
-			Sort.Order firstOrder = orderList.get(0);
-			assertThat(firstOrder.getDirection()).isEqualTo(Sort.Direction.DESC);
-			assertThat(firstOrder.getProperty()).isEqualTo("sortProperty1");
-
-			Sort.Order secondOrder = orderList.get(1);
-			assertThat(secondOrder.getDirection()).isEqualTo(Sort.Direction.ASC);
-			assertThat(secondOrder.getProperty()).isEqualTo("sortProperty2");
-		}
+
+		Sort sort = response.getBody().getPageable().getSort();
+		assertThat(sort).hasSize(2);
+
+		List<Sort.Order> orderList = sort.toList();
+		assertThat(orderList).hasSize(2);
+
+		Sort.Order firstOrder = orderList.get(0);
+		assertThat(firstOrder.getDirection()).isEqualTo(Sort.Direction.DESC);
+		assertThat(firstOrder.getProperty()).isEqualTo("sortProperty1");
+
+		Sort.Order secondOrder = orderList.get(1);
+		assertThat(secondOrder.getDirection()).isEqualTo(Sort.Direction.ASC);
+		assertThat(secondOrder.getProperty()).isEqualTo("sortProperty2");
 
 	}