Moti Asayag has uploaded a new change for review. Change subject: engine: Replace warnings suppress with proper matcher ......................................................................
engine: Replace warnings suppress with proper matcher anySetOf(Class) eliminates the need to suppress type check. Change-Id: I4948c743dcfe22330e22591bab385d6fd9f3f35f Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/GlusterUtilTest.java 1 file changed, 6 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/38537/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/GlusterUtilTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/GlusterUtilTest.java index 4ab7200..98eb21b 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/GlusterUtilTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/GlusterUtilTest.java @@ -3,7 +3,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anySetOf; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; @@ -58,14 +58,13 @@ doThrow(AuthenticationException.class).when(glusterUtil).authenticate(client, USER, WRONG_PASSWORD); } - @SuppressWarnings("unchecked") @Test public void testGetPeersWithFingerprint() throws AuthenticationException, IOException { EXPECTED_MAP.put(SERVER_NAME1, FINGER_PRINT1); EXPECTED_MAP.put(SERVER_NAME2, FINGER_PRINT2); doReturn(client).when(glusterUtil).getSSHClient(); doNothing().when(glusterUtil).connect(client, SERVER_NAME1); - doReturn(EXPECTED_MAP).when(glusterUtil).getFingerprints(any(Set.class)); + doReturn(EXPECTED_MAP).when(glusterUtil).getFingerprints(anySetOf(String.class)); Map<String, String> peers = glusterUtil.getPeers(SERVER_NAME1, USER, PASSWORD, FINGER_PRINT1); assertNotNull(peers); peers.containsKey(SERVER_NAME1); @@ -74,34 +73,31 @@ assertEquals(FINGER_PRINT2, peers.get(SERVER_NAME2)); } - @SuppressWarnings("unchecked") @Test public void testGetPeers() throws AuthenticationException, IOException { EXPECTED_MAP.put(SERVER_NAME1, FINGER_PRINT1); EXPECTED_MAP.put(SERVER_NAME2, FINGER_PRINT2); doReturn(client).when(glusterUtil).getSSHClient(); doNothing().when(glusterUtil).connect(client, SERVER_NAME1); - doReturn(EXPECTED_MAP).when(glusterUtil).getFingerprints(any(Set.class)); + doReturn(EXPECTED_MAP).when(glusterUtil).getFingerprints(anySetOf(String.class)); Set<String> peers = glusterUtil.getPeers(SERVER_NAME1, USER, PASSWORD); assertNotNull(peers); assertTrue(peers.contains(SERVER_NAME1)); assertTrue(peers.contains(SERVER_NAME2)); } - @SuppressWarnings("unchecked") @Test(expected = AuthenticationException.class) public void testGetPeersWithWrongPassword() throws AuthenticationException, IOException { EXPECTED_MAP.put(SERVER_NAME1, FINGER_PRINT1); doReturn(client).when(glusterUtil).getSSHClient(); - doReturn(EXPECTED_MAP).when(glusterUtil).getFingerprints(any(Set.class)); + doReturn(EXPECTED_MAP).when(glusterUtil).getFingerprints(anySetOf(String.class)); glusterUtil.getPeers(SERVER_NAME1, USER, WRONG_PASSWORD); } - @SuppressWarnings("unchecked") @Test public void testHasPeersTrue() { EXPECTED_MAP.put(SERVER_NAME1, FINGER_PRINT1); - doReturn(EXPECTED_MAP).when(glusterUtil).getFingerprints(any(Set.class)); + doReturn(EXPECTED_MAP).when(glusterUtil).getFingerprints(anySetOf(String.class)); assertNotNull(glusterUtil.getPeers(client)); assertEquals(2, glusterUtil.getPeers(client).size()); } @@ -109,7 +105,7 @@ @Test public void testHasPeersFalse() { EXPECTED_MAP.put(SERVER_NAME1, FINGER_PRINT1); - doReturn(EXPECTED_MAP).when(glusterUtil).getFingerprints(any(Set.class)); + doReturn(EXPECTED_MAP).when(glusterUtil).getFingerprints(anySetOf(String.class)); doReturn(OUTPUT_XML_NO_PEERS).when(glusterUtil).executePeerStatusCommand(client); assertTrue(glusterUtil.getPeers(client).isEmpty()); } -- To view, visit https://gerrit.ovirt.org/38537 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4948c743dcfe22330e22591bab385d6fd9f3f35f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
