8163231: A couple of runtime tests failing for the -testset hotspot snapshot job
Reviewed-by: acorn
This commit is contained in:
parent
bd20b32b64
commit
4497988860
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* @test
|
* @test
|
||||||
* @bug 8007320 8014709
|
* @bug 8007320 8014709 8163231
|
||||||
* @summary Test all optional fields in ConstMethod
|
* @summary Test all optional fields in ConstMethod
|
||||||
* @compile -g -parameters ConstMethodTest.java
|
* @compile -g -parameters ConstMethodTest.java
|
||||||
* @run main ConstMethodTest
|
* @run main ConstMethodTest
|
||||||
@ -122,8 +122,8 @@ public class ConstMethodTest {
|
|||||||
equal(ann.length, 3);
|
equal(ann.length, 3);
|
||||||
Annotation foo = ann[0][0];
|
Annotation foo = ann[0][0];
|
||||||
Annotation bar = ann[1][0];
|
Annotation bar = ann[1][0];
|
||||||
equal(foo.toString(), "@Named(value=aName)");
|
equal(foo.toString(), "@Named(value=\"aName\")");
|
||||||
equal(bar.toString(), "@Named(value=bName)");
|
equal(bar.toString(), "@Named(value=\"bName\")");
|
||||||
check(foo.equals(foo));
|
check(foo.equals(foo));
|
||||||
check(bar.equals(bar));
|
check(bar.equals(bar));
|
||||||
check(! foo.equals(bar));
|
check(! foo.equals(bar));
|
||||||
@ -131,7 +131,7 @@ public class ConstMethodTest {
|
|||||||
Annotation[] ann2 = m.getAnnotations();
|
Annotation[] ann2 = m.getAnnotations();
|
||||||
equal(ann2.length, 1);
|
equal(ann2.length, 1);
|
||||||
Annotation mann = ann2[0];
|
Annotation mann = ann2[0];
|
||||||
equal(mann.toString(), "@MyAnnotation(date=today, name=someName, value=Hello World)");
|
equal(mann.toString(), "@MyAnnotation(date=\"today\", name=\"someName\", value=\"Hello World\")");
|
||||||
// Test Method parameter names
|
// Test Method parameter names
|
||||||
Parameter[] parameters = m.getParameters();
|
Parameter[] parameters = m.getParameters();
|
||||||
if(parameters == null)
|
if(parameters == null)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -370,7 +370,7 @@ public class RedefineAnnotations {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static void verifyTestAnnSite(Annotation testAnn, String expectedSite) {
|
private static void verifyTestAnnSite(Annotation testAnn, String expectedSite) {
|
||||||
String expectedAnn = "@TestAnn(site=" + expectedSite + ")";
|
String expectedAnn = "@TestAnn(site=\"" + expectedSite + "\")";
|
||||||
assertTrue(testAnn.toString().equals(expectedAnn),
|
assertTrue(testAnn.toString().equals(expectedAnn),
|
||||||
"Expected \"" + expectedAnn + "\", got \"" + testAnn + "\"");
|
"Expected \"" + expectedAnn + "\", got \"" + testAnn + "\"");
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user