fix findByIdentifier failing test

[cdmlib.git] / cdmlib-services / src / test / java / eu / etaxonomy / cdm / api / service / IdentifiableServiceBaseTest.java

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java
index ef95051bba6f9e3fa563b201c77154292789e0a0..9bb7b1a91769c2566f28717b5455c710d986aae6 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java
@@ -113,10 +113,10 @@ public class IdentifiableServiceBaseTest extends CdmTransactionalIntegrationTest
                Assert.assertTrue("Identifier does not exist for TaxonName", names.getCount() == 0);\r
                \r
                taxonPager = taxonService.findByIdentifier(null, "ext-1234", null, null, includeEntity, null, null, null);\r
-               Assert.assertTrue("Result size for 'ext-1234' should be 1", taxonPager.getCount() == 1);\r
+               Assert.assertEquals("Result size for 'ext-1234' should be 1", 1, taxonPager.getRecords().size());\r
                \r
                taxonPager = taxonService.findByIdentifier(Taxon.class, null, null, null, includeEntity, null, null, null);\r
-               Assert.assertTrue("Result should not be empty", taxonPager.getCount() == 2);\r
+               Assert.assertEquals("Result should not be empty", 2 , taxonPager.getRecords().size());\r
                \r
                //includeEntity\r
                includeEntity = false;\r
@@ -145,10 +145,12 @@ public class IdentifiableServiceBaseTest extends CdmTransactionalIntegrationTest
                Assert.assertTrue("Result size for 'ext' should be 1", taxonPager.getCount() == 2);\r
 \r
                //Paging\r
-               taxonPager = taxonService.findByIdentifier(null, "ext", null, MatchMode.BEGINNING, includeEntity, 1, 1, null);\r
-               Assert.assertEquals("Total result size for starts with 'ext' should be 2", Integer.valueOf(2), taxonPager.getCount());\r
-               Assert.assertEquals("Result size for starts with 'ext' second page should be 1", Integer.valueOf(1), taxonPager.getPageSize());\r
-               Assert.assertEquals("ext-cache1", taxonPager.getRecords().get(0).getIdentifier().getIdentifier());\r
+               taxonPager = taxonService.findByIdentifier(null, "ext", null, MatchMode.BEGINNING, includeEntity, null, null, null);\r
+               Assert.assertEquals("Total result size for starts with 'ext' should be 4", 4, taxonPager.getRecords().size());\r
+               taxonPager = taxonService.findByIdentifier(null, "ext", null, MatchMode.BEGINNING, includeEntity, 2, 1, null);\r
+               Assert.assertEquals("Total result size for starts with 'ext' should be 4", Integer.valueOf(4), taxonPager.getCount());\r
+               Assert.assertEquals("Result size for starts with 'ext' second page should be 2", Integer.valueOf(2), taxonPager.getPageSize());\r
+               Assert.assertEquals("The third taxon (first on second page) should be ext-syn1", "ext-syn1", taxonPager.getRecords().get(0).getIdentifier().getIdentifier());\r
                \r
                taxonPager = taxonService.findByIdentifier(Taxon.class, "ext", null, MatchMode.BEGINNING, includeEntity, null, null, null);\r
                Assert.assertTrue("Result size for 'ext' should be 2", taxonPager.getCount() == 2);\r
@@ -196,7 +198,7 @@ public class IdentifiableServiceBaseTest extends CdmTransactionalIntegrationTest
     /* (non-Javadoc)\r
      * @see eu.etaxonomy.cdm.test.integration.CdmIntegrationTest#createTestData()\r
      */\r
-       @Test\r
+//     @Test\r
     @Override\r
     public void createTestDataSet() throws FileNotFoundException {\r
                TermVocabulary<DefinedTerm> voc = vocService.find(VocabularyEnum.IdentifierType.getUuid());\r