X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fpackage%2FCatalogTest.cxx;h=22a4cd544ea3a718466676a67aba0239d502b5a4;hb=cb6406361061578db779ada90624374f325bfbb9;hp=e2b98aca74557fa254ce480795169f5d6f2ca7de;hpb=d12d1b2c3ac5ae4981665a65f49a34c465063f02;p=simgear.git

diff --git a/simgear/package/CatalogTest.cxx b/simgear/package/CatalogTest.cxx
index e2b98aca..22a4cd54 100644
--- a/simgear/package/CatalogTest.cxx
+++ b/simgear/package/CatalogTest.cxx
@@ -23,15 +23,102 @@
 
 #include <cstdlib>
 #include <iostream>
+#include <fstream>
 
 #include <simgear/package/Catalog.hxx>
 #include <simgear/package/Root.hxx>
 #include <simgear/package/Package.hxx>
+#include <simgear/package/Install.hxx>
 
+#include <simgear/misc/test_macros.hxx>
 #include <simgear/misc/sg_dir.hxx>
+#include <simgear/timing/timestamp.hxx>
+
+#include <simgear/io/test_HTTP.hxx>
+#include <simgear/io/HTTPClient.hxx>
+#include <simgear/io/sg_file.hxx>
+#include <simgear/structure/exception.hxx>
 
 using namespace simgear;
 
+std::string readFileIntoString(const SGPath& path)
+{
+    std::string contents;
+
+    size_t readLen;
+    SGBinaryFile f(path.str());
+    if (!f.open(SG_IO_IN)) {
+        throw sg_io_exception("Couldn't open file", path);
+    }
+
+    char buf[8192];
+    while ((readLen = f.read(buf, 8192)) > 0) {
+        contents += std::string(buf, readLen);
+    }
+
+    return contents;
+}
+
+SGPath global_serverFilesRoot;
+unsigned int global_catalogVersion = 0;
+
+class TestPackageChannel : public TestServerChannel
+{
+public:
+
+    virtual void processRequestHeaders()
+    {
+        state = STATE_IDLE;
+        SGPath localPath(global_serverFilesRoot);
+
+
+        if (path == "/catalogTest1/catalog.xml") {
+            if (global_catalogVersion > 0) {
+                std::stringstream ss;
+                ss << "/catalogTest1/catalog-v" << global_catalogVersion << ".xml";
+                path = ss.str();
+            }
+        }
+
+        localPath.append(path);
+
+      //  SG_LOG(SG_IO, SG_INFO, "local path is:" << localPath.str());
+
+        if (localPath.exists()) {
+            std::string content = readFileIntoString(localPath);
+            std::stringstream d;
+            d << "HTTP/1.1 " << 200 << " " << reasonForCode(200) << "\r\n";
+            d << "Content-Length:" << content.size() << "\r\n";
+            d << "\r\n"; // final CRLF to terminate the headers
+            d << content;
+
+            std::string ds(d.str());
+            bufferSend(ds.data(), ds.size());
+        } else {
+            sendErrorResponse(404, false, "");
+        }
+    }
+};
+
+TestServer<TestPackageChannel> testServer;
+
+void waitForUpdateComplete(HTTP::Client* cl, pkg::Root* root)
+{
+    SGTimeStamp start(SGTimeStamp::now());
+    while (start.elapsedMSec() <  10000) {
+        cl->update();
+        testServer.poll();
+
+        if (!cl->hasActiveRequests()) {
+            return;
+        }
+
+        SGTimeStamp::sleepForMSec(15);
+    }
+
+    std::cerr << "timed out" << std::endl;
+}
+
 int parseTest()
 {
     SGPath rootPath = simgear::Dir::current().path();
@@ -42,11 +129,11 @@ int parseTest()
     VERIFY(cat.valid());
 
     COMPARE(cat->id(), "org.flightgear.test.catalog1");
-    COMPARE(cat->url(), "http://download.flightgear.org/catalog1/catalog.xml");
+    COMPARE(cat->url(), "http://localhost:2000/catalogTest1/catalog.xml");
     COMPARE(cat->description(), "First test catalog");
 
 // check the packages too
-    COMPARE(cat->packages().size(), 2);
+    COMPARE(cat->packages().size(), 3);
 
     pkg::PackageRef p1 = cat->packages().front();
     COMPARE(p1->catalog(), cat.ptr());
@@ -55,7 +142,7 @@ int parseTest()
     COMPARE(p1->qualifiedId(), "org.flightgear.test.catalog1.alpha");
     COMPARE(p1->name(), "Alpha package");
     COMPARE(p1->revision(), 8);
-    COMPARE(p1->fileSizeBytes(), 1234567);
+    COMPARE(p1->fileSizeBytes(), 593);
 
 
     pkg::PackageRef p2 = cat->getPackageById("c172p");
@@ -66,14 +153,278 @@ int parseTest()
 
 
 // test filtering / searching too
+    string_set tags(p2->tags());
+    COMPARE(tags.size(), 4);
+    VERIFY(tags.find("ifr") != tags.end());
+    VERIFY(tags.find("cessna") != tags.end());
+    VERIFY(tags.find("jet") == tags.end());
+
+
+    SGPropertyNode_ptr queryA(new SGPropertyNode);
+    queryA->setStringValue("tag", "ifr");
+    VERIFY(p2->matches(queryA.ptr()));
+
+    SGPropertyNode_ptr queryB(new SGPropertyNode);
+    queryB->setStringValue("name", "ces");
+    VERIFY(p2->matches(queryB.ptr()));
+
+    SGPropertyNode_ptr queryC(new SGPropertyNode);
+    queryC->setStringValue("name", "foo");
+    VERIFY(!p2->matches(queryC.ptr()));
+
+    SGPropertyNode_ptr queryD(new SGPropertyNode);
+    queryD->setIntValue("rating-FDM", 3);
+    VERIFY(p2->matches(queryD.ptr()));
+
+    SGPropertyNode_ptr queryE(new SGPropertyNode);
+    queryE->setIntValue("rating-model", 5);
+    queryE->setStringValue("description", "cessna");
+    VERIFY(p2->matches(queryE.ptr()));
+
 
     delete root;
     return EXIT_SUCCESS;
 }
 
