Revize d6451c0a

Added filter for written forms and some tests

re #9492

backend/src/test/java/cz/zcu/kiv/backendapi/catalog/CatalogItemRepositoryTest.java

@@ -1 +1 @@
 package cz.zcu.kiv.backendapi.catalog;
 
 import cz.zcu.kiv.backendapi.alternativename.AlternativeName;
-import cz.zcu.kiv.backendapi.country.Country;
-import cz.zcu.kiv.backendapi.type.Type;
-import cz.zcu.kiv.backendapi.type.TypeRepository;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -22 +19 @@
     @Autowired
     private CatalogItemRepository underTest;
 
-    @Autowired
-    private TypeRepository typeRepository;
-
     private CatalogItem catalogItem1;
     private CatalogItem catalogItem2;
     private CatalogItem catalogItem3;
@@ -33 +27 @@
 
     @BeforeEach
     void setUp() {
-        Type typeCountry = new Type("country");
-        Type typeCity = new Type("city");
-        Type typeCapitalCity = new Type("capital city new");
-        Type typeCityUpper = new Type("City");
-        Type typeCountri = new Type("countri");
-        typeRepository.saveAll(List.of(typeCountry, typeCity, typeCapitalCity, typeCityUpper, typeCountri));
-
         String nameFirst = "first";
         String nameFirstUpper = "First";
         String nameSecond = "second";
@@ -48 +35 @@
         String nameTwelve = "twelve";
         String nameTwentyUpper = "TWENTY";
 
-        String countryAaa = "aaa";
-        String countryAaaUpper = "AAA";
-        String countryBbb = "bbb";
-        String countryBccb = "bccb";
-        String countryCcc = "ccc";
-        String countryDdd = "ddd";
-        String countryDcd = "dcd";
-
         catalogItem1 = new CatalogItem();
         catalogItem2 = new CatalogItem();
         catalogItem3 = new CatalogItem();
@@ -63 +42 @@
         catalogItem5 = new CatalogItem();
 
         catalogItem1.setName(nameFirst);
-        catalogItem1.setTypes(Set.of(typeCountry, typeCity));
-        catalogItem1.setCountries(Set.of(new Country(countryAaa, catalogItem1), new Country(countryDcd, catalogItem1)));
 
         catalogItem2.setName(nameSecond);
         catalogItem2.setAlternativeNames(Set.of(new AlternativeName(nameTwelve, catalogItem2), new AlternativeName(nameThird, catalogItem2)));
-        catalogItem2.setTypes(Set.of(typeCountry, typeCityUpper));
-        catalogItem2.setCountries(Set.of(new Country(countryAaa, catalogItem2), new Country(countryBbb, catalogItem2)));
 
         catalogItem3.setName(nameThird);
         catalogItem3.setAlternativeNames(Set.of(new AlternativeName(nameTwentyUpper, catalogItem3), new AlternativeName(nameSedond, catalogItem3)));
-        catalogItem3.setTypes(Set.of(typeCountri, typeCapitalCity));
-        catalogItem3.setCountries(Set.of(new Country(countryAaaUpper, catalogItem3), new Country(countryCcc, catalogItem3)));
-
 
         catalogItem4.setAlternativeNames(Set.of(new AlternativeName(nameTwelve, catalogItem4), new AlternativeName(nameFirstUpper, catalogItem4)));
-        catalogItem4.setTypes(Set.of(typeCountri, typeCountry));
-        catalogItem4.setCountries(Set.of(new Country(countryBccb, catalogItem4), new Country(countryDdd, catalogItem4)));
-
 
         catalogItem5.setName(nameSedond);
         catalogItem5.setAlternativeNames(Set.of(new AlternativeName(nameThird, catalogItem5)));
-        catalogItem5.setTypes(Set.of(typeCountri));
 
         underTest.saveAll(List.of(catalogItem1, catalogItem2, catalogItem3, catalogItem4, catalogItem5));
 
@@ -96 +64 @@
         underTest.deleteAll();
     }
 
