Merge pull request #209 from erfanara/master

[FIX] cloudlet: Add check for Cloudlet completion in getRemainingCloudletLength()

Author: deRemo

modules/cloudsim/src/main/java/org/cloudbus/cloudsim/Cloudlet.java

@@ -1205,6 +1205,10 @@ public long getCloudletFinishedSoFar(final int resId) {
      * @post $result >= 0
      */
     public long getRemainingCloudletLength() {
+        // Check if Cloudlet is finished
+        if (getCloudletLength() == getCloudletFinishedSoFar())
+            return 0;
+
         long length = getCloudletTotalLength()*Consts.MILLION - getCloudletFinishedSoFar();
 
         // Remaining Cloudlet length can't be negative number.

modules/cloudsim/src/test/java/org/cloudbus/cloudsim/CloudletSchedulerSingleServiceTest.java

@@ -137,6 +137,9 @@ public void testCloudletFinish() {
 		vmScheduler.cloudletFinish(cloudlet);
 
 		assertEquals(Cloudlet.CloudletStatus.SUCCESS, vmScheduler.getCloudletStatus(0));
+		assertEquals(0, cloudlet.getRemainingCloudletLength());
+		assertEquals(true, cloudlet.isFinished());
+		assertEquals(CLOUDLET_LENGTH, cloudlet.getCloudletFinishedSoFar());
 		assertTrue(vmScheduler.isFinishedCloudlets());
 		assertSame(cloudlet, vmScheduler.getNextFinishedCloudlet());
 	}

modules/cloudsim/src/test/java/org/cloudbus/cloudsim/CloudletTest.java

@@ -57,6 +57,8 @@ public void testCloudlet() {
 		assertSame(utilizationModelCpu, cloudlet.getUtilizationModelCpu());
 		assertSame(utilizationModelRam, cloudlet.getUtilizationModelRam());
 		assertSame(utilizationModelBw, cloudlet.getUtilizationModelBw());
+		assertEquals(CLOUDLET_LENGTH * PES_NUMBER, cloudlet.getRemainingCloudletLength());
+		assertEquals(0, cloudlet.getCloudletFinishedSoFar());
 	}
 
 	@Test