From: James Turner <zakalawe@mac.com>
Date: Tue, 19 Apr 2016 11:56:07 +0000 (+0200)
Subject: Catalog removal test
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8582676100a93c12e42da47940ead10bae918488;p=simgear.git

Catalog removal test

- verifies installed packages are removed also.
---

diff --git a/simgear/package/CatalogTest.cxx b/simgear/package/CatalogTest.cxx
index 6f6f5a80..7e1b275c 100644
--- a/simgear/package/CatalogTest.cxx
+++ b/simgear/package/CatalogTest.cxx
@@ -280,9 +280,42 @@ void testUninstall(HTTP::Client* cl)
     VERIFY(!ins->path().exists());
 }
 
-void testRemoveCatalog()
+void testRemoveCatalog(HTTP::Client* cl)
 {
+    SGPath rootPath(simgear::Dir::current().path());
+    rootPath.append("pkg_catalog_remove");
+    simgear::Dir pd(rootPath);
+    pd.removeChildren();
+
+    pkg::RootRef root(new pkg::Root(rootPath, "8.1.2"));
+    root->setHTTPClient(cl);
+
+    {
+        pkg::CatalogRef c = pkg::Catalog::createFromUrl(root.ptr(), "http://localhost:2000/catalogTest1/catalog.xml");
+        waitForUpdateComplete(cl, root);
+    }
+
+    {
+        pkg::PackageRef p1 = root->getPackageById("org.flightgear.test.catalog1.c172p");
+        pkg::InstallRef ins = p1->install();
 
+        waitForUpdateComplete(cl, root);
+
+        VERIFY(p1->isInstalled());
+    }
+
+    root->removeCatalogById("org.flightgear.test.catalog1");
+
+
+    SGPath p2(rootPath);
+    p2.append("org.flightgear.test.catalog1");
+    VERIFY(!p2.exists());
+
+    VERIFY(root->allPackages().empty());
+    VERIFY(root->catalogs().empty());
+
+    pkg::CatalogRef c = root->getCatalogById("org.flightgear.test.catalog1");
+    COMPARE(c, pkg::CatalogRef());
 }
 
 void testRefreshCatalog()
@@ -308,6 +341,8 @@ int main(int argc, char* argv[])
     testInstallPackage(&cl);
     
     testUninstall(&cl);
+
+    testRemoveCatalog(&cl);
     
     std::cout << "Successfully passed all tests!" << std::endl;
     return EXIT_SUCCESS;