Updated test case

w3stling · Dec 17, 2022 · a5d16d7 · a5d16d7
1 parent 0baa4b9
commit a5d16d7
Show file tree

Hide file tree

Showing 2 changed files with 143 additions and 28 deletions.
diff --git a/src/main/java/com/apptasticsoftware/lei/IsinLookup.java b/src/main/java/com/apptasticsoftware/lei/IsinLookup.java
@@ -107,6 +107,7 @@ String sendRequest1(String url, String data) {
         }
 
         var referer = CUSIP_URL.equals(url) ? "https://www.isindb.com/convert-cusip-to-isin/" : "https://www.isindb.com/convert-sedol-to-isin/";
+        String isin = null;
 
         try {
             var request = HttpRequest.newBuilder()
@@ -139,19 +140,8 @@ String sendRequest1(String url, String data) {
             }
 
             var text = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
-            var index = text.indexOf("<strong>");
-            if (index != -1) {
-                var isin = text.substring(index + 8, index + 20);
-                cacheResult(data, isin);
-                return isin;
-            }
-
-            index = text.indexOf("data-clipboard-text=\"");
-            if (index != -1) {
-                var isin = text.substring(index + 21, index + 33);
-                cacheResult(data, isin);
-                return isin;
-            }
+            isin = getIsin(text);
+            cacheResult(data, isin);
         } catch (InterruptedException e) {
             var logger = Logger.getLogger(LOGGER);
             logger.severe(e.getMessage());
@@ -161,7 +151,7 @@ String sendRequest1(String url, String data) {
             logger.severe(e.getMessage());
         }
 
-        return null;
+        return isin;
     }
 
     String sendRequest2(String url, String data) {
@@ -171,6 +161,7 @@ String sendRequest2(String url, String data) {
         }
 
         var referer = CUSIP_URL.equals(url) ? "https://www.isindb.com/convert-cusip-to-isin/" : "https://www.isindb.com/convert-sedol-to-isin/";
+        String isin = null;
 
         try {
             Connection.Response loginForm = Jsoup.connect(referer)
@@ -198,29 +189,42 @@ String sendRequest2(String url, String data) {
 
             var document = response.parse();
             var text = document.body().html();
-            var index = text.indexOf("<strong>");
-            if (index != -1) {
-                var isin = text.substring(index + 8, index + 20);
-                cacheResult(data, isin);
-                return isin;
-            }
-
-            index = text.indexOf("data-clipboard-text=\"");
-            if (index != -1) {
-                var isin = text.substring(index + 21, index + 33);
-                cacheResult(data, isin);
-                return isin;
-            }
+            isin = getIsin(text);
+            cacheResult(data, isin);
         } catch (Exception e) {
             var logger = Logger.getLogger(LOGGER);
             logger.severe(e.getMessage());
         }
 
+        return isin;
+    }
+
+    private String getIsin(String text) {
+        var isin = parseIsin1(text);
+        if (isin == null) {
+            isin = parseIsin2(text);
+        }
+        return isin;
+    }
+
+    String parseIsin1(String text) {
+        var index = text.indexOf("<strong>");
+        if (index != -1) {
+            return text.substring(index + 8, index + 20);
+        }
+        return null;
+    }
+
+    String parseIsin2(String text) {
+        int index = text.indexOf("data-clipboard-text=\"");
+        if (index != -1) {
+            return text.substring(index + 21, index + 33);
+        }
         return null;
     }
 
     private void cacheResult(String key, String value) {
-        if (cache.containsKey(key)) {
+        if (value == null || cache.containsKey(key)) {
             return;
         }
         cache.put(key, value);

diff --git a/src/test/java/com/apptasticsoftware/lei/IsinLookupTest.java b/src/test/java/com/apptasticsoftware/lei/IsinLookupTest.java
@@ -13,14 +13,69 @@ class IsinLookupTest {
         String sendRequest2(String url, String data) {
             return null;
         }
+
+        @Override
+        String parseIsin2(String text) {
+            return null;
+        }
+    };
+
+    private static final IsinLookup lookup1Parse1 = new IsinLookup() {
+        @Override
+        String sendRequest2(String url, String data) {
+            return null;
+        }
+
+        @Override
+        String parseIsin2(String text) {
+            return null;
+        }
     };
+
+    private static final IsinLookup lookup1Parse2 = new IsinLookup() {
+        @Override
+        String sendRequest2(String url, String data) {
+            return null;
+        }
+
+        @Override
+        String parseIsin1(String text) {
+            return null;
+        }
+    };
+
     private static final IsinLookup lookup2 = new IsinLookup() {
         @Override
         String sendRequest1(String url, String data) {
             return null;
         }
     };
 
+    private static final IsinLookup lookup2Parse1 = new IsinLookup() {
+        @Override
+        String sendRequest1(String url, String data) {
+            return null;
+        }
+
+        @Override
+        String parseIsin2(String text) {
+            return null;
+        }
+    };
+
+    private static final IsinLookup lookup2Parse2 = new IsinLookup() {
+        @Override
+        String sendRequest1(String url, String data) {
+            return null;
+        }
+
+        @Override
+        String parseIsin1(String text) {
+            return null;
+        }
+    };
+
+
     @Test
     void lookupByCusip() {
         assertTrue(lookup.getIsinByCusip("931142103").isPresent());
@@ -35,13 +90,41 @@ void lookupByCusipMethod1() {
         assertFalse(lookup.getIsinByCusip("").isPresent());
     }
 
+    @Test
+    void lookupByCusipMethod1Parse1() {
+        assertTrue(lookup1Parse1.getIsinByCusip("931142103").isPresent());
+        assertTrue(lookup1Parse1.getIsinByCusip("931142103").isPresent());
+        assertFalse(lookup1Parse1.getIsinByCusip("").isPresent());
+    }
+
+    @Test
+    void lookupByCusipMethod1Parse2() {
+        assertTrue(lookup1Parse2.getIsinByCusip("931142103").isPresent());
+        assertTrue(lookup1Parse2.getIsinByCusip("931142103").isPresent());
+        assertFalse(lookup1Parse2.getIsinByCusip("").isPresent());
+    }
+
     @Test
     void lookupByCusipMethod2() {
         assertTrue(lookup2.getIsinByCusip("931142103").isPresent());
         assertTrue(lookup2.getIsinByCusip("931142103").isPresent());
         assertFalse(lookup.getIsinByCusip("").isPresent());
     }
 
+    @Test
+    void lookupByCusipMethod2Parse1() {
+        assertTrue(lookup2Parse1.getIsinByCusip("931142103").isPresent());
+        assertTrue(lookup2Parse1.getIsinByCusip("931142103").isPresent());
+        assertFalse(lookup2Parse1.getIsinByCusip("").isPresent());
+    }
+
+    @Test
+    void lookupByCusipMethod2Parse2() {
+        assertTrue(lookup2Parse2.getIsinByCusip("931142103").isPresent());
+        assertTrue(lookup2Parse2.getIsinByCusip("931142103").isPresent());
+        assertFalse(lookup2Parse2.getIsinByCusip("").isPresent());
+    }
+
     @Test
     void lookupBySedol() {
         assertTrue(lookup.getIsinBySedol("0884709").isPresent());
@@ -56,10 +139,38 @@ void lookupBySedolMethod1() {
         assertFalse(lookup.getIsinBySedol("").isPresent());
     }
 
+    @Test
+    void lookupBySedolMethod1Parse1() {
+        assertTrue(lookup1Parse1.getIsinBySedol("0884709").isPresent());
+        assertTrue(lookup1Parse1.getIsinBySedol("0884709").isPresent());
+        assertFalse(lookup1Parse1.getIsinBySedol("").isPresent());
+    }
+
+    @Test
+    void lookupBySedolMethod1Parse12() {
+        assertTrue(lookup1Parse2.getIsinBySedol("0884709").isPresent());
+        assertTrue(lookup1Parse2.getIsinBySedol("0884709").isPresent());
+        assertFalse(lookup1Parse2.getIsinBySedol("").isPresent());
+    }
+
     @Test
     void lookupBySedolMethod2() {
         assertTrue(lookup2.getIsinBySedol("0884709").isPresent());
         assertTrue(lookup2.getIsinBySedol("0884709").isPresent());
         assertFalse(lookup.getIsinBySedol("").isPresent());
     }
+
+    @Test
+    void lookupBySedolMethod2Parse1() {
+        assertTrue(lookup2Parse1.getIsinBySedol("0884709").isPresent());
+        assertTrue(lookup2Parse1.getIsinBySedol("0884709").isPresent());
+        assertFalse(lookup2Parse1.getIsinBySedol("").isPresent());
+    }
+
+    @Test
+    void lookupBySedolMethod2Parse2() {
+        assertTrue(lookup2Parse2.getIsinBySedol("0884709").isPresent());
+        assertTrue(lookup2Parse2.getIsinBySedol("0884709").isPresent());
+        assertFalse(lookup2Parse2.getIsinBySedol("").isPresent());
+    }
 }