HADOOP-3679. Fixup assert ordering in unit tests to yield meaningful error messages. Contributed by Jay Vyas