test/langtools/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA2Test.java

*** 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 2019, 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.
*** 33,52 ****
   * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
   * @compile -processor ElementRepAnnoTester -proc:only
   * MixRepeatableAndOfficialContainerInheritedA2Test.java
   */
  
! @BarInherited(value = 0)
  class N {}
  
  @ExpectedBase(
          value = BarInherited.class,
!         getAnnotation = "@BarInherited(value=3)",
          getAnnotationsByType = {
!             "@BarInherited(value=1)",
!             "@BarInherited(value=2)",
!             "@BarInherited(value=3)"
          },
          getAllAnnotationMirrors = {
              "@BarInherited(3)",
              "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})",
              "ExpectedBase",
--- 33,52 ----
   * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
   * @compile -processor ElementRepAnnoTester -proc:only
   * MixRepeatableAndOfficialContainerInheritedA2Test.java
   */
  
! @BarInherited(0)
  class N {}
  
  @ExpectedBase(
          value = BarInherited.class,
!         getAnnotation = "@BarInherited(3)",
          getAnnotationsByType = {
!             "@BarInherited(1)",
!             "@BarInherited(2)",
!             "@BarInherited(3)"
          },
          getAllAnnotationMirrors = {
              "@BarInherited(3)",
              "@BarInheritedContainer({@BarInherited(1), @BarInherited(2)})",
              "ExpectedBase",
*** 59,69 ****
              "ExpectedContainer"
          })
  @ExpectedContainer(
          value = BarInheritedContainer.class,
          getAnnotation = "@BarInheritedContainer("
!         + "value={@BarInherited(value=1), @BarInherited(value=2)})",
          getAnnotationsByType = {"@BarInheritedContainer("
!                 + "value={@BarInherited(value=1), @BarInherited(value=2)})"})
! @BarInheritedContainer(value = {@BarInherited(value = 1), @BarInherited(value = 2)})
! @BarInherited(value = 3)
  class MixRepeatableAndOfficialContainerInheritedA2Test extends N {}
--- 59,69 ----
              "ExpectedContainer"
          })
  @ExpectedContainer(
          value = BarInheritedContainer.class,
          getAnnotation = "@BarInheritedContainer("
!         + "{@BarInherited(1), @BarInherited(2)})",
          getAnnotationsByType = {"@BarInheritedContainer("
!                 + "{@BarInherited(1), @BarInherited(2)})"})
! @BarInheritedContainer({@BarInherited(1), @BarInherited(2)})
! @BarInherited(3)
  class MixRepeatableAndOfficialContainerInheritedA2Test extends N {}