Simplified assertions in tests

Author: mathiasbosman

src/test/java/org/aarboard/nextcloud/api/TestConfigConnector.java

@@ -16,20 +16,9 @@
  */
 package org.aarboard.nextcloud.api;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Collection;
 import java.util.List;
-
-import org.aarboard.nextcloud.api.provisioning.User;
-import org.aarboard.nextcloud.api.provisioning.UserData;
-import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
@@ -47,7 +36,7 @@ public void t01_testGetConfigApps() {
         if (_nc != null)
         {
             List<String> apps = _nc.getAppConfigApps();
-            assertTrue(apps != null);
+            assertNotNull(apps);
         }
     }
 
@@ -57,7 +46,7 @@ public void t02_testGetConfigAppsFiles() {
         if (_nc != null)
         {
             List<String> appKeys = _nc.getAppConfigAppKeys("files");
-            assertTrue(appKeys != null);
+            assertNotNull(appKeys);
         }
     }
 
@@ -67,7 +56,7 @@ public void t03_testGetConfigAppsFilesVersion() {
         if (_nc != null)
         {
             String version = _nc.getAppConfigAppKeyValue("files", "installed_version");
-            assertTrue(version != null);
+            assertNotNull(version);
         }
     }
 }

src/test/java/org/aarboard/nextcloud/api/TestFiles.java

@@ -16,6 +16,7 @@
  */
 package org.aarboard.nextcloud.api;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -26,6 +27,8 @@
 import org.aarboard.nextcloud.api.webdav.ResourceProperties;
 import org.junit.Assert;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
@@ -257,11 +260,13 @@ public void t27_99_testFileProperties() {
             try
             {
                 _nc.getProperties(TESTFILE2+"-not-existing", false);
-                assertFalse("Resource should throw 404 error", true);
+                fail("Resource should throw 404 error");
             }
             catch (Exception ex)
             {
-                assertTrue("com.github.sardine.impl.SardineException: status code: 404, reason phrase: Unexpected response (404 Not Found)".equals(ex.getMessage()));
+              assertEquals(
+                  "com.github.sardine.impl.SardineException: status code: 404, reason phrase: Unexpected response (404 Not Found)",
+                  ex.getMessage());
             }
         }
     }
@@ -280,7 +285,8 @@ public void t28_3_testDowloadFile() throws IOException {
                 nCount++;
             }
             is.close();
-            assertTrue("Downloaded content size does not match", nCount == TEST3_FILE_CONTENT.length());
+            assertEquals("Downloaded content size does not match", nCount,
+              TEST3_FILE_CONTENT.length());
         }
     }
 
@@ -292,11 +298,12 @@ public void t29_3_testDowloadFile() throws IOException {
             File of= new File(System.getProperty("java.io.tmpdir")+File.separator+TESTFILE1);
             if (_nc.downloadFile(TESTFILE1, of.getParent()))
             {
-                assertTrue("Downloaded content size does not match", of.length() == TEST1_FILE_CONTENT.length());
+                assertEquals("Downloaded content size does not match", of.length(),
+                  TEST1_FILE_CONTENT.length());
             }
             else
             {
-                assertTrue("Downloaded file failed", false);
+                fail("Downloaded file failed");
             }
             if (of.exists())
             {
@@ -313,11 +320,11 @@ public void t29_3_testDowloadFile4() throws IOException {
             File of= new File(System.getProperty("java.io.tmpdir")+File.separator+TESTFILE4);
             if (_nc.downloadFile(TESTFILE4, of.getParent()))
             {
-                assertTrue("Downloaded content size does not match", of.length() == 0);
+                assertEquals("Downloaded content size does not match", 0, of.length());
             }
             else
             {
-                assertTrue("Downloaded file failed", false);
+                fail("Downloaded file failed");
             }
             if (of.exists())
             {
@@ -335,11 +342,11 @@ public void t29_6_testDowloadFile6() throws IOException {
             if (_nc.downloadFile(TESTFILE6, of.getParent()))
             {
                 File srcFile= new File("src/test/resources/"+TESTFILE6);
-                assertTrue("Downloaded content size does not match", of.length() == srcFile.length());
+                assertEquals("Downloaded content size does not match", of.length(), srcFile.length());
             }
             else
             {
-                assertTrue("Downloaded file failed", false);
+                fail("Downloaded file failed");
             }
             if (of.exists())
             {
@@ -357,11 +364,11 @@ public void t29_6_testDowloadFile7() throws IOException {
             if (_nc.downloadFile(TESTFILE7, of.getParent()))
             {
                 File srcFile= new File("src/test/resources/"+TESTFILE7);
-                assertTrue("Downloaded content size does not match", of.length() == srcFile.length());
+                assertEquals("Downloaded content size does not match", of.length(), srcFile.length());
             }
             else
             {
-                assertTrue("Downloaded file failed", false);
+                fail("Downloaded file failed");
             }
             if (of.exists())
             {