DFix test

Author: Simon Schubert

android/src/androidTest/java/com/inspiredandroid/linuxcommandbibliotheca/ComposeTests.kt

@@ -103,7 +103,7 @@ class ComposeTests {
         composeTestRule.onNodeWithContentDescription("TopAppBarTitle")
             .assertTextEquals(firstBasicCategory.title)
 
-        val basicGroup = databaseHelper.getBasicGroups(firstBasicCategory.id).first()
+        val basicGroup = databaseHelper.getBasicGroupsByQuery(firstBasicCategory.id).first()
 
         // Click on first group
         composeTestRule.onNodeWithText(basicGroup.description).performClick()

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/basicgroups/BasicGroupsViewModel.kt

@@ -23,7 +23,7 @@ class BasicGroupsViewModel(categoryId: Long) : ViewModel() {
 
     private val collapsedMap = mutableStateMapOf<Long, Boolean>()
 
-    var basicGroups = databaseHelper.getBasicGroups(categoryId)
+    var basicGroups = databaseHelper.getBasicGroupsByQuery(categoryId)
 
     fun isGroupCollapsed(id: Long): Boolean = collapsedMap[id] == true
 

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/search/SearchViewModel.kt

@@ -40,7 +40,7 @@ class SearchViewModel : ViewModel() {
                 ensureActive()
 
                 val commands = databaseHelper.getCommandsByQuery(searchText).sortedSearch(searchText)
-                val basicGroups = databaseHelper.getBasicGroups(searchText)
+                val basicGroups = databaseHelper.getBasicGroupsByQuery(searchText)
 
                 ensureActive()
 

cli/src/main/kotlin/com/linuxcommandlibrary/cli/ConsoleApplication.kt

@@ -120,7 +120,7 @@ fun showBasicCategories() {
 }
 
 fun showBasicGroups(id: Long) {
-    databaseHelper.getBasicGroups(id).forEach { group ->
+    databaseHelper.getBasicGroupsByQuery(id).forEach { group ->
         println("$BOLD${group.description}$RESET")
         databaseHelper.getBasicCommands(group.id).forEach { command ->
             println("- " + command.command)

common/src/commonMain/kotlin/com/linuxcommandlibrary/shared/Platform.kt

@@ -47,11 +47,11 @@ class DatabaseHelper {
 
     fun getBasics(): List<BasicCategory> = commandQueries.selectBasicCategories().executeAsList()
 
-    fun getBasicGroups(categoryId: Long): List<BasicGroup> = commandQueries.selectBasicGroupByCategory(categoryId).executeAsList()
+    fun getBasicGroupsByQuery(categoryId: Long): List<BasicGroup> = commandQueries.selectBasicGroupByCategory(categoryId).executeAsList()
 
     fun getBasicCommands(groupId: Long): List<BasicCommand> = commandQueries.selectBasicCommandByGroupId(groupId).executeAsList()
 
-    fun getBasicGroups(query: String): List<BasicGroup> = commandQueries.selectBasicGroupsByQuery(query).executeAsList()
+    fun getBasicGroupsByQuery(query: String): List<BasicGroup> = commandQueries.selectBasicGroupsByQuery(query).executeAsList()
 
     fun getSections(commandId: Long): List<CommandSection> = commandQueries.selectCommandSectionsByCommandId(commandId).executeAsList()
 

common/src/commonTest/kotlin/CommonTests.kt

@@ -2,7 +2,7 @@ import com.linuxcommandlibrary.shared.CommandElement
 import com.linuxcommandlibrary.shared.getCommandList
 import com.linuxcommandlibrary.shared.getHtmlFileName
 import com.linuxcommandlibrary.shared.getSortPriority
-import com.linuxcommandlibrary.shared.search
+import com.linuxcommandlibrary.shared.sortedSearch
 import databases.BasicCategory
 import databases.Command
 import databases.CommandSection
@@ -22,14 +22,13 @@ class CommonTests {
     @Test
     fun testCommandListSearch() {
         val commands = listOf(
-            Command(0, 0, "img2webp", "convert image to webp"),
             Command(0, 0, "optipng", "convert"),
             Command(0, 0, "thumbnail", "take png and do something"),
             Command(0, 0, "Pngcheck", "print detailed"),
             Command(0, 0, "png", "png"),
         )
 
-        val filteredCommands = commands.search("png")
+        val filteredCommands = commands.sortedSearch("png")
 
         assert(filteredCommands.size == 4)
 

desktop/src/main/kotlin/com/linuxcommandlibrary/desktop/WebsiteBuilder.kt

@@ -268,7 +268,7 @@ class WebsiteBuilder {
         basicCategories.forEachIndexed { index, category ->
             print("\rCreate basic category html ${index + 1}/$totalCount")
 
-            val groups = databaseHelper.getBasicGroups(category.id)
+            val groups = databaseHelper.getBasicGroupsByQuery(category.id)
 
             val file = File(folder, "${category.getHtmlFileName()}.html")
             file.delete()