Changeset 10 for profileconnection/src

Timestamp:

01/28/20 10:19:54 (4 years ago)

Author:

bart

Message:

Update 28 jan 2020

Location:

profileconnection/src

Files:

• main/java/geniusweb/profileconnection/ProfileInterface.java (modified) (2 diffs)
• main/java/geniusweb/profileconnection/WebsocketProfileConnector.java (modified) (2 diffs)
• test/java/geniusweb/profileconnection/WebsocketProfileConnectorTest.java (modified) (5 diffs)

profileconnection/src/main/java/geniusweb/profileconnection/ProfileInterface.java

@@ -1 +1 @@
 package geniusweb.profileconnection;
+
+import java.io.IOException;
 
 import geniusweb.profile.Profile;
@@ -12 +14 @@
          * @return the latest version of the profile. May change at any time, after
          *         someone updates the version on the server. Call to this may block
-         *         for limited time if the profile is not yet available. May return
-         *         null if the profile is not available.
-         */
-        public Profile getProfile();
+         *         for limited time if the profile is not yet available. 
+         *         @throws IOException if profile can not be fetched     */
+        public Profile getProfile() throws IOException;
 }

profileconnection/src/main/java/geniusweb/profileconnection/WebsocketProfileConnector.java

@@ -69 +69 @@
 
         @Override
-        public Profile getProfile() {
+        public Profile getProfile() throws IOException {
                 int remaining_wait = TIMEOUT_MS;
                 try {
@@ -80 +80 @@
                                         e);
                 }
+                if (profile == null) {
+                        throw new IOException("Failed to fetch profile");
+                }
                 return profile;
         }

profileconnection/src/test/java/geniusweb/profileconnection/WebsocketProfileConnectorTest.java

@@ -3 +3 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -22 +21 @@
 
 import geniusweb.profile.Profile;
-import geniusweb.profileconnection.WebsocketProfileConnector;
 import tudelft.utilities.logging.Reporter;
 
@@ -42 +40 @@
 
         @Test
-        public void testOnOpen()
+        public void onOpenSmokeTest()
                         throws IOException, DeploymentException, URISyntaxException {
                 WebsocketProfileConnector connector = new WebsocketProfileConnector(
                                 new URI("ws://someprofile"), reporter, wscontainer);
                 connector.onOpen(session);
-                assertNull(connector.getProfile());
         }
 
@@ -93 +90 @@
         }
 
-        @Test
+        @Test(expected = IOException.class)
         public void testGetProfileTimeout()
                         throws DeploymentException, IOException, URISyntaxException {
@@ -116 +113 @@
                         }
                 }).start();
-                Profile profile = connector.getProfile();
-                assertNull(profile);
+                connector.getProfile();
         }