CLOUDSTACK-8886: Limitations is listUsageRecords output, listUsageRecords does not return domain - Fixed and tests added

Author: kansal

api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java

@@ -253,4 +253,8 @@ public void setCpuSpeed(Long cpuSpeed) {
     public void setMemory(Long memory) {
         this.memory = memory;
     }
+
+    public String getDomainName(){
+        return domainName;
+    }
 }

server/src/com/cloud/api/ApiResponseHelper.java

@@ -3173,6 +3173,7 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord) {
         Domain domain = ApiDBUtils.findDomainById(usageRecord.getDomainId());
         if (domain != null) {
             usageRecResponse.setDomainId(domain.getUuid());
+            usageRecResponse.setDomainName(domain.getName());
         }
 
         if (usageRecord.getZoneId() != null) {

server/test/com/cloud/api/ApiResponseHelperTest.java

@@ -16,21 +16,32 @@
 // under the License.
 package com.cloud.api;
 
-import java.lang.reflect.Field;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.TimeZone;
-
+import com.cloud.domain.DomainVO;
+import com.cloud.usage.UsageVO;
+import com.cloud.user.AccountVO;
+import org.apache.cloudstack.api.response.UsageRecordResponse;
 import org.apache.cloudstack.usage.UsageService;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.lang.reflect.Field;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(ApiDBUtils.class)
 public class ApiResponseHelperTest {
 
     @Mock
@@ -54,15 +65,48 @@ public void injectMocks() throws SecurityException, NoSuchFieldException,
     public void getDateStringInternal() throws ParseException {
         Mockito.when(usageService.getUsageTimezone()).thenReturn(
                 TimeZone.getTimeZone("UTC"));
-        Assert.assertEquals("2014-06-29'T'23:45:00+00:00", helper
+        assertEquals("2014-06-29'T'23:45:00+00:00", helper
                 .getDateStringInternal(dateFormat.parse("2014-06-29 23:45:00 UTC")));
-        Assert.assertEquals("2014-06-29'T'23:45:01+00:00", helper
+        assertEquals("2014-06-29'T'23:45:01+00:00", helper
                 .getDateStringInternal(dateFormat.parse("2014-06-29 23:45:01 UTC")));
-        Assert.assertEquals("2014-06-29'T'23:45:11+00:00", helper
+        assertEquals("2014-06-29'T'23:45:11+00:00", helper
                 .getDateStringInternal(dateFormat.parse("2014-06-29 23:45:11 UTC")));
-        Assert.assertEquals("2014-06-29'T'23:05:11+00:00", helper
+        assertEquals("2014-06-29'T'23:05:11+00:00", helper
                 .getDateStringInternal(dateFormat.parse("2014-06-29 23:05:11 UTC")));
-        Assert.assertEquals("2014-05-29'T'08:45:11+00:00", helper
+        assertEquals("2014-05-29'T'08:45:11+00:00", helper
                 .getDateStringInternal(dateFormat.parse("2014-05-29 08:45:11 UTC")));
     }
+
+    @Test
+    public void testUsageRecordResponse(){
+        //Creating the usageVO object to be passed to the createUsageResponse.
+        Long zoneId = null;
+        Long accountId = null;
+        Long domainId = null;
+        String Description = "Test Object";
+        String usageDisplay = " ";
+        int usageType = -1;
+        Double rawUsage = null;
+        Long vmId = null;
+        String vmName = " ";
+        Long offeringId = null;
+        Long templateId = null;
+        Long usageId = null;
+        Date startDate = null;
+        Date endDate = null;
+        String type = " ";
+        UsageVO usage = new UsageVO(zoneId,accountId,domainId,Description,usageDisplay,usageType,rawUsage,vmId,vmName,offeringId,templateId,usageId,startDate,endDate,type);
+
+        DomainVO domain = new DomainVO();
+        domain.setName("DomainName");
+
+        AccountVO account = new AccountVO();
+
+        PowerMockito.mockStatic(ApiDBUtils.class);
+        when(ApiDBUtils.findAccountById(anyLong())).thenReturn(account);
+        when(ApiDBUtils.findDomainById(anyLong())).thenReturn(domain);
+
+        UsageRecordResponse MockResponse = helper.createUsageResponse(usage);
+        assertEquals("DomainName",MockResponse.getDomainName());
+    }
 }