From d420a45c6c28671423a621e2e598c31b5004884d Mon Sep 17 00:00:00 2001 From: pfurio Date: Mon, 2 Oct 2023 11:44:51 +0200 Subject: [PATCH 1/2] catalog: fix junit test, #TASK-5083 --- .../opencga/catalog/managers/SampleManagerTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/SampleManagerTest.java b/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/SampleManagerTest.java index 24c94481fe6..482db523400 100644 --- a/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/SampleManagerTest.java +++ b/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/SampleManagerTest.java @@ -2777,7 +2777,9 @@ public void deleteInUseInCATest() throws CatalogException { catalogManager.getSampleManager().delete(studyFqn, Collections.singletonList(case1.getProband().getSamples().get(0).getId()), new QueryOptions(ParamConstants.FORCE, true), token); } catch (CatalogException e) { - assertTrue(e.getMessage().contains("in use in 3 cases")); + if (!e.getMessage().contains("in use in 3 cases")) { + fail("Expected CatalogException with message containing 'in use in 3 cases. - Actual error msg: " + e.getMessage()); + } } // unlock case3 @@ -2788,7 +2790,9 @@ public void deleteInUseInCATest() throws CatalogException { catalogManager.getSampleManager().delete(studyFqn, Collections.singletonList(case1.getProband().getSamples().get(0).getId()), new QueryOptions(ParamConstants.FORCE, false), token); } catch (CatalogException e) { - assertTrue(e.getMessage().contains("in use in 3 cases")); + if (!e.getMessage().contains("associated with individual")) { + fail("Expected CatalogException with message containing 'associated with individual'. - Actual error msg: " + e.getMessage()); + } } } From 2d6366bab70f29b067a17c44e90ae12d375438a6 Mon Sep 17 00:00:00 2001 From: pfurio Date: Mon, 2 Oct 2023 11:54:26 +0200 Subject: [PATCH 2/2] catalog: change fail for MatcherAssert, #TASK-5083 --- .../opencga/catalog/managers/SampleManagerTest.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/SampleManagerTest.java b/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/SampleManagerTest.java index 482db523400..e9134475dd7 100644 --- a/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/SampleManagerTest.java +++ b/opencga-catalog/src/test/java/org/opencb/opencga/catalog/managers/SampleManagerTest.java @@ -20,8 +20,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.RandomStringUtils; import org.bson.Document; +import org.hamcrest.CoreMatchers; +import org.hamcrest.MatcherAssert; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.internal.matchers.ThrowableMessageMatcher; import org.opencb.biodata.models.clinical.Disorder; import org.opencb.biodata.models.clinical.Phenotype; import org.opencb.biodata.models.clinical.qc.SampleQcVariantStats; @@ -2776,10 +2779,9 @@ public void deleteInUseInCATest() throws CatalogException { try { catalogManager.getSampleManager().delete(studyFqn, Collections.singletonList(case1.getProband().getSamples().get(0).getId()), new QueryOptions(ParamConstants.FORCE, true), token); + fail("Expected CatalogException with message containing 'in use in 3 cases'"); } catch (CatalogException e) { - if (!e.getMessage().contains("in use in 3 cases")) { - fail("Expected CatalogException with message containing 'in use in 3 cases. - Actual error msg: " + e.getMessage()); - } + MatcherAssert.assertThat(e, ThrowableMessageMatcher.hasMessage(CoreMatchers.containsString("in use in 3 cases"))); } // unlock case3 @@ -2789,10 +2791,9 @@ public void deleteInUseInCATest() throws CatalogException { try { catalogManager.getSampleManager().delete(studyFqn, Collections.singletonList(case1.getProband().getSamples().get(0).getId()), new QueryOptions(ParamConstants.FORCE, false), token); + fail("Expected CatalogException with message containing 'associated with individual'."); } catch (CatalogException e) { - if (!e.getMessage().contains("associated with individual")) { - fail("Expected CatalogException with message containing 'associated with individual'. - Actual error msg: " + e.getMessage()); - } + MatcherAssert.assertThat(e, ThrowableMessageMatcher.hasMessage(CoreMatchers.containsString("associated with individual"))); } }