From ab26fd173003073725743b71f89e3797bf390995 Mon Sep 17 00:00:00 2001 From: arus2023 Date: Thu, 5 Oct 2023 21:54:35 -0500 Subject: [PATCH] Removed 2 unnecessary stubbings in HomekitRootTest.java --- .../hapjava/server/impl/HomekitServer.java | 4 +- .../HomekitStandaloneAccessoryServer.java | 2 +- .../server/impl/FourthHomekitRootTest.java | 55 ++++++++++++++ .../hapjava/server/impl/HomekitRootTest.java | 56 --------------- .../server/impl/SecondHomekitRootTest.java | 72 +++++++++++++++++++ .../server/impl/ThirdHomekitRootTest.java | 42 +++++++++++ 6 files changed, 173 insertions(+), 58 deletions(-) create mode 100644 src/test/java/io/github/hapjava/server/impl/FourthHomekitRootTest.java create mode 100644 src/test/java/io/github/hapjava/server/impl/SecondHomekitRootTest.java create mode 100644 src/test/java/io/github/hapjava/server/impl/ThirdHomekitRootTest.java diff --git a/src/main/java/io/github/hapjava/server/impl/HomekitServer.java b/src/main/java/io/github/hapjava/server/impl/HomekitServer.java index fc8ecaf76..7728896a2 100644 --- a/src/main/java/io/github/hapjava/server/impl/HomekitServer.java +++ b/src/main/java/io/github/hapjava/server/impl/HomekitServer.java @@ -117,13 +117,15 @@ public HomekitStandaloneAccessoryServer createStandaloneAccessory( return new HomekitStandaloneAccessoryServer(accessory, http, localAddress, authInfo); } } + public HomekitStandaloneAccessoryServer createStandaloneAccessory( HomekitAuthInfo authInfo, HomekitAccessory accessory, int category) throws IOException, ExecutionException, InterruptedException { if (jmdns != null) { return new HomekitStandaloneAccessoryServer(accessory, http, jmdns, authInfo, category); } else { - return new HomekitStandaloneAccessoryServer(accessory, http, localAddress, authInfo, category); + return new HomekitStandaloneAccessoryServer( + accessory, http, localAddress, authInfo, category); } } diff --git a/src/main/java/io/github/hapjava/server/impl/HomekitStandaloneAccessoryServer.java b/src/main/java/io/github/hapjava/server/impl/HomekitStandaloneAccessoryServer.java index 99ff7b746..4a5dbabee 100644 --- a/src/main/java/io/github/hapjava/server/impl/HomekitStandaloneAccessoryServer.java +++ b/src/main/java/io/github/hapjava/server/impl/HomekitStandaloneAccessoryServer.java @@ -40,7 +40,7 @@ public class HomekitStandaloneAccessoryServer { root = new HomekitRoot(accessory.getName().get(), webHandler, jmdns, authInfo); root.addAccessory(accessory); } - + HomekitStandaloneAccessoryServer( HomekitAccessory accessory, HomekitWebHandler webHandler, diff --git a/src/test/java/io/github/hapjava/server/impl/FourthHomekitRootTest.java b/src/test/java/io/github/hapjava/server/impl/FourthHomekitRootTest.java new file mode 100644 index 000000000..e720c8945 --- /dev/null +++ b/src/test/java/io/github/hapjava/server/impl/FourthHomekitRootTest.java @@ -0,0 +1,55 @@ +package io.github.hapjava.server.impl; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import io.github.hapjava.accessories.HomekitAccessory; +import io.github.hapjava.server.HomekitAccessoryCategories; +import io.github.hapjava.server.HomekitAuthInfo; +import io.github.hapjava.server.HomekitWebHandler; +import io.github.hapjava.server.impl.jmdns.JmdnsHomekitAdvertiser; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +public class FourthHomekitRootTest { + + private HomekitAccessory accessory; + private HomekitRoot root; + private HomekitWebHandler webHandler; + private JmdnsHomekitAdvertiser advertiser; + private HomekitAuthInfo authInfo; + + private static final int PORT = 12345; + private static final String SETUPID = "Gx12"; + + private static final String LABEL = "Test Label"; + + @Before + public void setup() throws Exception { + accessory = mock(HomekitAccessory.class); + when(accessory.getId()).thenReturn(2); + webHandler = mock(HomekitWebHandler.class); + advertiser = mock(JmdnsHomekitAdvertiser.class); + authInfo = mock(HomekitAuthInfo.class); + root = + new HomekitRoot(LABEL, HomekitAccessoryCategories.OTHER, webHandler, authInfo, advertiser); + } + + @Test + public void verifyRegistryAdded() throws Exception { + root.addAccessory(accessory); + Assert.assertTrue( + "Registry does not contain accessory", + root.getRegistry().getAccessories().contains(accessory)); + } + + @Test + public void verifyRegistryRemoved() throws Exception { + root.addAccessory(accessory); + root.removeAccessory(accessory); + Assert.assertFalse( + "Registry still contains accessory", + root.getRegistry().getAccessories().contains(accessory)); + } +} diff --git a/src/test/java/io/github/hapjava/server/impl/HomekitRootTest.java b/src/test/java/io/github/hapjava/server/impl/HomekitRootTest.java index 81d2666e5..8656f6793 100644 --- a/src/test/java/io/github/hapjava/server/impl/HomekitRootTest.java +++ b/src/test/java/io/github/hapjava/server/impl/HomekitRootTest.java @@ -1,7 +1,6 @@ package io.github.hapjava.server.impl; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -11,10 +10,8 @@ import io.github.hapjava.server.HomekitAccessoryCategories; import io.github.hapjava.server.HomekitAuthInfo; import io.github.hapjava.server.HomekitWebHandler; -import io.github.hapjava.server.impl.http.HomekitClientConnectionFactory; import io.github.hapjava.server.impl.jmdns.JmdnsHomekitAdvertiser; import java.util.concurrent.CompletableFuture; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -43,53 +40,6 @@ public void setup() throws Exception { new HomekitRoot(LABEL, HomekitAccessoryCategories.OTHER, webHandler, authInfo, advertiser); } - @Test - public void verifyRegistryAdded() throws Exception { - root.addAccessory(accessory); - Assert.assertTrue( - "Registry does not contain accessory", - root.getRegistry().getAccessories().contains(accessory)); - } - - @Test - public void verifyRegistryRemoved() throws Exception { - root.addAccessory(accessory); - root.removeAccessory(accessory); - Assert.assertFalse( - "Registry still contains accessory", - root.getRegistry().getAccessories().contains(accessory)); - } - - @Test - public void testWebHandlerStarts() throws Exception { - root.start(); - verify(webHandler).start(any(HomekitClientConnectionFactory.class)); - } - - @Test - public void testWebHandlerStops() throws Exception { - root.start(); - root.stop(); - verify(webHandler).stop(); - } - - @Test - public void testAdvertiserStarts() throws Exception { - final String mac = "00:00:00:00:00:00"; - when(authInfo.getMac()).thenReturn(mac); - when(authInfo.getSetupId()).thenReturn(SETUPID); - - root.start(); - verify(advertiser).advertise(eq(LABEL), eq(1), eq(mac), eq(PORT), eq(1), eq(SETUPID)); - } - - @Test - public void testAdvertiserStops() throws Exception { - root.start(); - root.stop(); - verify(advertiser).stop(); - } - @Test public void testAddAccessoryDoesntResetWeb() { root.start(); @@ -104,10 +54,4 @@ public void testRemoveAccessoryDoesntResetWeb() { root.removeAccessory(accessory); verify(webHandler, never()).resetConnections(); } - - @Test(expected = IndexOutOfBoundsException.class) - public void testAddIndexOneAccessory() throws Exception { - when(accessory.getId()).thenReturn(1); - root.addAccessory(accessory); - } } diff --git a/src/test/java/io/github/hapjava/server/impl/SecondHomekitRootTest.java b/src/test/java/io/github/hapjava/server/impl/SecondHomekitRootTest.java new file mode 100644 index 000000000..0353e48fd --- /dev/null +++ b/src/test/java/io/github/hapjava/server/impl/SecondHomekitRootTest.java @@ -0,0 +1,72 @@ +package io.github.hapjava.server.impl; + +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import io.github.hapjava.accessories.HomekitAccessory; +import io.github.hapjava.server.HomekitAccessoryCategories; +import io.github.hapjava.server.HomekitAuthInfo; +import io.github.hapjava.server.HomekitWebHandler; +import io.github.hapjava.server.impl.http.HomekitClientConnectionFactory; +import io.github.hapjava.server.impl.jmdns.JmdnsHomekitAdvertiser; +import java.util.concurrent.CompletableFuture; +import org.junit.Before; +import org.junit.Test; + +public class SecondHomekitRootTest { + + private HomekitAccessory accessory; + private HomekitRoot root; + private HomekitWebHandler webHandler; + private JmdnsHomekitAdvertiser advertiser; + private HomekitAuthInfo authInfo; + + private static final int PORT = 12345; + private static final String SETUPID = "Gx12"; + + private static final String LABEL = "Test Label"; + + @Before + public void setup() throws Exception { + accessory = mock(HomekitAccessory.class); + webHandler = mock(HomekitWebHandler.class); + when(webHandler.start(any())).thenReturn(CompletableFuture.completedFuture(PORT)); + advertiser = mock(JmdnsHomekitAdvertiser.class); + authInfo = mock(HomekitAuthInfo.class); + root = + new HomekitRoot(LABEL, HomekitAccessoryCategories.OTHER, webHandler, authInfo, advertiser); + } + + @Test + public void testWebHandlerStarts() throws Exception { + root.start(); + verify(webHandler).start(any(HomekitClientConnectionFactory.class)); + } + + @Test + public void testWebHandlerStops() throws Exception { + root.start(); + root.stop(); + verify(webHandler).stop(); + } + + @Test + public void testAdvertiserStarts() throws Exception { + final String mac = "00:00:00:00:00:00"; + when(authInfo.getMac()).thenReturn(mac); + when(authInfo.getSetupId()).thenReturn(SETUPID); + + root.start(); + verify(advertiser).advertise(eq(LABEL), eq(1), eq(mac), eq(PORT), eq(1), eq(SETUPID)); + } + + @Test + public void testAdvertiserStops() throws Exception { + root.start(); + root.stop(); + verify(advertiser).stop(); + } +} diff --git a/src/test/java/io/github/hapjava/server/impl/ThirdHomekitRootTest.java b/src/test/java/io/github/hapjava/server/impl/ThirdHomekitRootTest.java new file mode 100644 index 000000000..8fc5f0892 --- /dev/null +++ b/src/test/java/io/github/hapjava/server/impl/ThirdHomekitRootTest.java @@ -0,0 +1,42 @@ +package io.github.hapjava.server.impl; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import io.github.hapjava.accessories.HomekitAccessory; +import io.github.hapjava.server.HomekitAccessoryCategories; +import io.github.hapjava.server.HomekitAuthInfo; +import io.github.hapjava.server.HomekitWebHandler; +import io.github.hapjava.server.impl.jmdns.JmdnsHomekitAdvertiser; +import org.junit.Before; +import org.junit.Test; + +public class ThirdHomekitRootTest { + + private HomekitAccessory accessory; + private HomekitRoot root; + private HomekitWebHandler webHandler; + private JmdnsHomekitAdvertiser advertiser; + private HomekitAuthInfo authInfo; + + private static final int PORT = 12345; + private static final String SETUPID = "Gx12"; + + private static final String LABEL = "Test Label"; + + @Before + public void setup() throws Exception { + accessory = mock(HomekitAccessory.class); + webHandler = mock(HomekitWebHandler.class); + advertiser = mock(JmdnsHomekitAdvertiser.class); + authInfo = mock(HomekitAuthInfo.class); + root = + new HomekitRoot(LABEL, HomekitAccessoryCategories.OTHER, webHandler, authInfo, advertiser); + } + + @Test(expected = IndexOutOfBoundsException.class) + public void testAddIndexOneAccessory() throws Exception { + when(accessory.getId()).thenReturn(1); + root.addAccessory(accessory); + } +}