TaxonServiceSearchTest: assertions no longer unnessecarily doing object comparision...

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
index 2a01d5df8a6264501d38d681c2776ca440081106..c9e04dd73ad5b0938c927b13953e91c5b2b525e7 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
@@ -254,13 +254,13 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         Pager<SearchResult<TaxonBase>> pager;\r
 \r
         pager = taxonService.findByFullText(null, "Abies", null, null, true, null, null, null, null); // --> 7\r
-        Assert.assertEquals("Expecting 8 entities", Integer.valueOf(8), pager.getCount());\r
+        Assert.assertEquals("Expecting 8 entities", 8, pager.getCount().intValue());\r
 \r
         indexer.purge(null);\r
         commitAndStartNewTransaction(null);\r
 \r
         pager = taxonService.findByFullText(null, "Abies", null, null, true, null, null, null, null); // --> 0\r
-        Assert.assertEquals("Expecting no entities since the index has been purged", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("Expecting no entities since the index has been purged", 0, pager.getCount().intValue());\r
     }\r
 \r
     @SuppressWarnings("rawtypes")\r
@@ -275,22 +275,22 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
 \r
         pager = taxonService.findByDescriptionElementFullText(CommonTaxonName.class, "Wei"+UTF8.SHARP_S+"tanne", null, null, null,\r
                 false, null, null, null, null);\r
-        Assert.assertEquals("Expecting one entity when searching for CommonTaxonName", Integer.valueOf(1),\r
-                pager.getCount());\r
+        Assert.assertEquals("Expecting one entity when searching for CommonTaxonName", 1,\r
+                pager.getCount().intValue());\r
 \r
         // the description containing the Nulltanne has no taxon attached,\r
         // taxon.id = null\r
         pager = taxonService.findByDescriptionElementFullText(CommonTaxonName.class, "Nulltanne", null, null, null,\r
                 false, null, null, null, null);\r
