Fix the tests to pass with the addition of crash logging

Author: borrrden

common/test/java/com/couchbase/lite/logging/LogTest.kt

@@ -292,7 +292,7 @@ class LogTest : BaseDbTest() {
 
             val rex = Regex("cbl_(debug|verbose|info|warning|error)_\\d+\\.cbllog")
             for (file in files) {
-                Assert.assertTrue(file.name.matches(rex))
+                Assert.assertTrue(file.name.matches(rex) || file.name.contains("crash"))
             }
         }
     }
@@ -347,8 +347,9 @@ class LogTest : BaseDbTest() {
         ) {
             // This should create two files for each of the 5 levels except verbose (debug, info, warning, error):
             // 1k of logs plus .5k headers. There should be only one file at the verbose level (just the headers)
+            // and the crash log file
             write1KBToLog()
-            Assert.assertEquals((4 * 2) + 1, logFiles.size)
+            Assert.assertEquals((4 * 2) + 2, logFiles.size)
         }
     }
 
@@ -364,11 +365,11 @@ class LogTest : BaseDbTest() {
         ) {
             // This should create several files for each of the 5 levels except verbose (debug, info, warning, error):
             // 1k of logs plus .5k headers. Although lots of files are created they should be trimmed to only 3
-            // at each level.  There should be only one file at the verbose level (just the headers)
+            // at each level.  There should be only one file at the verbose level (just the headers) and the crash log file
             repeat(21) {
                 write1KBToLog()
             }
-            Assert.assertEquals((4 * 3) + 1, logFiles.size)
+            Assert.assertEquals((4 * 3) + 2, logFiles.size)
         }
     }
 
@@ -403,6 +404,10 @@ class LogTest : BaseDbTest() {
             Assert.assertNotNull(tempDir!!.listFiles())
             for (log in logFiles!!) {
                 val fn = log.name.lowercase(Locale.getDefault())
+                if (fn.contains("crash")) {
+                    continue;
+                }
+
                 if (fn.startsWith("cbl_debug_") || fn.startsWith("cbl_verbose_")) {
                     Assert.assertFalse(getLogContents(log).contains(uuidString))
                 } else {
@@ -420,6 +425,10 @@ class LogTest : BaseDbTest() {
         ) {
             write1KBToLog()
             for (log in logFiles) {
+                if (log.name.contains("crash")) {
+                    continue;
+                }
+
                 var logLine: String
                 BufferedReader(FileReader(log)).use {
                     logLine = it.readLine()
@@ -477,7 +486,7 @@ class LogTest : BaseDbTest() {
             Log.e(LogDomain.DATABASE, message, error)
 
             for (log in logFiles) {
-                if (!log.name.contains("verbose")) {
+                if (!log.name.contains("verbose") && !log.name.contains("crash")) {
                     Assert.assertTrue(getLogContents(log).contains(uuid))
                 }
             }
@@ -498,7 +507,7 @@ class LogTest : BaseDbTest() {
             Log.e(LogDomain.DATABASE, message, error, uuid2)
 
             for (log in logFiles) {
-                if (!log.name.contains("verbose")) {
+                if (!log.name.contains("verbose") && !log.name.contains("crash")) {
                     val content = getLogContents(log)
                     Assert.assertTrue(content.contains(uuid1))
                     Assert.assertTrue(content.contains(uuid2))