X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=datafilecollector%2Fsrc%2Ftest%2Fjava%2Forg%2Foran%2Fdatafile%2Fhttp%2FHttpUtilsTest.java;h=05f4492131763df16e7542bbda28c5d94d89f990;hb=a93caaf7243d896161775d590f1ab322dd63ee16;hp=a72d698124bbb1ee168b9018bc5b4c2760c91f22;hpb=d806dbef4f43bb9c631c818e96c1a39e440c5e6c;p=nonrtric%2Fplt%2Franpm.git

diff --git a/datafilecollector/src/test/java/org/oran/datafile/http/HttpUtilsTest.java b/datafilecollector/src/test/java/org/oran/datafile/http/HttpUtilsTest.java
index a72d698..05f4492 100644
--- a/datafilecollector/src/test/java/org/oran/datafile/http/HttpUtilsTest.java
+++ b/datafilecollector/src/test/java/org/oran/datafile/http/HttpUtilsTest.java
@@ -22,9 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.URISyntaxException;
-import java.util.List;
 
-import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.net.URIBuilder;
 import org.junit.jupiter.api.Test;
 import org.oran.datafile.model.FileServerData;
@@ -33,10 +31,6 @@ class HttpUtilsTest {
 
     private static final String XNF_ADDRESS = "127.0.0.1";
     private static final int PORT = 443;
-    private static final String JWT_PASSWORD = "thisIsThePassword";
-    private static final String ACCESS_TOKEN = "access_token";
-    private static final String ANOTHER_TOKEN = "another_token";
-    private static final String ANOTHER_DATA = "another_data";
     private static final String FRAGMENT = "thisIsTheFragment";
     private static final String USERNAME = "bob";
     private static final String PASSWORD = "123";
@@ -51,30 +45,6 @@ class HttpUtilsTest {
         assertFalse(HttpUtils.isSuccessfulResponseCodeWithDataRouter(404));
     }
 
-    @Test
-    void isSingleQueryWithJWT_validToken() throws URISyntaxException {
-        assertTrue(HttpUtils.isQueryWithSingleJWT(validTokenSingleQueryData()));
-        assertTrue(HttpUtils.isQueryWithSingleJWT(validTokenDoubleQueryData()));
-    }
-
-    @Test
-    void isSingleQueryWithJWT_invalidToken() throws URISyntaxException {
-        assertFalse(HttpUtils.isQueryWithSingleJWT(validQueryNoToken()));
-        assertFalse(HttpUtils.isQueryWithSingleJWT(queryDataDoubleToken()));
-        assertFalse(HttpUtils.isQueryWithSingleJWT(null));
-    }
-
-    @Test
-    void getJWTToken_jWTTokenPresent() throws URISyntaxException {
-        assertEquals(JWT_PASSWORD, HttpUtils.getJWTToken(fileServerDataWithJWTToken()));
-        assertEquals(JWT_PASSWORD, HttpUtils.getJWTToken(fileServerDataWithJWTTokenLongQueryAndFragment()));
-    }
-
-    @Test
-    void getJWTToken_JWTTokenNotPresent() throws URISyntaxException {
-        assertEquals("", HttpUtils.getJWTToken(fileServerDataQueryWithoutToken()));
-    }
-
     @Test
     void prepareUri_UriWithoutPort() {
         FileServerData serverData =
@@ -85,15 +55,6 @@ class HttpUtilsTest {
         assertTrue(retrievedUri.startsWith("http://" + XNF_ADDRESS + ":80"));
     }
 
-    @Test
-    void prepareUri_verifyUriWithTokenAndFragment() throws URISyntaxException {
-        String file = "/file";
-        String expected = "http://" + XNF_ADDRESS + ":" + PORT + file + "?" + ANOTHER_TOKEN + "=" + ANOTHER_DATA + "&"
-            + ANOTHER_TOKEN + "=" + ANOTHER_DATA + "&" + ANOTHER_TOKEN + "=" + ANOTHER_DATA + "#" + FRAGMENT;
-        assertEquals(expected,
-            HttpUtils.prepareUri("http", fileServerDataWithJWTTokenLongQueryAndFragment(), file, 443));
-    }
-
     @Test
     void prepareUri_verifyUriWithoutTokenAndWithoutFragment() throws URISyntaxException {
         String file = "/file";
@@ -101,57 +62,6 @@ class HttpUtilsTest {
         assertEquals(expected, HttpUtils.prepareUri("http", fileServerDataNoTokenNoFragment(), file, 443));
     }
 
-    private List<NameValuePair> validTokenSingleQueryData() throws URISyntaxException {
-        String query = "?" + ACCESS_TOKEN + "=" + JWT_PASSWORD;
-        return new URIBuilder(query).getQueryParams();
-    }
-
-    private List<NameValuePair> validTokenDoubleQueryData() throws URISyntaxException {
-        StringBuilder doubleQuery = new StringBuilder();
-        doubleQuery.append("?" + ANOTHER_TOKEN + "=" + ANOTHER_DATA + "&");
-        doubleQuery.append(ACCESS_TOKEN + "=" + JWT_PASSWORD);
-        return new URIBuilder(doubleQuery.toString()).getQueryParams();
-    }
-
-    private List<NameValuePair> validQueryNoToken() throws URISyntaxException {
-        String query = "?" + ANOTHER_TOKEN + "=" + JWT_PASSWORD;
-        return new URIBuilder(query).getQueryParams();
-    }
-
-    private List<NameValuePair> queryDataDoubleToken() throws URISyntaxException {
-        StringBuilder doubleToken = new StringBuilder();
-        doubleToken.append("?" + ACCESS_TOKEN + "=" + JWT_PASSWORD + "&");
-        doubleToken.append(ACCESS_TOKEN + "=" + JWT_PASSWORD + "&");
-        doubleToken.append(ANOTHER_TOKEN + "=" + ANOTHER_DATA);
-        return new URIBuilder(doubleToken.toString()).getQueryParams();
-    }
-
-    private FileServerData fileServerDataWithJWTToken() throws URISyntaxException {
-        String query = "?" + ACCESS_TOKEN + "=" + JWT_PASSWORD;
-
-        return FileServerData.builder().serverAddress(XNF_ADDRESS).userId("").password("").port(PORT)
-            .queryParameters(new URIBuilder(query).getQueryParams()).build();
-    }
-
-    private FileServerData fileServerDataWithJWTTokenLongQueryAndFragment() throws URISyntaxException {
-        StringBuilder query = new StringBuilder();
-        query.append("?" + ANOTHER_TOKEN + "=" + ANOTHER_DATA + "&");
-        query.append(ANOTHER_TOKEN + "=" + ANOTHER_DATA + "&");
-        query.append(ACCESS_TOKEN + "=" + JWT_PASSWORD + "&");
-        query.append(ANOTHER_TOKEN + "=" + ANOTHER_DATA);
-
-        return FileServerData.builder().serverAddress(XNF_ADDRESS).userId("").password("").port(PORT)
-            .queryParameters(new URIBuilder(query.toString()).getQueryParams()).uriRawFragment(FRAGMENT).build();
-    }
-
-    private FileServerData fileServerDataQueryWithoutToken() throws URISyntaxException {
-        StringBuilder query = new StringBuilder();
-        query.append("?" + ANOTHER_TOKEN + "=" + ANOTHER_DATA);
-
-        return FileServerData.builder().serverAddress(XNF_ADDRESS).userId("").password("").port(PORT)
-            .queryParameters(new URIBuilder(query.toString()).getQueryParams()).build();
-    }
-
     private FileServerData fileServerDataNoTokenNoFragment() throws URISyntaxException {
         return FileServerData.builder().serverAddress(XNF_ADDRESS).userId("").password("").port(PORT)
             .queryParameters(new URIBuilder("").getQueryParams()).uriRawFragment("").build();