-        Assert.assertEquals("Expecting no entity when searching for 'Nulltanne' ", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("Expecting no entity when searching for 'Nulltanne' ", 0, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(CommonTaxonName.class, "Wei"+UTF8.SHARP_S+"tanne", null, null,\r
                 Arrays.asList(new Language[] { Language.GERMAN() }), false, null, null, null, null);\r
-        Assert.assertEquals("Expecting one entity when searching in German", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting one entity when searching in German", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(CommonTaxonName.class, "Wei"+UTF8.SHARP_S+"tanne", null, null,\r
                 Arrays.asList(new Language[] { Language.RUSSIAN() }), false, null, null, null, null);\r
-        Assert.assertEquals("Expecting no entity when searching in Russian", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("Expecting no entity when searching in Russian", 0, pager.getCount().intValue());\r
 \r
     }\r
 \r
@@ -304,10 +304,10 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         Pager<SearchResult<TaxonBase>> pager;\r
         // by Area\r
         pager = taxonService.findByDescriptionElementFullText(null, "Canada", null, null, null, false, null, null, null, null);\r
-        Assert.assertEquals("Expecting one entity when searching for arae 'Canada'", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting one entity when searching for arae 'Canada'", 1, pager.getCount().intValue());\r
         // by Status\r
         pager = taxonService.findByDescriptionElementFullText(null, "present", null, null, null, false, null, null, null, null);\r
-        Assert.assertEquals("Expecting one entity when searching for status 'present'", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting one entity when searching for status 'present'", 1, pager.getCount().intValue());\r
     }\r
 \r
     @SuppressWarnings("rawtypes")\r
@@ -320,7 +320,7 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         Pager<SearchResult<TaxonBase>> pager;\r
 \r
         pager = taxonService.findByDescriptionElementFullText(CommonTaxonName.class, "Wei"+UTF8.SHARP_S+"*", null, null, null, false, null, null, null, null);\r
-        Assert.assertEquals("Expecting one entity when searching for CommonTaxonName", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting one entity when searching for CommonTaxonName", 1, pager.getCount().intValue());\r
     }\r
 \r
     /**\r
@@ -559,40 +559,40 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         Pager<SearchResult<TaxonBase>> pager;\r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Abies", null, null, null, false, null, null, null, null);\r
         logSearchResults(pager, Level.DEBUG, null);\r
-        Assert.assertEquals("Expecting one entity when searching for any TextData", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting one entity when searching for any TextData", 1, pager.getCount().intValue());\r
         Assert.assertEquals("Abies balsamea sec. Kohlbecker, A., Testcase standart views, 2013", pager.getRecords().get(0).getEntity().getTitleCache());\r
         Assert.assertTrue("Expecting two docs, one for RUSSIAN and one for GERMAN", pager.getRecords().get(0).getDocs().size() == 2);\r
         Assert.assertEquals("Abies balsamea sec. Kohlbecker, A., Testcase standart views, 2013", pager.getRecords().get(0).getDocs().iterator().next().get("inDescription.taxon.titleCache"));\r
 \r
 \r
         pager = taxonService.findByDescriptionElementFullText(null, "Abies", null, null, null, false, null, null, null, null);\r
-        Assert.assertEquals("Expecting one entity when searching for any type", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting one entity when searching for any type", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(null, "Abies", null, Arrays.asList(new Feature[]{Feature.UNKNOWN()}), null, false, null, null, null, null);\r
-        Assert.assertEquals("Expecting one entity when searching for any type and for Feature DESCRIPTION", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting one entity when searching for any type and for Feature DESCRIPTION", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(null, "Abies", null, Arrays.asList(new Feature[]{Feature.CHROMOSOME_NUMBER()}), null, false, null, null, null, null);\r
-        Assert.assertEquals("Expecting no entity when searching for any type and for Feature CHROMOSOME_NUMBER", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("Expecting no entity when searching for any type and for Feature CHROMOSOME_NUMBER", 0, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(null, "Abies", null, Arrays.asList(new Feature[]{Feature.CHROMOSOME_NUMBER(), Feature.UNKNOWN()}), null, false, null, null, null, null);\r
-        Assert.assertEquals("Expecting no entity when searching for any type and for Feature DESCRIPTION or CHROMOSOME_NUMBER", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting no entity when searching for any type and for Feature DESCRIPTION or CHROMOSOME_NUMBER", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(Distribution.class, "Abies", null, null, null, false, null, null, null, null);\r
-        Assert.assertEquals("Expecting no entity when searching for Distribution", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("Expecting no entity when searching for Distribution", 0, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Бальзам", null, null, Arrays.asList(new Language[]{}), false, null, null, null, null);\r
-        Assert.assertEquals("Expecting one entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting one entity", 1, pager.getCount().intValue());\r
         Assert.assertEquals("Abies balsamea sec. Kohlbecker, A., Testcase standart views, 2013", pager.getRecords().get(0).getEntity().getTitleCache());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Бальзам", null, null, Arrays.asList(new Language[]{Language.RUSSIAN()}), false, null, null, null, null);\r
-        Assert.assertEquals("Expecting one entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting one entity", 1, pager.getCount().intValue());\r
         Assert.assertEquals("Abies balsamea sec. Kohlbecker, A., Testcase standart views, 2013", pager.getRecords().get(0).getEntity().getTitleCache());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Бальзам", null, null, Arrays.asList(new Language[]{Language.GERMAN()}), false, null, null, null, null);\r
-        Assert.assertEquals("Expecting no entity", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("Expecting no entity", 0, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Balsam-Tanne", null, null, Arrays.asList(new Language[]{Language.GERMAN(), Language.RUSSIAN()}), false, null, null, null, null);\r
-        Assert.assertEquals("Expecting one entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting one entity", 1, pager.getCount().intValue());\r
         Assert.assertEquals("Abies balsamea sec. Kohlbecker, A., Testcase standart views, 2013", pager.getRecords().get(0).getEntity().getTitleCache());\r
     }\r
 \r
@@ -607,22 +607,22 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
 \r
         Pager<SearchResult<TaxonBase>> pager;\r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Pflanzenart Tannen", null, null, null, false, null, null, null, null);\r
-        Assert.assertEquals("OR search : Expecting one entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("OR search : Expecting one entity", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Pflanzenart Wespen", null, null, null, false, null, null, null, null);\r
-        Assert.assertEquals("OR search : Expecting one entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("OR search : Expecting one entity", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "+Pflanzenart +Tannen", null, null, null, false, null, null, null, null);\r
-        Assert.assertEquals("AND search : Expecting one entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("AND search : Expecting one entity", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "+Pflanzenart +Wespen", null, null, null, false, null, null, null, null);\r
-        Assert.assertEquals("AND search : Expecting no entity", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("AND search : Expecting no entity", 0, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "\"Pflanzenart aus der Gattung der Tannen\"", null, null, null, false, null, null, null, null);\r
-        Assert.assertEquals("Phrase search : Expecting one entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Phrase search : Expecting one entity", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "\"Pflanzenart aus der Gattung der Wespen\"", null, null, null, false, null, null, null, null);\r
-        Assert.assertEquals("Phrase search : Expecting one entity", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("Phrase search : Expecting one entity", 0, pager.getCount().intValue());\r
 \r
 \r
     }\r
@@ -657,11 +657,11 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
 \r
         //\r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Balsam-Tanne", null, null, Arrays.asList(new Language[]{Language.GERMAN(), Language.RUSSIAN()}), false, null, null, null, null);\r
-        Assert.assertEquals("The german 'Balsam-Tanne' TextData should no longer be indexed", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("The german 'Balsam-Tanne' TextData should no longer be indexed", 0, pager.getCount().intValue());\r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "abeto", null, null, Arrays.asList(new Language[]{Language.SPANISH_CASTILIAN()}), false, null, null, null, null);\r
-        Assert.assertEquals("expecting to find the SPANISH_CASTILIAN 'abeto bals"+UTF8.SMALL_A_ACUTE+"mico'", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("expecting to find the SPANISH_CASTILIAN 'abeto bals"+UTF8.SMALL_A_ACUTE+"mico'", 1, pager.getCount().intValue());\r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "bals"+UTF8.SMALL_A_ACUTE+"mico", null, null, null, false, null, null, null, null);\r
-        Assert.assertEquals("expecting to find the SPANISH_CASTILIAN 'abeto bals"+UTF8.SMALL_A_ACUTE+"mico'", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("expecting to find the SPANISH_CASTILIAN 'abeto bals"+UTF8.SMALL_A_ACUTE+"mico'", 1, pager.getCount().intValue());\r
 \r
         //\r
         // modify the DescriptionElement via the Description object\r
@@ -676,9 +676,9 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         descriptionService.saveOrUpdate(description);\r
         commitAndStartNewTransaction(null);\r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "abeto", null, null, Arrays.asList(new Language[]{Language.SPANISH_CASTILIAN()}), false, null, null, null, null);\r
-        Assert.assertEquals("The spanish 'abeto bals"+UTF8.SMALL_A_ACUTE+"mico' TextData should no longer be indexed", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("The spanish 'abeto bals"+UTF8.SMALL_A_ACUTE+"mico' TextData should no longer be indexed", 0, pager.getCount().intValue());\r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "balsamiczna", null, null, Arrays.asList(new Language[]{Language.POLISH()}), false, null, null, null, null);\r
-        Assert.assertEquals("expecting to find the POLISH 'Jod"+UTF8.POLISH_L+"a balsamiczna'", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("expecting to find the POLISH 'Jod"+UTF8.POLISH_L+"a balsamiczna'", 1, pager.getCount().intValue());\r
     }\r
 \r
     @SuppressWarnings("rawtypes")\r
@@ -693,7 +693,7 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         TaxonDescription d_abies_balsamea = (TaxonDescription)descriptionService.find(UUID.fromString(D_ABIES_BALSAMEA_UUID));\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Balsam-Tanne", null, null, Arrays.asList(new Language[]{Language.GERMAN()}), false, null, null, null, null);\r
-        Assert.assertEquals("expecting to find the GERMAN 'Balsam-Tanne'", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("expecting to find the GERMAN 'Balsam-Tanne'", 1, pager.getCount().intValue());\r
 \r
         // exchange the Taxon with another one via the Taxon object\r
         // 1.) remove existing description:\r
@@ -705,7 +705,7 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         t_abies_balsamea = (Taxon)taxonService.find(t_abies_balsamea.getUuid());\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Balsam-Tanne", null, null, Arrays.asList(new Language[]{Language.GERMAN()}), false, null, null, null, null);\r
-        Assert.assertEquals("'Balsam-Tanne' should no longer be found", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("'Balsam-Tanne' should no longer be found", 0, pager.getCount().intValue());\r
 \r
         // 2.) create new description and add to taxon:\r
         TaxonDescription d_abies_balsamea_new = TaxonDescription.NewInstance();\r
@@ -727,7 +727,7 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         });\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "mittelgro"+UTF8.SHARP_S+"er Baum", null, null, Arrays.asList(new Language[]{Language.GERMAN()}), false, null, null, null, null);\r
-        Assert.assertEquals("the taxon should be found via the new Description", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("the taxon should be found via the new Description", 1, pager.getCount().intValue());\r
     }\r
 \r
     @SuppressWarnings("rawtypes")\r
@@ -747,9 +747,9 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         //TaxonNode childNode = classification.getChildNodes().iterator().next();\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Balsam-Tanne", null, null, Arrays.asList(new Language[]{Language.GERMAN()}), false, null, null, null, null);\r
-        Assert.assertEquals("expecting to find the GERMAN 'Balsam-Tanne' even if filtering by classification", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("expecting to find the GERMAN 'Balsam-Tanne' even if filtering by classification", 1, pager.getCount().intValue());\r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Balsam-Tanne", alternateClassification, null, Arrays.asList(new Language[]{Language.GERMAN()}), false, null, null, null, null);\r
-        Assert.assertEquals("GERMAN 'Balsam-Tanne' should NOT be found in other classification", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("GERMAN 'Balsam-Tanne' should NOT be found in other classification", 0, pager.getCount().intValue());\r
 \r
         // check for the right taxon node\r
         TaxonNode childNode = classification.getChildNodes().iterator().next();\r
@@ -768,14 +768,14 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
 //        });\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Balsam-Tanne", alternateClassification, null, Arrays.asList(new Language[]{Language.GERMAN()}), false, null, null, null, null);\r
-        Assert.assertEquals("GERMAN 'Balsam-Tanne' should now be found in other classification", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("GERMAN 'Balsam-Tanne' should now be found in other classification", 1, pager.getCount().intValue());\r
 \r
         classification.getChildNodes().clear();\r
         classificationService.saveOrUpdate(classification);\r
         commitAndStartNewTransaction(null);\r
 \r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Balsam-Tanne", classification, null, Arrays.asList(new Language[]{Language.GERMAN()}), false, null, null, null, null);\r
-        Assert.assertEquals("Now the GERMAN 'Balsam-Tanne' should NOT be found in original classification", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("Now the GERMAN 'Balsam-Tanne' should NOT be found in original classification", 0, pager.getCount().intValue());\r
 \r
     }\r
 \r
@@ -808,7 +808,7 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
 \r
         Pager<SearchResult<TaxonBase>> pager;\r
         pager = taxonService.findByDescriptionElementFullText(CategoricalData.class, "green", null, null, null, false, null, null, null, null);\r
-        Assert.assertEquals("Expecting one entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting one entity", 1, pager.getCount().intValue());\r
         Assert.assertEquals("Abies balsamea sec. Kohlbecker, A., Testcase standart views, 2013", pager.getRecords().get(0).getEntity().getTitleCache());\r
         Assert.assertTrue("Expecting only one doc", pager.getRecords().get(0).getDocs().size() == 1);\r
         Assert.assertEquals("Abies balsamea sec. Kohlbecker, A., Testcase standart views, 2013", pager.getRecords().get(0).getDocs().iterator().next().get("inDescription.taxon.titleCache"));\r
@@ -840,7 +840,7 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
 \r
         Pager<SearchResult<TaxonBase>> pager;\r
         pager = taxonService.findByDescriptionElementFullText(TextData.class, "Abies", null, null, null, true, null, null, null, null);\r
-        Assert.assertEquals("Expecting one entity when searching for any TextData", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting one entity when searching for any TextData", 1, pager.getCount().intValue());\r
         SearchResult<TaxonBase> searchResult = pager.getRecords().get(0);\r
         Assert.assertTrue("the map of highlighted fragments should contain at least one item", searchResult.getFieldHighlightMap().size() > 0);\r
         String[] fragments = searchResult.getFieldHighlightMap().values().iterator().next();\r
@@ -884,22 +884,22 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
 \r
         pager = taxonService.findByFullText(null, "Abies", null, null, true, null, null, null, null); // --> 7\r
         logSearchResults(pager, Level.DEBUG, null);\r
-        Assert.assertEquals("Expecting 8 entities", Integer.valueOf(8), pager.getCount());\r
+        Assert.assertEquals("Expecting 8 entities", 8, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByFullText(Taxon.class, "Abies", null, null, true, null, null, null, null); // --> 6\r
-        Assert.assertEquals("Expecting 7 entities", Integer.valueOf(7), pager.getCount());\r
+        Assert.assertEquals("Expecting 7 entities", 7, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByFullText(Synonym.class, "Abies", null, null, true, null, null, null, null); // --> 1\r
-        Assert.assertEquals("Expecting 1 entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting 1 entity", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByFullText(TaxonBase.class, "sec", null, null, true, null, null, null, null); // --> 7\r
-        Assert.assertEquals("Expecting 8 entities", Integer.valueOf(8), pager.getCount());\r
+        Assert.assertEquals("Expecting 8 entities", 8, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByFullText(null, "genus", null, null, true, null, null, null, null); // --> 1\r
-        Assert.assertEquals("Expecting 1 entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting 1 entity", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByFullText(Taxon.class, "subalpina", null, null, true, null, null, null, null); // --> 0\r
-        Assert.assertEquals("Expecting 0 entities", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("Expecting 0 entities", 0, pager.getCount().intValue());\r
 \r
         // synonym in classification ???\r
     }\r
@@ -934,24 +934,24 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
                 EnumSet.of(TaxaAndNamesSearchMode.doTaxa, TaxaAndNamesSearchMode.doSynonyms),\r
                 "Abies", null, null, null, null, true, null, null, null, null);\r
 //        logPagerRecords(pager, Level.DEBUG);\r
-        Assert.assertEquals("doTaxa & doSynonyms", Integer.valueOf(8), pager.getCount());\r
+        Assert.assertEquals("doTaxa & doSynonyms", 8, pager.getCount().intValue());\r
 \r
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.allOf(TaxaAndNamesSearchMode.class),\r
                 "Abies", null, null, null, null, true, null, null, null, null);\r
 //        logPagerRecords(pager, Level.DEBUG);\r
-        Assert.assertEquals("all search modes", Integer.valueOf(8), pager.getCount());\r
+        Assert.assertEquals("all search modes", 8, pager.getCount().intValue());\r
 \r
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.allOf(TaxaAndNamesSearchMode.class),\r
                 "Abies", alternateClassification, null, null, null, true, null, null, null, null);\r
 //        logPagerRecords(pager, Level.DEBUG);\r
-        Assert.assertEquals("all search modes, filtered by alternateClassification", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("all search modes, filtered by alternateClassification", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.of(TaxaAndNamesSearchMode.doSynonyms),\r
                 "Abies", null, null, null, null, true, null, null, null, null);\r
-        Assert.assertEquals("Expecting 1 entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting 1 entity", 1, pager.getCount().intValue());\r
         SearchResult<TaxonBase> searchResult = pager.getRecords().get(0);\r
         Assert.assertEquals(Synonym.class, searchResult.getEntity().getClass());\r
         // Abies subalpina sec. Kohlbecker, A., Testcase standart views, 2013\r
@@ -960,20 +960,20 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.of(TaxaAndNamesSearchMode.doTaxaByCommonNames),\r
                 "Abies", null, null, null, null, true, null, null, null, null);\r
-        Assert.assertEquals("Expecting 0 entity", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("Expecting 0 entity", 0, pager.getCount().intValue());\r
 \r
 \r
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.of(TaxaAndNamesSearchMode.doTaxaByCommonNames),\r
                 "Tanne", null, null, null, null, true, null, null, null, null);\r
-        Assert.assertEquals("Expecting 1 entity", Integer.valueOf(1), Integer.valueOf(pager.getRecords().size()));\r
-        Assert.assertEquals("Expecting 1 entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting 1 entity", 1, pager.getRecords().size());\r
+        Assert.assertEquals("Expecting 1 entity", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.of(TaxaAndNamesSearchMode.doMisappliedNames),\r
                 "kawakamii", null, null, null, null, true, null, null, null, null);\r
         logSearchResults(pager, Level.DEBUG, null);\r
-        Assert.assertEquals("Expecting 1 entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting 1 entity", 1, pager.getCount().intValue());\r
 \r
     }\r
 \r
@@ -1057,51 +1057,51 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
                 EnumSet.of(TaxaAndNamesSearchMode.doTaxa),\r
                 "Abies", null, a_germany_canada_russia, null, null, true, null, null, null, null);\r
         logSearchResults(pager, Level.DEBUG, null);\r
-        Assert.assertEquals("taxa with matching area filter", Integer.valueOf(2), pager.getCount());\r
+        Assert.assertEquals("taxa with matching area filter", 2, pager.getCount().intValue());\r
 \r
         // abies_kawakamii_sensu_komarov as missapplied name for t_abies_balsamea\r
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.of(TaxaAndNamesSearchMode.doSynonyms),\r
                 "Abies", null, a_germany_canada_russia, present_native, null, true, null, null, null, null);\r
-        Assert.assertEquals("synonyms with matching area filter", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("synonyms with matching area filter", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.of(TaxaAndNamesSearchMode.doTaxa, TaxaAndNamesSearchMode.doSynonyms),\r
                 "Abies", null, a_germany_canada_russia, null, null, true, null, null, null, null);\r
         logSearchResults(pager, Level.DEBUG, null);\r
-        Assert.assertEquals("taxa and synonyms with matching area filter", Integer.valueOf(3), pager.getCount());\r
+        Assert.assertEquals("taxa and synonyms with matching area filter", 3, pager.getCount().intValue());\r
 \r
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.of(TaxaAndNamesSearchMode.doTaxa, TaxaAndNamesSearchMode.doSynonyms),\r
                 "Abies", null, a_germany_canada_russia, present_native, null, true, null, null, null, null);\r
-        Assert.assertEquals("taxa and synonyms with matching area & status filter 1", Integer.valueOf(3), pager.getCount());\r
+        Assert.assertEquals("taxa and synonyms with matching area & status filter 1", 3, pager.getCount().intValue());\r
 \r
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.of(TaxaAndNamesSearchMode.doTaxa, TaxaAndNamesSearchMode.doSynonyms),\r
                 "Abies", null, a_germany_canada_russia, present, null, true, null, null, null, null);\r
-        Assert.assertEquals("taxa and synonyms with matching area & status filter 2", Integer.valueOf(2), pager.getCount());\r
+        Assert.assertEquals("taxa and synonyms with matching area & status filter 2", 2, pager.getCount().intValue());\r
 \r
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.of(TaxaAndNamesSearchMode.doTaxa, TaxaAndNamesSearchMode.doSynonyms),\r
                 "Abies", null, a_russia, present, null, true, null, null, null, null);\r
-        Assert.assertEquals("taxa and synonyms with non matching area & status filter", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("taxa and synonyms with non matching area & status filter", 0, pager.getCount().intValue());\r
 \r
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.of(TaxaAndNamesSearchMode.doTaxaByCommonNames),\r
                 "Tanne", null, a_germany_canada_russia, present_native, null, true, null, null, null, null);\r
-        Assert.assertEquals("ByCommonNames with area filter", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("ByCommonNames with area filter", 1, pager.getCount().intValue());\r
 \r
         // abies_kawakamii_sensu_komarov as misapplied name for t_abies_balsamea\r
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.of(TaxaAndNamesSearchMode.doMisappliedNames),\r
                 "Abies", null, a_germany_canada_russia, present_native, null, true, null, null, null, null);\r
-        Assert.assertEquals("misappliedNames with matching area & status filter", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("misappliedNames with matching area & status filter", 1, pager.getCount().intValue());\r
 \r
 \r
         // 1. remove existing taxon relation\r
         Taxon t_abies_balsamea = (Taxon)taxonService.find(UUID.fromString(ABIES_BALSAMEA_UUID));\r
         Set<TaxonRelationship> relsTo = t_abies_balsamea.getRelationsToThisTaxon();\r
-        Assert.assertEquals(Integer.valueOf(1), Integer.valueOf(relsTo.size()));\r
+        Assert.assertEquals(1, relsTo.size());\r
         TaxonRelationship taxonRelation = relsTo.iterator().next();\r
         t_abies_balsamea.removeTaxonRelation(taxonRelation);\r
         taxonService.saveOrUpdate(t_abies_balsamea);\r
@@ -1110,7 +1110,7 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.of(TaxaAndNamesSearchMode.doMisappliedNames),\r
                 "Abies", null, a_germany_canada_russia, present_native, null, true, null, null, null, null);\r
-        Assert.assertEquals("misappliedNames with matching area & status filter, should match nothing now", Integer.valueOf(0), pager.getCount());\r
+        Assert.assertEquals("misappliedNames with matching area & status filter, should match nothing now", 0, pager.getCount().intValue());\r
 \r
         // 2. now add abies_kawakamii_sensu_komarov as misapplied name for t_abies_alba and search for misapplications in russia: ABSENT\r
         Taxon t_abies_kawakamii_sensu_komarov = (Taxon)taxonService.find(UUID.fromString(D_ABIES_KAWAKAMII_SEC_KOMAROV_UUID));\r
@@ -1122,7 +1122,7 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         pager = taxonService.findTaxaAndNamesByFullText(\r
                 EnumSet.of(TaxaAndNamesSearchMode.doMisappliedNames),\r
                 "Abies", null, a_germany_canada_russia, absent, null, true, null, null, null, null);\r
-        Assert.assertEquals("misappliedNames with matching area & status filter, should find one", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("misappliedNames with matching area & status filter, should find one", 1, pager.getCount().intValue());\r
 \r
     }\r
 \r
@@ -1151,7 +1151,7 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
 \r
         // via DescriptionElement\r
         pager = taxonService.findByEverythingFullText("present", null, null, true, null, null, null, null);\r
-        Assert.assertEquals("Expecting one entity when searching for area 'present'", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting one entity when searching for area 'present'", 1, pager.getCount().intValue());\r
         Assert.assertNotNull("Expecting entity", pager.getRecords().get(0).getEntity());\r
         Assert.assertEquals("Expecting Taxon entity", Taxon.class, pager.getRecords().get(0).getEntity().getClass());\r
         Assert.assertEquals("Expecting Taxon ", ABIES_BALSAMEA_UUID, pager.getRecords().get(0).getEntity().getUuid().toString());\r
@@ -1168,15 +1168,15 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         Pager<SearchResult<TaxonBase>> pager;\r
 \r
         pager = taxonService.findByEverythingFullText("genus", null, null,  false, null, null, null, null); // --> 1\r
-        Assert.assertEquals("Expecting 1 entity", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("Expecting 1 entity", 1, pager.getCount().intValue());\r
 \r
         //FIXME FAILS: abies balamea is returned twice, see also testFullText_Grouping()\r
         pager = taxonService.findByEverythingFullText("Balsam-Tanne", null, Arrays.asList(new Language[]{Language.GERMAN()}), false, null, null, null, null);\r
         logSearchResults(pager, Level.DEBUG, null);\r
-        Assert.assertEquals("expecting to find the Abies balsamea via the GERMAN DescriptionElements", Integer.valueOf(1), pager.getCount());\r
+        Assert.assertEquals("expecting to find the Abies balsamea via the GERMAN DescriptionElements", 1, pager.getCount().intValue());\r
 \r
         pager = taxonService.findByEverythingFullText("Abies", null, null, true, null, null, null, null);\r
-        Assert.assertEquals("Expecting 8 entities", Integer.valueOf(8), pager.getCount());\r
+        Assert.assertEquals("Expecting 8 entities", 8, pager.getCount().intValue());\r
         SearchResult<TaxonBase> searchResult = pager.getRecords().get(0);\r
         Assert.assertTrue("the map of highlighted fragments should contain at least one item", searchResult.getFieldHighlightMap().size() > 0);\r
         String[] fragments = searchResult.getFieldHighlightMap().values().iterator().next();\r