unit test: more descriptive failure message

shadowislord · shadowislord · commit 85ffb48efb0b · 2016-04-02T15:17:21.000-04:00
diff --git a/common.gradle b/common.gradle
@@ -51,6 +51,12 @@ javadoc {
     }
 }
 
+test {
+    testLogging {
+        exceptionFormat = 'full'
+    }
+}
+
 task sourcesJar(type: Jar, dependsOn: classes, description: 'Creates a jar from the source files.') {
     classifier = 'sources'
     from sourceSets*.allSource
diff --git a/jme3-core/src/test/java/com/jme3/material/MaterialMatParamOverrideTest.java b/jme3-core/src/test/java/com/jme3/material/MaterialMatParamOverrideTest.java
@@ -520,7 +520,7 @@ private void outDefines(Define... expectedDefinesArray) {
     }
 
     private void outUniforms(Uniform... uniforms) {
-        HashSet<Uniform> actualUniforms = new HashSet<Uniform>();
+        HashSet<Uniform> actualUniforms = new HashSet<>();
 
         for (Uniform uniform : usedShader.getUniformMap().values()) {
             if (uniform.getName().startsWith("m_")
@@ -529,11 +529,10 @@ private void outUniforms(Uniform... uniforms) {
             }
         }
 
-        HashSet<Uniform> expectedUniforms = new HashSet<Uniform>(Arrays.asList(uniforms));
+        HashSet<Uniform> expectedUniforms = new HashSet<>(Arrays.asList(uniforms));
 
         if (!expectedUniforms.equals(actualUniforms)) {
-            System.out.println(expectedUniforms + " != " + actualUniforms);
-            Assert.fail("Uniform lists must match");
+            Assert.fail("Uniform lists must match: " + expectedUniforms + " != " + actualUniforms);
         }
     }
 }
diff --git a/jme3-core/src/test/java/com/jme3/scene/MPOTestUtils.java b/jme3-core/src/test/java/com/jme3/scene/MPOTestUtils.java
@@ -35,7 +35,6 @@
 import com.jme3.math.Matrix4f;
 import com.jme3.renderer.Camera;
 import com.jme3.shader.VarType;
-import static com.jme3.shader.VarType.Texture2D;
 import com.jme3.texture.Texture2D;
 import java.lang.reflect.Field;
 import java.util.HashSet;

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,12 @@ javadoc {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
	`54`	`+test {`
	`55`	`+ testLogging {`
	`56`	`+ exceptionFormat = 'full'`
	`57`	`+ }`
	`58`	`+}`
	`59`	`+`
`54`	`60`	`task sourcesJar(type: Jar, dependsOn: classes, description: 'Creates a jar from the source files.') {`
`55`	`61`	`classifier = 'sources'`
`56`	`62`	`from sourceSets*.allSource`
Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ private void outDefines(Define... expectedDefinesArray) {`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`private void outUniforms(Uniform... uniforms) {`
`523`		`- HashSet<Uniform> actualUniforms = new HashSet<Uniform>();`
	`523`	`+ HashSet<Uniform> actualUniforms = new HashSet<>();`
`524`	`524`
`525`	`525`	`for (Uniform uniform : usedShader.getUniformMap().values()) {`
`526`	`526`	`if (uniform.getName().startsWith("m_")`
`@@ -529,11 +529,10 @@ private void outUniforms(Uniform... uniforms) {`
`529`	`529`	`}`
`530`	`530`	`}`
`531`	`531`
`532`		`- HashSet<Uniform> expectedUniforms = new HashSet<Uniform>(Arrays.asList(uniforms));`
	`532`	`+ HashSet<Uniform> expectedUniforms = new HashSet<>(Arrays.asList(uniforms));`
`533`	`533`
`534`	`534`	`if (!expectedUniforms.equals(actualUniforms)) {`
`535`		`- System.out.println(expectedUniforms + " != " + actualUniforms);`
`536`		`- Assert.fail("Uniform lists must match");`
	`535`	`+ Assert.fail("Uniform lists must match: " + expectedUniforms + " != " + actualUniforms);`
`537`	`536`	`}`
`538`	`537`	`}`
`539`	`538`	`}`