Create SQLiteIndexSource with bare minimum search functionality (micr…

…osoft#46)
seejdev · Mar 5, 2020 · 38bc61c · 38bc61c
1 parent 9ad1353
commit 38bc61c
Show file tree

Hide file tree

Showing 39 changed files with 1,084 additions and 70 deletions.
diff --git a/src/AppInstallerCLI/AppInstallerCLI.vcxproj b/src/AppInstallerCLI/AppInstallerCLI.vcxproj
@@ -133,7 +133,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalDependencies Condition="'$(Configuration)'=='Debug'">wininet.lib;shell32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)'=='Debug'">wininet.lib;shell32.lib;winsqlite3.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
@@ -159,7 +159,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalDependencies Condition="'$(Configuration)'=='Release'">wininet.lib;shell32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)'=='Release'">wininet.lib;shell32.lib;winsqlite3.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/src/AppInstallerCLICore/Commands/SearchCommand.cpp b/src/AppInstallerCLICore/Commands/SearchCommand.cpp
@@ -13,7 +13,7 @@ namespace AppInstaller::CLI
     std::vector<Argument> SearchCommand::GetArguments() const
     {
         return {
-            Argument{ ARG_QUERY, LOCME("The query used to search for an app"), ArgumentType::Positional, true },
+            Argument{ ARG_QUERY, LOCME("The query used to search for an app"), ArgumentType::Positional, false },
             Argument{ ARG_ID, LOCME("If specified, filter the results by id"), ArgumentType::Standard },
             Argument{ ARG_NAME, LOCME("If specified, filter the results by name"), ArgumentType::Standard },
             Argument{ ARG_MONIKER, LOCME("If specified, filter the results by app moniker"), ArgumentType::Standard },

diff --git a/src/AppInstallerCLICore/Workflows/WorkflowBase.cpp b/src/AppInstallerCLICore/Workflows/WorkflowBase.cpp
@@ -105,7 +105,9 @@ namespace AppInstaller::Workflow
 
             if (match.MatchCriteria.Field != ApplicationMatchField::Id && match.MatchCriteria.Field != ApplicationMatchField::Name)
             {
-                msg += ", [" + ApplicationMatchFieldToString(match.MatchCriteria.Field) + ": " + match.MatchCriteria.Value + "]";
+                msg += ", [";
+                msg += ApplicationMatchFieldToString(match.MatchCriteria.Field);
+                msg += ": " + match.MatchCriteria.Value + "]";
             }
 
             m_reporter.ShowMsg(WorkflowReporter::Level::Info, msg);

diff --git a/src/AppInstallerCLICore/Workflows/WorkflowBase.h b/src/AppInstallerCLICore/Workflows/WorkflowBase.h
@@ -26,7 +26,7 @@ namespace AppInstaller::Workflow
 
         void ReportSearchResult();
 
-        std::unique_ptr<AppInstaller::Repository::ISource> m_source;
+        std::shared_ptr<AppInstaller::Repository::ISource> m_source;
         AppInstaller::Repository::SearchResult m_searchResult;
     };
 }
diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj
@@ -154,6 +154,7 @@
     <ClCompile Include="Downloader.cpp" />
     <ClCompile Include="MsixInfo.cpp" />
     <ClCompile Include="PreIndexedPackageSource.cpp" />
+    <ClCompile Include="SQLiteIndexSource.cpp" />
     <ClCompile Include="WorkFlow.cpp" />
     <ClCompile Include="LanguageUtilities.cpp" />
     <ClCompile Include="main.cpp">

diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters
@@ -71,6 +71,9 @@
     <ClCompile Include="PreIndexedPackageSource.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="SQLiteIndexSource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="PropertySheet.props" />

diff --git a/src/AppInstallerCLITests/SQLiteIndex.cpp b/src/AppInstallerCLITests/SQLiteIndex.cpp
@@ -19,9 +19,29 @@
 using namespace std::string_literals;
 using namespace TestCommon;
 using namespace AppInstaller::Manifest;
