Fix: No filter in ApiScraperTest

cathrkri · Mar 15, 2026 · 1e5de29 · 1e5de29
1 parent 2318570
commit 1e5de29
Showing 1 changed file with 10 additions and 24 deletions.
diff --git a/...g/team6/models/APICharityScraperTest.java → .../team6/scraper/APICharityScraperTest.java b/...g/team6/models/APICharityScraperTest.java → .../team6/scraper/APICharityScraperTest.java
@@ -1,4 +1,4 @@
-/* package ntnu.systemutvikling.team6.models;
+package ntnu.systemutvikling.team6.models;
 
 import ntnu.systemutvikling.team6.scraper.APICharityData;
 import ntnu.systemutvikling.team6.scraper.APICharityScraper;
@@ -77,34 +77,20 @@ void parsedJSONShouldHaveCorrectValues() throws URISyntaxException {
                 "should be correct.");
         assertEquals("Misjonsalliansen", d.getName(), "Name parameter should be correct.");
         assertEquals("approved", d.getStatus(), "Status parameter should be correct.");
-        /* assertEquals("https://www.innsamlingskontrollen.no/organisasjoner/misjonsalliansen/", d.getUrl(),
+        assertEquals("Les mer https://www.innsamlingskontrollen.no/organisasjoner/misjonsalliansen/", d.getDescription(),
                 "Url parameter should be correct.");
-        assertFalse(d.getIs_pre_approved(), "Is_pre_approved parameter should be correct."); */
-    /* }
-
-    @Test
-    void parsedJSONOfNullShouldReturnEmptyList() throws URISyntaxException {
-        APICharityScraper con = new APICharityScraper(HttpClient.newHttpClient());
-
-        CharityRegistry list = con.parseJSON(null);
-
-        assertTrue(list.getAllCharities().isEmpty(), "List should be empty due to only parsing " +
-                "null objects.");
+        assertFalse(d.getPreApproved(), "Is_pre_approved parameter should be correct.");
     }
 
-    @Test
-    void shouldRemoveObsStatusEntries() throws URISyntaxException {
-        APICharityScraper con = new APICharityScraper(HttpClient.newHttpClient());
+        @Test
+        void parsedJSONOfNullShouldReturnEmptyList() throws URISyntaxException {
+            APICharityScraper con = new APICharityScraper(HttpClient.newHttpClient());
 
-        String JSONData = "[{\"org_number\":\"938419264\",\"name\":\"Misjonsalliansen\",\"status\":\"obs\"," +
-                "\"url\":\"https://www.innsamlingskontrollen.no/organisasjoner/misjonsalliansen/\",\"" +
-                "is_pre_approved\":false}]";
-        CharityRegistry list = con.parseJSON(JSONData);
+            CharityRegistry list = con.parseJSON(null);
 
-        assertEquals(0, list.getAllCharities().size(),"Entries containing 'obs' should be ignored, so list should " +
-                "be empty.");
+            assertTrue(list.getAllCharities().isEmpty(), "List should be empty due to only parsing " +
+                    "null objects.");
+        }
 
     }
 
-}
-    */