[Java] Improve tests so failures are easier to debug.

Author: mjpt777

sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/cpp/CppGeneratorTest.java

@@ -23,8 +23,9 @@
 import uk.co.real_logic.sbe.xml.MessageSchema;
 import uk.co.real_logic.sbe.xml.ParserOptions;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.not;
 import static uk.co.real_logic.sbe.xml.XmlSchemaParser.parse;
 
 public class CppGeneratorTest
@@ -43,7 +44,7 @@ public void shouldUseGeneratedLiteralForConstantOneWhenGeneratingBitsetCode() th
  generator.generate();
 
  final String source = outputManager.getSource("issue827.FlagsSet").toString();
- assertFalse(source.contains("1u << "));
- assertTrue(source.contains("UINT64_C(0x1) << "));
+ assertThat(source, not(containsString("1u << ")));
+ assertThat(source, containsString("UINT64_C(0x1) << "));
  }
 }

sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/csharp/Issue567GroupSizeTest.java

@@ -31,8 +31,9 @@
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -86,6 +87,6 @@ public void shouldGenerateWhenUsingATypeThatIsConstrainedToFitInAnIntAsTheGroupS
  generator.generate();
 
  final String source = outputManager.getSource("tests.Issue567").toString();
- assertTrue(source.contains(EXPECTED_COUNT_CHECK));
+ assertThat(source, containsString(EXPECTED_COUNT_CHECK));
  }
 }

sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/rust/RustUtilTest.java

@@ -39,22 +39,19 @@ public class RustUtilTest
  @Test
  public void nullParamToEightBitCharacterThrowsNPE()
  {
- assertThrows(NullPointerException.class, () ->
- RustUtil.eightBitCharacter(null));
+ assertThrows(NullPointerException.class, () -> RustUtil.eightBitCharacter(null));
  }
 
  @Test
  public void emptyParamToEightBitCharacterThrowsIAE()
  {
- assertThrows(IllegalArgumentException.class, () ->
- RustUtil.eightBitCharacter(""));
+ assertThrows(IllegalArgumentException.class, () -> RustUtil.eightBitCharacter(""));
  }
 
  @Test
  public void tooManyCharactersParamToEightBitCharacterThrowsIAE()
  {
- assertThrows(IllegalArgumentException.class, () ->
- RustUtil.eightBitCharacter("ABC"));
+ assertThrows(IllegalArgumentException.class, () -> RustUtil.eightBitCharacter("ABC"));
  }
 
  @Test