+void testAddCatalog(HTTP::Client* cl)
+{
+// erase dir
+    SGPath rootPath(simgear::Dir::current().path());
+    rootPath.append("pkg_add_catalog");
+    simgear::Dir pd(rootPath);
+    pd.removeChildren();
+
+
+    pkg::RootRef root(new pkg::Root(rootPath, "8.1.2"));
+    // specify a test dir
+    root->setHTTPClient(cl);
+
+    pkg::CatalogRef c = pkg::Catalog::createFromUrl(root.ptr(), "http://localhost:2000/catalogTest1/catalog.xml");
+
+    waitForUpdateComplete(cl, root);
+
+// verify on disk state
+    SGPath p(rootPath);
+    p.append("org.flightgear.test.catalog1");
+    p.append("catalog.xml");
+    VERIFY(p.exists());
+    COMPARE(root->allPackages().size(), 3);
+    COMPARE(root->catalogs().size(), 1);
+
+    pkg::PackageRef p1 = root->getPackageById("alpha");
+    COMPARE(p1->id(), "alpha");
+
+    pkg::PackageRef p2 = root->getPackageById("org.flightgear.test.catalog1.c172p");
+    COMPARE(p2->id(), "c172p");
+    COMPARE(p2->qualifiedId(), "org.flightgear.test.catalog1.c172p");
+
+}
+
+void testInstallPackage(HTTP::Client* cl)
+{
+    SGPath rootPath(simgear::Dir::current().path());
+    rootPath.append("pkg_install_with_dep");
+    simgear::Dir pd(rootPath);
+    pd.removeChildren();
+
+    pkg::RootRef root(new pkg::Root(rootPath, "8.1.2"));
+    // specify a test dir
+    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();
+
+    VERIFY(ins->isQueued());
+
+    waitForUpdateComplete(cl, root);
+    VERIFY(p1->isInstalled());
+    VERIFY(p1->existingInstall() == ins);
+
+    pkg::PackageRef commonDeps = root->getPackageById("common-sounds");
+    VERIFY(commonDeps->existingInstall());
+
+    // verify on disk state
+    SGPath p(rootPath);
+    p.append("org.flightgear.test.catalog1");
+    p.append("Aircraft");
+    p.append("c172p");
+
+    COMPARE(p, ins->path());
+
+    p.append("c172p-floats-set.xml");
+    VERIFY(p.exists());
+
+    SGPath p2(rootPath);
+    p2.append("org.flightgear.test.catalog1");
+    p2.append("Aircraft");
+    p2.append("sounds");
+    p2.append("sharedfile.txt");
+    VERIFY(p2.exists());
+}
+
+void testUninstall(HTTP::Client* cl)
+{
+    SGPath rootPath(simgear::Dir::current().path());
+    rootPath.append("pkg_uninstall");
+    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());
+
+    ins->uninstall();
+
+    VERIFY(!ins->path().exists());
+}
+
+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());
+}
+
+template <class T>
+bool contains(const std::vector<T>& vec, const T& item)
+{
+    typename std::vector<T>::const_iterator it = std::find(vec.begin(), vec.end(), item);
+    return (it != vec.end());
+}
+
+void testRefreshCatalog(HTTP::Client* cl)
+{
+    SGPath rootPath(simgear::Dir::current().path());
+    rootPath.append("pkg_catalog_refresh_update");
+    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();
+
+        pkg::PackageRef p2 = root->getPackageById("org.flightgear.test.catalog1.alpha");
+        pkg::InstallRef ins2 = p2->install();
+
+        waitForUpdateComplete(cl, root);
+
+        VERIFY(p1->isInstalled());
+        VERIFY(p2->isInstalled());
+    }
+
+    VERIFY(root->packagesNeedingUpdate().empty());
+
+    global_catalogVersion = 2;
+
+    VERIFY(!cl->hasActiveRequests());
+    root->refresh();
+
+    // should be a no-op due to catalog age testing
+    VERIFY(!cl->hasActiveRequests());
+
+    // force it this time
+    root->refresh(true);
+    VERIFY(cl->hasActiveRequests());
+    waitForUpdateComplete(cl, root);
+
+    pkg::CatalogRef c = root->getCatalogById("org.flightgear.test.catalog1");
+    COMPARE(c->ageInSeconds(), 0);
+
+    VERIFY(root->getPackageById("dc3") != pkg::PackageRef());
+    COMPARE(root->packagesNeedingUpdate().size(), 2);
+
+    pkg::PackageList needingUpdate = root->packagesNeedingUpdate();
+    VERIFY(contains(needingUpdate, root->getPackageById("common-sounds")));
+    VERIFY(contains(needingUpdate, root->getPackageById("org.flightgear.test.catalog1.alpha")));
+
+    pkg::InstallRef ins = root->getPackageById("alpha")->existingInstall();
+    VERIFY(ins->hasUpdate());
+
+    for (pkg::PackageList::const_iterator it = needingUpdate.begin();
+         it != needingUpdate.end(); ++it)
+    {
+        root->scheduleToUpdate((*it)->existingInstall());
+    }
+
+    waitForUpdateComplete(cl, root);
+
+    VERIFY(root->packagesNeedingUpdate().empty());
+    COMPARE(root->getPackageById("common-sounds")->revision(), 11);
+}
+
+
 int main(int argc, char* argv[])
 {
+    sglog().setLogLevels( SG_ALL, SG_DEBUG );
+
+    HTTP::Client cl;
+    cl.setMaxConnections(1);
+
+    global_serverFilesRoot = SGPath(SRC_DIR);
+
+    testAddCatalog(&cl);
+
     parseTest();
+
+    testInstallPackage(&cl);
+    
+    testUninstall(&cl);
+
+    testRemoveCatalog(&cl);
+
+    testRefreshCatalog(&cl);
+
     std::cout << "Successfully passed all tests!" << std::endl;
     return EXIT_SUCCESS;
 }