[Engine-patches] Change in ovirt-engine[master]: restapi: fix unit tests that use java assertions

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: restapi: fix unit tests that use java assertions
......................................................................

restapi: fix unit tests that use java assertions

Replaced java assertions with junit assertions

Change-Id: Iffe7d5a845e886d2961c28f1eed5c32bb924e067
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M 
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/utils/test/UsbResourceUtilsTest.java
M 
backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/UsbMapperUtilsTest.java
2 files changed, 20 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/9767/1

diff --git 
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/utils/test/UsbResourceUtilsTest.java
 
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/utils/test/UsbResourceUtilsTest.java
index 805870f..7ae2209 100644
--- 
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/utils/test/UsbResourceUtilsTest.java
+++ 
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/utils/test/UsbResourceUtilsTest.java
@@ -1,5 +1,7 @@
 package org.ovirt.engine.api.restapi.resource.utils.test;
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 import org.ovirt.engine.api.model.Usb;
 import org.ovirt.engine.api.restapi.resource.utils.UsbResourceUtils;
@@ -12,14 +14,14 @@
     public void getUsbPolicyNullUsb() {
         Usb usb = null;
         VDSGroup vdsGroup = new VDSGroup();
-        assert(UsbResourceUtils.getUsbPolicy(usb, 
vdsGroup).equals(UsbPolicy.DISABLED));
+        assertEquals(UsbResourceUtils.getUsbPolicy(usb, vdsGroup), 
UsbPolicy.DISABLED);
     }
 
     @Test
     public void getUsbPolicyIsSetDisabled() {
         Usb usb = new Usb();
         VDSGroup vdsGroup = new VDSGroup();
-        assert(UsbResourceUtils.getUsbPolicy(usb, 
vdsGroup).equals(UsbPolicy.DISABLED));
+        assertEquals(UsbResourceUtils.getUsbPolicy(usb, vdsGroup), 
UsbPolicy.DISABLED);
     }
 
     @Test
@@ -27,7 +29,7 @@
         Usb usb = new Usb();
         usb.setEnabled(false);
         VDSGroup vdsGroup = new VDSGroup();
-        assert(UsbResourceUtils.getUsbPolicy(usb, 
vdsGroup).equals(UsbPolicy.DISABLED));
+        assertEquals(UsbResourceUtils.getUsbPolicy(usb, vdsGroup), 
UsbPolicy.DISABLED);
     }
 
     @Test
@@ -36,7 +38,7 @@
         usb.setEnabled(true);
         usb.setType("native");
         VDSGroup vdsGroup = new VDSGroup();
-        assert(UsbResourceUtils.getUsbPolicy(usb, 
vdsGroup).equals(UsbPolicy.ENABLED_NATIVE));
+        assertEquals(UsbResourceUtils.getUsbPolicy(usb, vdsGroup), 
UsbPolicy.ENABLED_NATIVE);
     }
 
     @Test
@@ -45,7 +47,7 @@
         usb.setEnabled(true);
         usb.setType("legacy");
         VDSGroup vdsGroup = new VDSGroup();
-        assert(UsbResourceUtils.getUsbPolicy(usb, 
vdsGroup).equals(UsbPolicy.ENABLED_LEGACY));
+        assertEquals(UsbResourceUtils.getUsbPolicy(usb, vdsGroup), 
UsbPolicy.ENABLED_LEGACY);
     }
 
     @Test
@@ -54,7 +56,7 @@
         usb.setEnabled(true);
         VDSGroup vdsGroup = new VDSGroup();
         vdsGroup.setcompatibility_version(Version.v3_1);
-        assert(UsbResourceUtils.getUsbPolicy(usb, 
vdsGroup).equals(UsbPolicy.ENABLED_NATIVE));
+        assertEquals(UsbResourceUtils.getUsbPolicy(usb, vdsGroup), 
UsbPolicy.ENABLED_NATIVE);
     }
 
     @Test
@@ -63,7 +65,7 @@
         usb.setEnabled(true);
         VDSGroup vdsGroup = new VDSGroup();
         vdsGroup.setcompatibility_version(Version.v3_0);
-        assert(UsbResourceUtils.getUsbPolicy(usb, 
vdsGroup).equals(UsbPolicy.ENABLED_LEGACY));
+        assertEquals(UsbResourceUtils.getUsbPolicy(usb, vdsGroup), 
UsbPolicy.ENABLED_LEGACY);
     }
 
 }
diff --git 
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/UsbMapperUtilsTest.java
 
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/UsbMapperUtilsTest.java
index 421d169..bd130b9 100644
--- 
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/UsbMapperUtilsTest.java
+++ 
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/UsbMapperUtilsTest.java
@@ -1,5 +1,10 @@
 package org.ovirt.engine.api.restapi.utils;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 import org.ovirt.engine.api.model.UsbType;
 import org.ovirt.engine.core.common.businessentities.UsbPolicy;
@@ -9,37 +14,37 @@
     @Test
     public void getIsUsbEnabledEnabledLegacy() {
         UsbPolicy usbPolicy = UsbPolicy.ENABLED_LEGACY;
-        assert(UsbMapperUtils.getIsUsbEnabled(usbPolicy));
+        assertTrue(UsbMapperUtils.getIsUsbEnabled(usbPolicy));
     }
 
     @Test
     public void getIsUsbEnabledEnabledNative() {
         UsbPolicy usbPolicy = UsbPolicy.ENABLED_NATIVE;
-        assert(UsbMapperUtils.getIsUsbEnabled(usbPolicy));
+        assertTrue(UsbMapperUtils.getIsUsbEnabled(usbPolicy));
     }
 
     @Test
     public void getIsUsbEnabledDisabled() {
         UsbPolicy usbPolicy = UsbPolicy.DISABLED;
-        assert(!UsbMapperUtils.getIsUsbEnabled(usbPolicy));
+        assertFalse(UsbMapperUtils.getIsUsbEnabled(usbPolicy));
     }
 
     @Test
     public void getUsbTypeEnabledLegacy() {
         UsbPolicy usbPolicy = UsbPolicy.ENABLED_LEGACY;
-        assert(UsbMapperUtils.getUsbType(usbPolicy).equals(UsbType.LEGACY));
+        assertEquals(UsbMapperUtils.getUsbType(usbPolicy), UsbType.LEGACY);
     }
 
     @Test
     public void getUsbTypeEnabledNative() {
         UsbPolicy usbPolicy = UsbPolicy.ENABLED_NATIVE;
-        assert(UsbMapperUtils.getUsbType(usbPolicy).equals(UsbType.NATIVE));
+        assertEquals(UsbMapperUtils.getUsbType(usbPolicy), UsbType.NATIVE);
     }
 
     @Test
     public void getUsbTypeDisabled() {
         UsbPolicy usbPolicy = UsbPolicy.DISABLED;
-        assert(UsbMapperUtils.getUsbType(usbPolicy) == null);
+        assertNull(UsbMapperUtils.getUsbType(usbPolicy));
     }
 
 }


--
To view, visit http://gerrit.ovirt.org/9767
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffe7d5a845e886d2961c28f1eed5c32bb924e067
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches