Merge pull request #1 from cliu585/test-search-service-active

[TEAMMATES#12901] Check if the search service is active in account request search test

src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java

@@ -237,19 +237,4 @@ public void testSqlInjectionInDeleteAccountRequest() throws Exception {
         assertEquals(accountRequest, actual);
     }
 
-    @Test
-    public void testSqlInjectionSearchAccountRequestsInWholeSystem() throws Exception {
-        ______TS("SQL Injection test in searchAccountRequestsInWholeSystem");
-
-        AccountRequest accountRequest =
-                new AccountRequest("[email protected]", "name", "institute", AccountRequestStatus.PENDING, "comments");
-        accountRequestDb.createAccountRequest(accountRequest);
-
-        String searchInjection = "institute'; DROP TABLE account_requests; --";
-        List<AccountRequest> actualInjection = accountRequestDb.searchAccountRequestsInWholeSystem(searchInjection);
-        assertEquals(0, actualInjection.size());
-
-        AccountRequest actual = accountRequestDb.getAccountRequest(accountRequest.getId());
-        assertEquals(accountRequest, actual);
-    }
 }

src/it/java/teammates/it/storage/sqlsearch/AccountRequestSearchIT.java

@@ -162,6 +162,25 @@ public void testSearchAccountRequest_noSearchService_shouldThrowException() {
                 () -> accountRequestsDb.searchAccountRequestsInWholeSystem("anything"));
     }
 
+    @Test
+    public void testSqlInjectionSearchAccountRequestsInWholeSystem() throws Exception {
+        ______TS("SQL Injection test in searchAccountRequestsInWholeSystem");
+
+        if (!TestProperties.isSearchServiceActive()) {
+            return;
+        }
+
+        AccountRequest accountRequest = new AccountRequest("[email protected]", "name", "institute");
+        accountRequestsDb.createAccountRequest(accountRequest);
+
+        String searchInjection = "institute'; DROP TABLE account_requests; --";
+        List<AccountRequest> actualInjection = accountRequestsDb.searchAccountRequestsInWholeSystem(searchInjection);
+        assertEquals(typicalBundle.accountRequests.size(), actualInjection.size());
+
+        AccountRequest actual = accountRequestsDb.getAccountRequest("[email protected]", "institute");
+        assertEquals(accountRequest, actual);
+    }
+
     /**
      * Verifies that search results match with expected output.
      *