minor clean up

Author: aoberoi

src/main/java/com/opentok/OpenTok.java

@@ -154,13 +154,13 @@ public String generateToken(String sessionId, TokenOptions tokenOptions) throws
         if (!sessionIdParts.contains(Integer.toString(this.apiKey))) {
             throw new InvalidArgumentException("Session ID was not valid");
         }
-        
+
+        // NOTE: kind of wasteful of a Session instance
         Session session = new Session(sessionId, apiKey, apiSecret);
         return session.generateToken(tokenOptions);
     }
 
     public String generateToken(String sessionId) throws OpenTokException {
-        // NOTE: should there be a static defaultTokenOptions?
         return generateToken(sessionId, new TokenOptions.Builder().build());
     }
 

src/test/java/com/opentok/test/OpenTokTest.java

@@ -343,37 +343,5 @@ public void testTokenBadSessionId() throws OpenTokException {
             assertEquals(InvalidArgumentException.class, e.getClass());
         }
     }
-//    @Test
-//    public void testTokenNullSessionId() throws OpenTokException {
-//        OpenTokException expected = null;
-//        try {
-//            sdk.generateToken(null);
-//        } catch (OpenTokException e) {
-//            expected = e;
-//        }
-//        Assert.assertNotNull("Java SDK tests: exception should be thrown for null sessionId", expected);
-//    }
-//
-//
-//    public void testTokenEmptySessionId() throws OpenTokException {
-//        OpenTokException expected = null;
-//        try {
-//            sdk.generateToken("");
-//        } catch (OpenTokException e) {
-//            expected = e;
-//        }
-//        Assert.assertNotNull("Java SDK tests: exception should be thrown for empty sessionId", expected);
-//    }
-//
-//    @Test
-//    public void testTokenIncompleteSessionId() throws OpenTokException {
-//        OpenTokException expected = null;
-//        try {
-//            sdk.generateToken("jkasjda2ndasd");
-//        } catch (OpenTokException e) {
-//            expected = e;
-//        }
-//        Assert.assertNotNull("Java SDK tests: exception should be thrown for invalid sessionId", expected);
-//    }
 
 }