From dce17eadc5c30b7dbc704f9a3770c5621638ae82 Mon Sep 17 00:00:00 2001
From: Zain Malik <zmalikshxil@gmail.com>
Date: Fri, 16 Jun 2017 14:21:48 +0200
Subject: [PATCH] Add test for the Unavailable offer

---
 .../scheduler/mesos/AvailabilityChecker.scala |  3 +-
 .../mesos/MesosJobFrameworkSpec.scala         | 46 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/AvailabilityChecker.scala b/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/AvailabilityChecker.scala
index a64995f91..19124795d 100644
--- a/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/AvailabilityChecker.scala
+++ b/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/AvailabilityChecker.scala
@@ -12,8 +12,7 @@ object AvailabilityChecker {
   private[this] val log = Logger.getLogger(getClass.getName)
 
   def checkAvailability(offer: Protos.Offer): Boolean = {
-    var unavailability = offer.hasUnavailability
-    var now = System.nanoTime()
+    val now = System.nanoTime()
     if (offer.hasUnavailability && offer.getUnavailability.hasStart) {
       val start = offer.getUnavailability.getStart.getNanoseconds
       if (now.>=(start)) {
diff --git a/src/test/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFrameworkSpec.scala b/src/test/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFrameworkSpec.scala
index f215709d5..77459d21e 100644
--- a/src/test/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFrameworkSpec.scala
+++ b/src/test/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFrameworkSpec.scala
@@ -2,7 +2,7 @@ package org.apache.mesos.chronos.scheduler.mesos
 
 import mesosphere.mesos.protos._
 import mesosphere.mesos.util.FrameworkIdUtil
-import org.apache.mesos.Protos.Offer
+import org.apache.mesos.Protos.{DurationInfo, Offer, TimeInfo, Unavailability}
 import org.apache.mesos.chronos.ChronosTestHelper._
 import org.apache.mesos.chronos.scheduler.jobs.{BaseJob, JobScheduler, MockJobUtils, TaskManager}
 import org.apache.mesos.{Protos, SchedulerDriver}
@@ -76,6 +76,33 @@ class MesosJobFrameworkSpec extends SpecificationWithJUnit with Mockito {
       there was one(mockSchedulerDriver).declineOffer(OfferID("1"), Protos.Filters.getDefaultInstance)
     }
 
+    "Reject unavailable offer" in {
+      import mesosphere.mesos.protos.Implicits._
+
+      import scala.collection.JavaConverters._
+
+      val mockDriverFactory = MockJobUtils.mockDriverFactory
+      val mockSchedulerDriver = mockDriverFactory.get
+
+      val mesosJobFramework = spy(
+        new MesosJobFramework(
+          mockDriverFactory,
+          mock[JobScheduler],
+          mock[TaskManager],
+          makeConfig(),
+          mock[FrameworkIdUtil],
+          mock[MesosTaskBuilder],
+          mock[MesosOfferReviver]))
+
+      val tasks = mutable.Buffer[(String, BaseJob, Offer)]()
+      doReturn(tasks).when(mesosJobFramework).generateLaunchableTasks(any)
+
+      val offer: Offer = makeUnavailableOffer
+      mesosJobFramework.resourceOffers(mockSchedulerDriver, Seq[Protos.Offer](offer).asJava)
+
+      there was one(mockSchedulerDriver).declineOffer(OfferID("1"), Protos.Filters.getDefaultInstance)
+    }
+
     "Reject unused offers with default RefuseSeconds if --decline_offer_duration is not set" in {
       import mesosphere.mesos.protos.Implicits._
 
@@ -176,6 +203,22 @@ class MesosJobFrameworkSpec extends SpecificationWithJUnit with Mockito {
   }
 
   private[this] def makeBasicOffer: Offer = {
+
+    makeBasicOfferBuilder
+      .build()
+  }
+
+  private[this] def makeUnavailableOffer: Offer = {
+
+    makeBasicOfferBuilder.setUnavailability(
+      Unavailability.newBuilder()
+        .setStart(TimeInfo.newBuilder().setNanoseconds(System.nanoTime()))
+        .setDuration(DurationInfo.newBuilder().setNanoseconds(-1l))
+        .build())
+      .build()
+  }
+
+  private[this] def makeBasicOfferBuilder: Offer.Builder = {
     import mesosphere.mesos.protos.Implicits._
 
     Protos.Offer.newBuilder()
@@ -186,7 +229,6 @@ class MesosJobFrameworkSpec extends SpecificationWithJUnit with Mockito {
       .addResources(ScalarResource(Resource.CPUS, 1, "*"))
       .addResources(ScalarResource(Resource.MEM, 100, "*"))
       .addResources(ScalarResource(Resource.DISK, 100, "*"))
-      .build()
   }