- try {
- container = new DummyPfConceptContainer((PfConceptKey) null, null);
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- container = new DummyPfConceptContainer(new PfConceptKey(), null);
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("conceptMap is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- container = new DummyPfConceptContainer(null, new TreeMap<PfConceptKey, DummyPfConcept>());
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- container.getKey().setName("Dummy");
+ assertThatThrownBy(() -> new PfConceptContainer((PfConceptKey) null, null)).hasMessageMatching(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new DummyPfConceptContainer((PfConceptKey) null, null))
+ .hasMessageMatching(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new DummyPfConceptContainer(new PfConceptKey(), null))
+ .hasMessageMatching("^conceptMap is marked .*on.*ull but is null$");
+
+ assertThatThrownBy(() -> new DummyPfConceptContainer(null, new TreeMap<PfConceptKey, DummyPfConcept>()))
+ .hasMessageMatching(KEY_IS_NULL);
+
+ container.getKey().setName(DUMMY_VALUE);