install10 test case added

diff --git a/src/SolverRequester.cc b/src/SolverRequester.cc
index cf9f4d5..433dc80 100644 (file)
--- a/src/SolverRequester.cc
+++ b/src/SolverRequester.cc
@@ -436,15 +436,6 @@ void SolverRequester::updateTo(
 
   // ******* report ********
 
-  // no available object (bnc #591760)
-  // !availableEmpty() <=> theone && highest
-  if (s->availableEmpty())
-  {
-    addFeedback(Feedback::NO_UPD_CANDIDATE, cap, repoalias, PoolItem(), installed);
-    DBG << "no available objects in repos, skipping update of " << s->name() << endl;
-    return;
-  }
-
   // the candidate is already installed
   if (identical(installed, candidate))
   {
@@ -461,6 +452,15 @@ void SolverRequester::updateTo(
     }
     // TODO other kinds
 
+    // no available object (bnc #591760)
+    // !availableEmpty() <=> theone && highest
+    if (s->availableEmpty())
+    {
+      addFeedback(Feedback::NO_UPD_CANDIDATE, cap, repoalias, PoolItem(), installed);
+      DBG << "no available objects in repos, skipping update of " << s->name() << endl;
+      return;
+    }
+
     // the highest version is already there
     if (identical(installed, highest) || highest->edition() < installed->edition())
       addFeedback(Feedback::NO_UPD_CANDIDATE, cap, repoalias, candidate, installed);

diff --git a/tests/SolverRequester_test.cc b/tests/SolverRequester_test.cc
index da103fc..7426884 100644 (file)
--- a/tests/SolverRequester_test.cc
+++ b/tests/SolverRequester_test.cc
@@ -208,6 +208,22 @@ BOOST_AUTO_TEST_CASE(install9)
   BOOST_CHECK(sr.hasFeedback(SolverRequester::Feedback::UPD_CANDIDATE_CHANGES_VENDOR));
 }
 
+// request : install stallarium
+// response: already installed, no update candidate (no available objects
+//           in repos)
+BOOST_AUTO_TEST_CASE(install10)
+{
+  MIL << "<============install10===============>" << endl;
+
+  vector<string> rawargs;
+  rawargs.push_back("stellarium");
+  SolverRequester sr;
+
+  sr.install(rawargs);
+
+  BOOST_CHECK(sr.hasFeedback(SolverRequester::Feedback::ALREADY_INSTALLED));
+  BOOST_CHECK(sr.hasFeedback(SolverRequester::Feedback::NO_UPD_CANDIDATE));
+}
 
 
 ///////////////////////////////////////////////////////////////////////////