+using namespace AppInstaller::Repository;
 using namespace AppInstaller::Repository::Microsoft;
 using namespace AppInstaller::Repository::SQLite;
 
+SQLiteIndex SimpleTestSetup(const std::string& filePath, Manifest& manifest, std::string& relativePath)
+{
+    SQLiteIndex index = SQLiteIndex::CreateNew(filePath, Schema::Version::Latest());
+
+    manifest.Id = "test.id";
+    manifest.Name = "Test Name";
+    manifest.AppMoniker = "testmoniker";
+    manifest.Version = "1.0.0";
+    manifest.Channel = "test";
+    manifest.Tags = { "t1", "t2" };
+    manifest.Commands = { "test1", "test2" };
+
+    relativePath = "test/id/1.0.0.yml";
+
+    index.AddManifest(manifest, relativePath);
+
+    return index;
+}
+
 TEST_CASE("SQLiteIndexCreateLatestAndReopen", "[sqliteindex]")
 {
     TempFile tempFile{ "repolibtest_tempdb"s, ".db"s };
@@ -65,18 +85,10 @@ TEST_CASE("SQLiteIndexCreateAndAddManifest", "[sqliteindex]")
     TempFile tempFile{ "repolibtest_tempdb"s, ".db"s };
     INFO("Using temporary file named: " << tempFile.GetPath());
 
-    SQLiteIndex index = SQLiteIndex::CreateNew(tempFile, Schema::Version::Latest());
-
     Manifest manifest;
-    manifest.Id = "test.id";
-    manifest.Name = "Test Name";
-    manifest.AppMoniker = "testmoniker";
-    manifest.Version = "1.0.0";
-    manifest.Channel = "test";
-    manifest.Tags = { "t1", "t2" };
-    manifest.Commands = { "test1", "test2" };
+    std::string relativePath;
 
-    index.AddManifest(manifest, "test/id/test.id-1.0.0.yml");
+    SQLiteIndex index = SimpleTestSetup(tempFile, manifest, relativePath);
 }
 
 TEST_CASE("SQLiteIndexCreateAndAddManifestFile", "[sqliteindex]")
@@ -463,3 +475,145 @@ TEST_CASE("SQLiteIndex_PrepareForPackaging", "[sqliteindex]")
 
     index.PrepareForPackaging();
 }
