package com.google.blockly.utils;

import junit.framework.Assert;

/**
 * Aseerts used by Blockly's test code.
 */
public class MoreAsserts {
    public static void assertStringNotEmpty(String mesg, String str) {
        if (str == null) {
            Assert.fail(mesg + " Found null string.");
        } else if(str.length() == 0) {
            Assert.fail(mesg + " Found empty string.");
        }
    }
}

@@ -60,16 +60,111 @@
 ssert;%0A%0A
+import static org.junit.Assert.assertNotEquals;%0Aimport static org.junit.Assert.assertNotNull;%0A%0A
 /**%0A * A
@@ -313,144 +313,81 @@
     
-if (str == null) %7B%0A            Assert.fail(mesg + %22 Found null string.%22);%0A        %7D else if(str.length() == 0) %7B%0A            Assert.fail
+assertNotNull(mesg + %22 Found null string.%22, str);%0A        assertNotEquals
 (mes
@@ -416,20 +416,27 @@
 ng.%22
-);%0A        %7D
+, str.length(), 0);
 %0A   

Tidy up Assert.fail to use stanadard assertions. (#463)