Clean code for junit tests …

- Added messages to JUnit assertions
- Added Description when missing
- Changed to assertThat when assertEquals

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>

hawkbit-rest-resource/src/test/java/org/eclipse/hawkbit/controller/ArtifactDownloadTest.java

@@ -57,9 +57,6 @@ import ru.yandex.qatools.allure.annotations.Stories;
 /**
  * Test artifact downloads from the controller.
  *
- *
- *
- *
  */
 
 @ActiveProfiles({ "im", "test" })
@@ -285,7 +282,8 @@ public class ArtifactDownloadTest extends AbstractIntegrationTestWithMongoDB {
                 .andExpect(header().string("Content-Disposition", "attachment;filename=" + artifact.getFilename()))
                 .andReturn();
 
-        assertTrue(Arrays.equals(result.getResponse().getContentAsByteArray(), random));
+        assertTrue("The same file that was uploaded is expected when downloaded",
+                Arrays.equals(result.getResponse().getContentAsByteArray(), random));
 
         // download complete
         assertThat(downLoadProgress).isEqualTo(10);
@@ -393,7 +391,8 @@ public class ArtifactDownloadTest extends AbstractIntegrationTestWithMongoDB {
                 .andExpect(header().longValue("Last-Modified", artifact.getCreatedAt()))
                 .andExpect(header().string("Content-Disposition", "attachment;filename=file1")).andReturn();
 
-        assertTrue(Arrays.equals(result.getResponse().getContentAsByteArray(), random));
+        assertTrue("The same file that was uploaded is expected when downloaded",
+                Arrays.equals(result.getResponse().getContentAsByteArray(), random));
 
         // one (update) action
         assertThat(actionRepository.findByTargetAndDistributionSet(pageReq, target, ds).getContent()).hasSize(1);

hawkbit-rest-resource/src/test/java/org/eclipse/hawkbit/rest/resource/SortUtilityTest.java

@@ -8,7 +8,8 @@
  */
 package org.eclipse.hawkbit.rest.resource;
 
-import static org.junit.Assert.assertEquals;
+import static org.fest.assertions.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
 
 import java.util.List;
 
@@ -16,9 +17,15 @@ import org.eclipse.hawkbit.repository.TargetFields;
 import org.junit.Test;
 import org.springframework.data.domain.Sort.Order;
 
+import ru.yandex.qatools.allure.annotations.Description;
+import ru.yandex.qatools.allure.annotations.Features;
+import ru.yandex.qatools.allure.annotations.Stories;
+
 /**
  *
  */
+@Features("Component Tests - Management RESTful API")
+@Stories("Sorting parameter")
 public class SortUtilityTest {
     private static final String SORT_PARAM_1 = "NAME:ASC";
     private static final String SORT_PARAM_2 = "NAME:ASC, DESCRIPTION:DESC";
@@ -29,36 +36,55 @@ public class SortUtilityTest {
     private static final String WRONG_FIELD_PARAM = "ASDF:ASC";
 
     @Test
+    @Description("Ascending sorting based on name.")
     public void parseSortParam1() {
-
         final List<Order> parse = SortUtility.parse(TargetFields.class, SORT_PARAM_1);
-        assertEquals(1, parse.size());
+        assertThat(1).as("Count of parsing parameter").isEqualTo(parse.size());
     }
 
     @Test
+    @Description("Ascending sorting based on name and descending sorting based on description.")
     public void parseSortParam2() {
         final List<Order> parse = SortUtility.parse(TargetFields.class, SORT_PARAM_2);
-        assertEquals(2, parse.size());
-    }
-
-    @Test(expected = SortParameterSyntaxErrorException.class)
-    public void parseWrongSyntaxParam() {
-        SortUtility.parse(TargetFields.class, SYNTAX_FAILURE_SORT_PARAM);
+        assertThat(2).as("Count of parsing parameter").isEqualTo(parse.size());
     }
 
     @Test
+    @Description("Sorting with wrong syntax leads to SortParameterSyntaxErrorException.")
+    public void parseWrongSyntaxParam() {
+        try {
+            SortUtility.parse(TargetFields.class, SYNTAX_FAILURE_SORT_PARAM);
+            fail("SortParameterSyntaxErrorException expected because of wrong syntax");
+        } catch (final SortParameterSyntaxErrorException e) {
+        }
+    }
+
+    @Test
+    @Description("Sorting based on name with case sensitive is possible.")
     public void parsingIsNotCaseSensitive() {
         SortUtility.parse(TargetFields.class, CASE_INSENSITIVE_DIRECTION_PARAM);
         SortUtility.parse(TargetFields.class, CASE_INSENSITIVE_DIRECTION_PARAM_1);
     }
 
-    @Test(expected = SortParameterUnsupportedDirectionException.class)
+    @Test
+    @Description("Sorting with unknown direction order leads to SortParameterUnsupportedDirectionException.")
     public void parseWrongDirectionParam() {
-        SortUtility.parse(TargetFields.class, WRONG_DIRECTION_PARAM);
+        try {
+            SortUtility.parse(TargetFields.class, WRONG_DIRECTION_PARAM);
+            fail("SortParameterUnsupportedDirectionException expected because of unknown direction order");
+        } catch (final SortParameterUnsupportedDirectionException e) {
+        }
+
     }
 
-    @Test(expected = SortParameterUnsupportedFieldException.class)
+    @Test
+    @Description("Sorting with unknown field leads to SortParameterUnsupportedFieldException.")
     public void parseWrongFieldParam() {
-        SortUtility.parse(TargetFields.class, WRONG_FIELD_PARAM);
+        try {
+            SortUtility.parse(TargetFields.class, WRONG_FIELD_PARAM);
+            fail("SortParameterUnsupportedFieldException expected because of unknown field");
+        } catch (final SortParameterUnsupportedFieldException e) {
+        }
+
     }
 }