Clean up some string formatting

code/edgeconsent/src/androidTest/java/com/adobe/marketing/mobile/TestHelper.java

@@ -45,7 +45,7 @@ public class TestHelper {
 	// List of threads to wait for after test execution
 	private static List<String> knownThreads = new ArrayList<String>();
 
-	{
+	static {
 		knownThreads.add("pool"); // used for threads that execute the listeners code
 		knownThreads.add("ADB"); // module internal threads
 	}
@@ -293,21 +293,21 @@ public static void assertExpectedEvents(final boolean ignoreUnexpectedEvents) th
 
 		for (Map.Entry<EventSpec, ADBCountDownLatch> expected : expectedEvents.entrySet()) {
 			boolean awaitResult = expected.getValue().await(WAIT_EVENT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
-			assertTrue(
-				"Timed out waiting for event type " +
-				expected.getKey().type +
-				" and source " +
-				expected.getKey().source,
-				awaitResult
+			String failMessage = String.format(
+				"Timed out waiting for event type %s and source %s.",
+				expected.getKey().type,
+				expected.getKey().source
 			);
+			assertTrue(failMessage, awaitResult);
 			int expectedCount = expected.getValue().getInitialCount();
 			int receivedCount = expected.getValue().getCurrentCount();
-			String failMessage = String.format(
-				"Expected %d events for '%s', but received %d",
-				expectedCount,
-				expected.getKey(),
-				receivedCount
-			);
+			failMessage =
+				String.format(
+					"Expected %d events for '%s', but received %d",
+					expectedCount,
+					expected.getKey(),
+					receivedCount
+				);
 			assertEquals(failMessage, expectedCount, receivedCount);
 		}
 
@@ -372,10 +372,11 @@ public static void assertUnexpectedEvents(final boolean shouldWait) throws Inter
 				MobileCore.log(
 					LoggingMode.DEBUG,
 					TAG,
-					"Received unexpected event with type: " +
-					receivedEvent.getKey().type +
-					" source: " +
-					receivedEvent.getKey().source
+					String.format(
+						"Received unexpected event with type: %s source: %s",
+						receivedEvent.getKey().type,
+						receivedEvent.getKey().source
+					)
 				);
 			}
 		}