+
+TEST_CASE("SQLiteIndex_Search_IdExactMatch", "[sqliteindex]")
+{
+    TempFile tempFile{ "repolibtest_tempdb"s, ".db"s };
+    INFO("Using temporary file named: " << tempFile.GetPath());
+
+    Manifest manifest;
+    std::string relativePath;
+    SQLiteIndex index = SimpleTestSetup(tempFile, manifest, relativePath);
+
+    SearchRequest request;
+    request.Query = RequestMatch(MatchType::Exact, manifest.Id);
+
+    auto results = index.Search(request);
+    REQUIRE(results.size() == 1);
+    REQUIRE(results[0].second.Field == ApplicationMatchField::Id);
+    REQUIRE(results[0].second.Type == MatchType::Exact);
+    REQUIRE(results[0].second.Value == manifest.Id);
+}
+
+TEST_CASE("SQLiteIndex_Search_MultipleMatch", "[sqliteindex]")
+{
+    TempFile tempFile{ "repolibtest_tempdb"s, ".db"s };
+    INFO("Using temporary file named: " << tempFile.GetPath());
+
+    Manifest manifest;
+    std::string relativePath;
+    SQLiteIndex index = SimpleTestSetup(tempFile, manifest, relativePath);
+
+    manifest.Version = "2.0.0";
+    index.AddManifest(manifest, relativePath + "2");
+
+    SearchRequest request;
+    request.Query = RequestMatch(MatchType::Exact, manifest.Id);
+
+    auto results = index.Search(request);
+    REQUIRE(results.size() == 1);
+
+    auto result = index.GetVersionsById(results[0].first);
+    REQUIRE(result.size() == 2);
+}
+
+TEST_CASE("SQLiteIndex_Search_NoMatch", "[sqliteindex]")
+{
+    TempFile tempFile{ "repolibtest_tempdb"s, ".db"s };
+    INFO("Using temporary file named: " << tempFile.GetPath());
+
+    Manifest manifest;
+    std::string relativePath;
+    SQLiteIndex index = SimpleTestSetup(tempFile, manifest, relativePath);
+
+    SearchRequest request;
+    request.Query = RequestMatch(MatchType::Exact, "THIS DOES NOT MATCH ANYTHING!");
+
+    auto results = index.Search(request);
+    REQUIRE(results.size() == 0);
+}
+
+TEST_CASE("SQLiteIndex_IdString", "[sqliteindex]")
+{
+    TempFile tempFile{ "repolibtest_tempdb"s, ".db"s };
+    INFO("Using temporary file named: " << tempFile.GetPath());
+
+    Manifest manifest;
+    std::string relativePath;
+    SQLiteIndex index = SimpleTestSetup(tempFile, manifest, relativePath);
+
+    SearchRequest request;
+    request.Query = RequestMatch(MatchType::Exact, manifest.Id);
+
+    auto results = index.Search(request);
+    REQUIRE(results.size() == 1);
+
+    auto result = index.GetIdStringById(results[0].first);
+    REQUIRE(result.has_value());
+    REQUIRE(result.value() == manifest.Id);
+}
+
+TEST_CASE("SQLiteIndex_NameString", "[sqliteindex]")
+{
+    TempFile tempFile{ "repolibtest_tempdb"s, ".db"s };
+    INFO("Using temporary file named: " << tempFile.GetPath());
+
+    Manifest manifest;
+    std::string relativePath;
+    SQLiteIndex index = SimpleTestSetup(tempFile, manifest, relativePath);
+
+    SearchRequest request;
+    request.Query = RequestMatch(MatchType::Exact, manifest.Id);
+
+    auto results = index.Search(request);
+    REQUIRE(results.size() == 1);
+
+    auto result = index.GetNameStringById(results[0].first);
+    REQUIRE(result.has_value());
+    REQUIRE(result.value() == manifest.Name);
+}
+
+TEST_CASE("SQLiteIndex_PathString", "[sqliteindex]")
+{
+    TempFile tempFile{ "repolibtest_tempdb"s, ".db"s };
+    INFO("Using temporary file named: " << tempFile.GetPath());
+
+    Manifest manifest;
+    std::string relativePath;
+    SQLiteIndex index = SimpleTestSetup(tempFile, manifest, relativePath);
+
+    SearchRequest request;
+    request.Query = RequestMatch(MatchType::Exact, manifest.Id);
+
+    auto results = index.Search(request);
+    REQUIRE(results.size() == 1);
+
+    auto specificResult = index.GetPathStringByKey(results[0].first, manifest.Version, manifest.Channel);
+    REQUIRE(specificResult.has_value());
+    REQUIRE(specificResult.value() == relativePath);
+
+    auto latestResult = index.GetPathStringByKey(results[0].first, "", manifest.Channel);
+    REQUIRE(latestResult.has_value());
+    REQUIRE(latestResult.value() == relativePath);
+}
+
+TEST_CASE("SQLiteIndex_Versions", "[sqliteindex]")
+{
+    TempFile tempFile{ "repolibtest_tempdb"s, ".db"s };
+    INFO("Using temporary file named: " << tempFile.GetPath());
+
+    Manifest manifest;
+    std::string relativePath;
+    SQLiteIndex index = SimpleTestSetup(tempFile, manifest, relativePath);
+
+    SearchRequest request;
+    request.Query = RequestMatch(MatchType::Exact, manifest.Id);
+
+    auto results = index.Search(request);
+    REQUIRE(results.size() == 1);
+
+    auto result = index.GetVersionsById(results[0].first);
+    REQUIRE(result.size() == 1);
+    REQUIRE(result[0].first == manifest.Version);
+    REQUIRE(result[0].second == manifest.Channel);
+}