From 39a8f2c799275cc90fefe06ddeafaa9176f44663 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 25 Aug 2021 06:25:26 -0700
Subject: [PATCH] migrate existing tests to use expect.str_find()

---
 test/library/gui/dwarfmode.lua |  4 ++--
 test/library/print.lua         | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/library/gui/dwarfmode.lua b/test/library/gui/dwarfmode.lua
index dc0dee18c..1f3ab6a87 100644
--- a/test/library/gui/dwarfmode.lua
+++ b/test/library/gui/dwarfmode.lua
@@ -53,12 +53,12 @@ function test.enterSidebarMode()
     -- move from default to some other mode
     guidm.enterSidebarMode(df.ui_sidebar_mode.QueryBuilding)
     expect.eq(df.ui_sidebar_mode.QueryBuilding, df.global.ui.main.mode)
-    expect.true_(dfhack.gui.getCurFocus(true):find('^dwarfmode/QueryBuilding'))
+    expect.str_find('^dwarfmode/QueryBuilding', dfhack.gui.getCurFocus(true))
 
     -- move between non-default modes
     guidm.enterSidebarMode(df.ui_sidebar_mode.LookAround)
     expect.eq(df.ui_sidebar_mode.LookAround, df.global.ui.main.mode)
-    expect.true_(dfhack.gui.getCurFocus(true):find('^dwarfmode/LookAround'))
+    expect.str_find('^dwarfmode/LookAround', dfhack.gui.getCurFocus(true))
 
     -- get back into default from a supported mode
     guidm.enterSidebarMode(df.ui_sidebar_mode.Default)
diff --git a/test/library/print.lua b/test/library/print.lua
index d8e915772..3f9b5a78c 100644
--- a/test/library/print.lua
+++ b/test/library/print.lua
@@ -14,7 +14,7 @@ config.wrapper = test_wrapper
 function test.printall_table()
     printall({a='b'})
     expect.eq(1, mock_print.call_count)
-    expect.true_(mock_print.call_args[1][1]:find('a%s+= b'))
+    expect.str_find('a%s+= b', mock_print.call_args[1][1])
 end
 
 function test.printall_string()
@@ -57,8 +57,8 @@ function test.printall_userdata()
             utable:insert(1, 20)
             printall(utable)
             expect.eq(2, mock_print.call_count)
-            expect.true_(mock_print.call_args[1][1]:find('0%s+= 10'))
-            expect.true_(mock_print.call_args[2][1]:find('1%s+= 20'))
+            expect.str_find('0%s+= 10', mock_print.call_args[1][1])
+            expect.str_find('1%s+= 20', mock_print.call_args[2][1])
         end)
 end
 
@@ -70,8 +70,8 @@ end
 function test.printall_ipairs_table()
     printall_ipairs({'a', 'b'})
     expect.eq(2, mock_print.call_count)
-    expect.true_(mock_print.call_args[1][1]:find('1%s+= a'))
-    expect.true_(mock_print.call_args[2][1]:find('2%s+= b'))
+    expect.str_find('1%s+= a', mock_print.call_args[1][1])
+    expect.str_find('2%s+= b', mock_print.call_args[2][1])
 end
 
 function test.printall_ipairs_string()
@@ -106,8 +106,8 @@ function test.printall_ipairs_userdata()
             utable:insert(1, 20)
             printall_ipairs(utable)
             expect.eq(2, mock_print.call_count)
-            expect.true_(mock_print.call_args[1][1]:find('0%s+= 10'))
-            expect.true_(mock_print.call_args[2][1]:find('1%s+= 20'))
+            expect.str_find('0%s+= 10', mock_print.call_args[1][1])
+            expect.str_find('1%s+= 20', mock_print.call_args[2][1])
         end)
 end
 
@@ -118,7 +118,7 @@ end
 
 local function validate_patterns(start_idx, patterns)
     for i,pattern in ipairs(patterns) do
-        expect.true_(mock_print.call_args[start_idx+i-1][1]:find(pattern))
+        expect.str_find(pattern, mock_print.call_args[start_idx+i-1][1])
     end
     return start_idx + #patterns
 end
@@ -145,7 +145,7 @@ function test.printall_recurse()
             t2.cyclic = t
             printall_recurse(t)
             expect.eq(55, mock_print.call_count)
-            expect.true_(mock_print.call_args[1][1]:find('^table: '))
+            expect.str_find('^table: ', mock_print.call_args[1][1])
             local idx = 2
             local EQ = '^%s+= $'
             while idx <= 55 do