Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 19:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix autocomplete due to error in returned autocomplete text (#6988)

Browse Source
This commit is contained in:
Divyansh Srivastava
2020-10-02 21:30:14 -07:00
committed by GitHub
parent 7c607ad540
commit 4feb0f209f
2 changed files with 17 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/launcher/Wox.Core/Plugin/PluginManager.cs
View File

@@ -194,14 +194,15 @@ namespace Wox.Core.Plugin
{ {
foreach (Result result in results) foreach (Result result in results)
{ {
if (!string.IsNullOrEmpty(result.QueryTextDisplay)) if (string.IsNullOrEmpty(result.QueryTextDisplay))
{
result.QueryTextDisplay = result.Title;
}
if (!string.IsNullOrEmpty(query.ActionKeyword))
{ {
result.QueryTextDisplay = string.Format("{0} {1}", query.ActionKeyword, result.QueryTextDisplay); result.QueryTextDisplay = string.Format("{0} {1}", query.ActionKeyword, result.QueryTextDisplay);
} }
else
{
result.QueryTextDisplay = string.Format("{0} {1}", query.ActionKeyword, result.Title);
}
} }
return results; return results;

56
src/modules/launcher/Wox.Test/PluginManagerTest.cs
View File

@@ -15,13 +15,18 @@ namespace Wox.Test
[TestFixture] [TestFixture]
public class PluginManagerTest public class PluginManagerTest
{ {
[Test] [TestCase(">", "dummyQueryText", "dummyTitle", "> dummyQueryText")]
public void QueryForPlugin_SetsActionKeyword_WhenQueryTextDisplayIsSet() [TestCase(">", null, "dummyTitle", "> dummyTitle")]
[TestCase(">", "", "dummyTitle", "> dummyTitle")]
[TestCase("", "dummyQueryText", "dummyTitle", "dummyQueryText")]
[TestCase("", null, "dummyTitle", "dummyTitle")]
[TestCase("", "", "dummyTitle", "dummyTitle")]
[TestCase(null, "dummyQueryText", "dummyTitle", "dummyQueryText")]
[TestCase(null, null, "dummyTitle", "dummyTitle")]
[TestCase(null, "", "dummyTitle", "dummyTitle")]
public void QueryForPlugin_SetsActionKeyword_WhenQueryTextDisplayIsEmpty(string actionKeyword, string queryTextDisplay, string title, string expectedResult)
{ {
// Arrange // Arrange
var actionKeyword = ">";
var title = "dummyTitle";
var queryTextDisplay = "dummyQueryTextDisplay";
var query = new Query var query = new Query
{ {
ActionKeyword = actionKeyword, ActionKeyword = actionKeyword,
@@ -51,46 +56,7 @@ namespace Wox.Test
var queryOutput = PluginManager.QueryForPlugin(pluginPair, query); var queryOutput = PluginManager.QueryForPlugin(pluginPair, query);
// Assert // Assert
Assert.AreEqual(string.Format("{0} {1}", ">", queryTextDisplay), queryOutput[0].QueryTextDisplay); Assert.AreEqual(expectedResult, queryOutput[0].QueryTextDisplay);
}
[TestCase("")]
[TestCase(null)]
public void QueryForPlugin_SetsActionKeyword_WhenQueryTextDisplayIsEmpty(string queryTextDisplay)
{
// Arrange
var actionKeyword = ">";
var title = "dummyTitle";
var query = new Query
{
ActionKeyword = actionKeyword,
};
var metadata = new PluginMetadata
{
ID = "dummyName",
IcoPath = "dummyIcoPath",
ExecuteFileName = "dummyExecuteFileName",
PluginDirectory = "dummyPluginDirectory",
};
var result = new Result()
{
QueryTextDisplay = queryTextDisplay,
Title = title,
};
var results = new List<Result>() { result };
var pluginMock = new Mock<IPlugin>();
pluginMock.Setup(r => r.Query(query)).Returns(results);
var pluginPair = new PluginPair
{
Plugin = pluginMock.Object,
Metadata = metadata,
};
// Act
var queryOutput = PluginManager.QueryForPlugin(pluginPair, query);
// Assert
Assert.AreEqual(string.Format("{0} {1}", ">", title), queryOutput[0].QueryTextDisplay);
} }
} }
} }