-    @Test
-    void itShouldReturnAll() {
-        // given
-        String name = "";
-        String country = "";
-        String type = "";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(5);
-    }
-
-    @Test
-    void testName() {
-        // given
-        String name = "first";
-        String country = "";
-        String type = "";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(2);
-        assertTrue(filterResult.contains(catalogItem1));
-        assertTrue(filterResult.contains(catalogItem4));
-    }
-
-    @Test
-    void testWildcardCharacterName() {
-        // given
-        String name = "se_ond";
-        String country = "";
-        String type = "";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(3);
-        assertTrue(filterResult.contains(catalogItem2));
-        assertTrue(filterResult.contains(catalogItem3));
-        assertTrue(filterResult.contains(catalogItem5));
-    }
-
-    @Test
-    void testWildcardCharactersName() {
-        // given
-        String name = "twe%";
-        String country = "";
-        String type = "";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(3);
-        assertTrue(filterResult.contains(catalogItem2));
-        assertTrue(filterResult.contains(catalogItem3));
-        assertTrue(filterResult.contains(catalogItem4));
-    }
-
-    @Test
-    void testCountry() {
-        // given
-        String name = "";
-        String country = "aaa";
-        String type = "";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(3);
-        assertTrue(filterResult.contains(catalogItem1));
-        assertTrue(filterResult.contains(catalogItem2));
-        assertTrue(filterResult.contains(catalogItem3));
-    }
-
-    @Test
-    void testWildcardCharacterCountry() {
-        // given
-        String name = "";
-        String country = "d_d";
-        String type = "";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(2);
-        assertTrue(filterResult.contains(catalogItem1));
-        assertTrue(filterResult.contains(catalogItem4));
-    }
-
-    @Test
-    void testWildcardCharactersCountry() {
-        // given
-        String name = "";
-        String country = "b%b";
-        String type = "";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(2);
-        assertTrue(filterResult.contains(catalogItem2));
-        assertTrue(filterResult.contains(catalogItem4));
-    }
-
-
-    @Test
-    void testType() {
-        // given
-        String name = "";
-        String country = "";
-        String type = "city";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(2);
-        assertTrue(filterResult.contains(catalogItem1));
-        assertTrue(filterResult.contains(catalogItem2));
-    }
-
-    @Test
-    void testWildcardCharacterType() {
-        // given
-        String name = "";
-        String country = "";
-        String type = "countr_";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(5);
-        assertTrue(filterResult.contains(catalogItem1));
-        assertTrue(filterResult.contains(catalogItem2));
-        assertTrue(filterResult.contains(catalogItem3));
-        assertTrue(filterResult.contains(catalogItem4));
-        assertTrue(filterResult.contains(catalogItem5));
-    }
-
-    @Test
-    void testWildcardCharactersType() {
-        // given
-        String name = "";
-        String country = "";
-        String type = "%city%";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(3);
-        assertTrue(filterResult.contains(catalogItem1));
-        assertTrue(filterResult.contains(catalogItem2));
-        assertTrue(filterResult.contains(catalogItem3));
-    }
-
-    @Test
-    void testNameAndCountry() {
-        // given
-        String name = "third";
-        String country = "aaa";
-        String type = "";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(2);
-        assertTrue(filterResult.contains(catalogItem2));
-        assertTrue(filterResult.contains(catalogItem3));
-    }
-
-    @Test
-    void testNameAndType() {
-        // given
-        String name = "third";
-        String country = "";
-        String type = "countri";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(2);
-        assertTrue(filterResult.contains(catalogItem3));
-        assertTrue(filterResult.contains(catalogItem5));
-    }
-
-    @Test
-    void testCountryAndType() {
-        // given
-        String name = "";
-        String country = "ddd";
-        String type = "country";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(1);
-        assertTrue(filterResult.contains(catalogItem4));
-    }
-
-    @Test
-    void testAll() {
-        // given
-        String name = "third";
-        String country = "AAA";
-        String type = "countri";
-
-        // when
-        Set<CatalogItem> filterResult = underTest.filterCatalog(name, country, type);
-
-        // then
-        assertThat(filterResult.size()).isEqualTo(1);
-        assertTrue(filterResult.contains(catalogItem3));
-    }
-
     @Test
     void testItemsByName() {
         // given