8163113: langtools repeating annotations tests depend rely on annotations toString output

Reviewed-by: jlahoda, vromero
This commit is contained in:
Joe Darcy 2016-08-03 11:30:27 -07:00
parent a5b296fde7
commit 498a90cde6
22 changed files with 222 additions and 244 deletions

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, 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.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/*
* @test
* @bug 8004822
* @bug 8004822 8163113
* @author mnunez
* @summary Language model api test basics for repeating annotations
* @library /tools/javac/lib
@ -53,8 +53,8 @@
})
@ExpectedContainer(
value = BarContainer.class,
getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])",
getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"})
getAnnotation = "@BarContainer(value={@Bar(value=1), @Bar(value=2)})",
getAnnotationsByType = {"@BarContainer(value={@Bar(value=1), @Bar(value=2)})"})
@Bar(value = 1)
@Bar(value = 2)
class RepeatableBasicTest {
@ -78,8 +78,8 @@ class RepeatableBasicTest {
})
@ExpectedContainer(
value = BarContainer.class,
getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])",
getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"})
getAnnotation = "@BarContainer(value={@Bar(value=1), @Bar(value=2)})",
getAnnotationsByType = {"@BarContainer(value={@Bar(value=1), @Bar(value=2)})"})
@Bar(value = 1)
@Bar(value = 2)
int testField = 0;
@ -103,8 +103,8 @@ class RepeatableBasicTest {
})
@ExpectedContainer(
value = BarContainer.class,
getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])",
getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"})
getAnnotation = "@BarContainer(value={@Bar(value=1), @Bar(value=2)})",
getAnnotationsByType = {"@BarContainer(value={@Bar(value=1), @Bar(value=2)})"})
@Bar(value = 1)
@Bar(value = 2)
void testMethod() {}