update tests

Author: shryhus

2-0-servlet-api/2-0-1-date-servlet-api/src/test/java/com/bobocode/DateServletTest.java

@@ -17,10 +17,10 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.time.LocalDate;
+import java.util.Optional;
 import java.util.Set;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -66,27 +66,35 @@ void dateServletExtendsHttpServlet() {
         Set<Class<? extends HttpServlet>> httpServlets =
                 reflections.getSubTypesOf(HttpServlet.class);
 
-        httpServlets.stream()
+        Optional<String> anyDateHttpServlet = httpServlets.stream()
                 .map(Class::getSimpleName)
                 .filter(servlet -> servlet.equals(DATE_SERVLET))
-                .findAny()
-                .orElseThrow();
+                .findAny();
+        assertThat(anyDateHttpServlet).isNotEmpty();
     }
 
     @Test
     @Order(3)
     void dateServletIsMarkedAsWebServlet() {
         Set<Class<?>> servlets =
                 reflections.getTypesAnnotatedWith(WebServlet.class);
-        servlets.stream()
+        Optional<String> anyMarkedDateServlet = servlets.stream()
                 .map(Class::getSimpleName)
                 .filter(servlet -> servlet.equals(DATE_SERVLET))
-                .findAny()
-                .orElseThrow();
+                .findAny();
+        assertThat(anyMarkedDateServlet).isNotEmpty();
     }
 
     @Test
     @Order(4)
+    void dateServletIsMarkedWithProperPath() throws ClassNotFoundException {
+        String[] value = Class.forName(SERVLET_PACKAGE + "." + DATE_SERVLET)
+                .getAnnotation(WebServlet.class).value();
+        assertThat(value).contains("/date");
+    }
+
+    @Test
+    @Order(5)
     void dateServletContentTypeIsProper() throws IllegalAccessException,
             InvocationTargetException, NoSuchMethodException, IOException {
         Method doGetMethod = getDoGetMethod();
@@ -100,16 +108,17 @@ void dateServletContentTypeIsProper() throws IllegalAccessException,
     }
 
     @Test
-    @Order(5)
+    @Order(6)
     void dateServletReturnsDateInResponse() throws IOException, NoSuchMethodException, InvocationTargetException,
             IllegalAccessException {
+        Method doGetMethod = getDoGetMethod();
+
         StringWriter stringWriter = new StringWriter();
         PrintWriter printWriter = new PrintWriter(stringWriter);
         when(response.getWriter()).thenReturn(printWriter);
-        Method doGetMethod = getDoGetMethod();
 
         doGetMethod.invoke(dateServletObject, request, response);
-        assertThat(stringWriter.getBuffer().toString().contains(LocalDate.now().toString())).isTrue();
+        assertThat(stringWriter.getBuffer().toString()).contains(LocalDate.now().toString());
     }
 
     private Method getDoGetMethod() throws NoSuchMethodException {