test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerInheritedTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2015, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 21,31 ****
   * questions.
   */
  
  /*
   * @test
!  * @bug     8004822
   * @author  mnunez
   * @summary Language model api test basics for repeating annotations
   * @library /tools/javac/lib
   * @library supportingAnnotations
   * @modules java.compiler
--- 21,31 ----
   * questions.
   */
  
  /*
   * @test
!  * @bug     8004822 8163113
   * @author  mnunez
   * @summary Language model api test basics for repeating annotations
   * @library /tools/javac/lib
   * @library supportingAnnotations
   * @modules java.compiler
*** 41,52 ****
  
  @ExpectedBase(
          value = BarInheritedContainer.class,
          getAnnotation = "null",
          getAnnotationsByType = {
!             "@BarInheritedContainer(value=[@BarInherited(value=1)])",
!             "@BarInheritedContainer(value=[@BarInherited(value=2)])"
          },
          getAllAnnotationMirrors = {
              "@BarInheritedContainerContainer("
                  + "{@BarInheritedContainer({@BarInherited(1)}),"
                  + " @BarInheritedContainer({@BarInherited(2)})})",
--- 41,52 ----
  
  @ExpectedBase(
          value = BarInheritedContainer.class,
          getAnnotation = "null",
          getAnnotationsByType = {
!             "@BarInheritedContainer(value={@BarInherited(value=1)})",
!             "@BarInheritedContainer(value={@BarInherited(value=2)})"
          },
          getAllAnnotationMirrors = {
              "@BarInheritedContainerContainer("
                  + "{@BarInheritedContainer({@BarInherited(1)}),"
                  + " @BarInheritedContainer({@BarInherited(2)})})",
*** 58,68 ****
              "ExpectedContainer"
          })
  @ExpectedContainer(
          value = BarInheritedContainerContainer.class,
          getAnnotation = "@BarInheritedContainerContainer("
!         + "value=[@BarInheritedContainer(value=[@BarInherited(value=1)]),"
!         + " @BarInheritedContainer(value=[@BarInherited(value=2)])])",
          getAnnotationsByType = {"@BarInheritedContainerContainer("
!                 + "value=[@BarInheritedContainer(value=[@BarInherited(value=1)]),"
!         + " @BarInheritedContainer(value=[@BarInherited(value=2)])])"})
  class RepeatableOfficialContainerInheritedTest extends O {}
--- 58,68 ----
              "ExpectedContainer"
          })
  @ExpectedContainer(
          value = BarInheritedContainerContainer.class,
          getAnnotation = "@BarInheritedContainerContainer("
!         + "value={@BarInheritedContainer(value={@BarInherited(value=1)}),"
!         + " @BarInheritedContainer(value={@BarInherited(value=2)})})",
          getAnnotationsByType = {"@BarInheritedContainerContainer("
!                 + "value={@BarInheritedContainer(value={@BarInherited(value=1)}),"
!         + " @BarInheritedContainer(value={@BarInherited(value=2)})})"})
  class RepeatableOfficialContainerInheritedTest extends O {}