Mercurial > hg > truffle
changeset 10013:767ef799b323
unittest/aot: use assert methods instead of keyword
author | Bernhard Urban <bernhard.urban@jku.at> |
---|---|
date | Wed, 12 Jun 2013 16:04:43 +0200 |
parents | b2f1168ee37f |
children | 16dfdc920e77 |
files | graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java |
diffstat | 1 files changed, 26 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Wed Jun 12 16:04:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Wed Jun 12 16:04:43 2013 +0200 @@ -62,19 +62,19 @@ @Test public void testStaticFinalObjectAOT() { StructuredGraph result = compile("getStaticFinalObject", true); - assert result.getNodes().filter(ConstantNode.class).count() == 1; - assert result.getNodes().filter(ConstantNode.class).first().kind() == runtime.getTarget().wordKind; - assert result.getNodes(FloatingReadNode.class).count() == 2; - assert result.getNodes(ReadNode.class).count() == 0; + assertEquals(1, result.getNodes().filter(ConstantNode.class).count()); + assertEquals(runtime.getTarget().wordKind, result.getNodes().filter(ConstantNode.class).first().kind()); + assertEquals(2, result.getNodes(FloatingReadNode.class).count()); + assertEquals(0, result.getNodes(ReadNode.class).count()); } @Test public void testStaticFinalObject() { StructuredGraph result = compile("getStaticFinalObject", false); - assert result.getNodes().filter(ConstantNode.class).count() == 1; - assert result.getNodes().filter(ConstantNode.class).first().kind() == Kind.Object; - assert result.getNodes(FloatingReadNode.class).count() == 0; - assert result.getNodes(ReadNode.class).count() == 0; + assertEquals(1, result.getNodes().filter(ConstantNode.class).count()); + assertEquals(Kind.Object, result.getNodes().filter(ConstantNode.class).first().kind()); + assertEquals(0, result.getNodes(FloatingReadNode.class).count()); + assertEquals(0, result.getNodes(ReadNode.class).count()); } public static Class getClassObject() { @@ -86,12 +86,12 @@ StructuredGraph result = compile("getClassObject", true); NodeIterable<ConstantNode> filter = result.getNodes().filter(ConstantNode.class); - assert filter.count() == 1; + assertEquals(1, filter.count()); HotSpotResolvedObjectType type = (HotSpotResolvedObjectType) runtime.lookupJavaType(AheadOfTimeCompilationTest.class); - assert filter.first().asConstant().equals(type.klass()); + assertEquals(type.klass(), filter.first().asConstant()); - assert result.getNodes(FloatingReadNode.class).count() == 1; - assert result.getNodes(ReadNode.class).count() == 0; + assertEquals(1, result.getNodes(FloatingReadNode.class).count()); + assertEquals(0, result.getNodes(ReadNode.class).count()); } @Test @@ -99,13 +99,13 @@ StructuredGraph result = compile("getClassObject", false); NodeIterable<ConstantNode> filter = result.getNodes().filter(ConstantNode.class); - assert filter.count() == 1; + assertEquals(1, filter.count()); Object mirror = filter.first().asConstant().asObject(); - assert mirror.getClass().equals(Class.class); - assert mirror.equals(AheadOfTimeCompilationTest.class); + assertEquals(Class.class, mirror.getClass()); + assertEquals(AheadOfTimeCompilationTest.class, mirror); - assert result.getNodes(FloatingReadNode.class).count() == 0; - assert result.getNodes(ReadNode.class).count() == 0; + assertEquals(0, result.getNodes(FloatingReadNode.class).count()); + assertEquals(0, result.getNodes(ReadNode.class).count()); } public static Class getPrimitiveClassObject() { @@ -116,24 +116,24 @@ public void testPrimitiveClassObjectAOT() { StructuredGraph result = compile("getPrimitiveClassObject", true); NodeIterable<ConstantNode> filter = result.getNodes().filter(ConstantNode.class); - assert filter.count() == 1; - assert filter.first().kind() == runtime.getTarget().wordKind; + assertEquals(1, filter.count()); + assertEquals(runtime.getTarget().wordKind, filter.first().kind()); - assert result.getNodes(FloatingReadNode.class).count() == 2; - assert result.getNodes(ReadNode.class).count() == 0; + assertEquals(2, result.getNodes(FloatingReadNode.class).count()); + assertEquals(0, result.getNodes(ReadNode.class).count()); } @Test public void testPrimitiveClassObject() { StructuredGraph result = compile("getPrimitiveClassObject", false); NodeIterable<ConstantNode> filter = result.getNodes().filter(ConstantNode.class); - assert filter.count() == 1; + assertEquals(1, filter.count()); Object mirror = filter.first().asConstant().asObject(); - assert mirror.getClass().equals(Class.class); - assert mirror.equals(Integer.TYPE); + assertEquals(Class.class, mirror.getClass()); + assertEquals(Integer.TYPE, mirror); - assert result.getNodes(FloatingReadNode.class).count() == 0; - assert result.getNodes(ReadNode.class).count() == 0; + assertEquals(0, result.getNodes(FloatingReadNode.class).count()); + assertEquals(0, result.getNodes(ReadNode.class).count()); } private StructuredGraph compile(String test, boolean compileAOT) {