test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerBasicTest.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
*** 51,63 ****
              "ExpectedContainer"
          })
  @ExpectedContainer(
          value = UnofficialContainer.class,
          getAnnotation = "@UnofficialContainer("
!         + "value=[@Foo(value=1), @Foo(value=2)])",
          getAnnotationsByType = {"@UnofficialContainer("
!                 + "value=[@Foo(value=1), @Foo(value=2)])"})
  @Foo(value = 0)
  @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)})
  class MixSingularAndUnofficialContainerBasicTest {
  
      @ExpectedBase(
--- 51,63 ----
              "ExpectedContainer"
          })
  @ExpectedContainer(
          value = UnofficialContainer.class,
          getAnnotation = "@UnofficialContainer("
!         + "value={@Foo(value=1), @Foo(value=2)})",
          getAnnotationsByType = {"@UnofficialContainer("
!                 + "value={@Foo(value=1), @Foo(value=2)})"})
  @Foo(value = 0)
  @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)})
  class MixSingularAndUnofficialContainerBasicTest {
  
      @ExpectedBase(
*** 77,89 ****
                  "ExpectedContainer"
              })
      @ExpectedContainer(
              value = UnofficialContainer.class,
              getAnnotation = "@UnofficialContainer("
!             + "value=[@Foo(value=1), @Foo(value=2)])",
              getAnnotationsByType = {"@UnofficialContainer("
!                     + "value=[@Foo(value=1), @Foo(value=2)])"})
      @Foo(value = 0)
      @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)})
      int testField = 0;
  
      @ExpectedBase(
--- 77,89 ----
                  "ExpectedContainer"
              })
      @ExpectedContainer(
              value = UnofficialContainer.class,
              getAnnotation = "@UnofficialContainer("
!             + "value={@Foo(value=1), @Foo(value=2)})",
              getAnnotationsByType = {"@UnofficialContainer("
!                     + "value={@Foo(value=1), @Foo(value=2)})"})
      @Foo(value = 0)
      @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)})
      int testField = 0;
  
      @ExpectedBase(
*** 103,114 ****
                  "ExpectedContainer"
              })
      @ExpectedContainer(
              value = UnofficialContainer.class,
              getAnnotation = "@UnofficialContainer("
!             + "value=[@Foo(value=1), @Foo(value=2)])",
              getAnnotationsByType = {"@UnofficialContainer("
!                     + "value=[@Foo(value=1), @Foo(value=2)])"})
      @Foo(value = 0)
      @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)})
      void testMethod() {}
  }
--- 103,114 ----
                  "ExpectedContainer"
              })
      @ExpectedContainer(
              value = UnofficialContainer.class,
              getAnnotation = "@UnofficialContainer("
!             + "value={@Foo(value=1), @Foo(value=2)})",
              getAnnotationsByType = {"@UnofficialContainer("
!                     + "value={@Foo(value=1), @Foo(value=2)})"})
      @Foo(value = 0)
      @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)})
      void testMethod() {}
  }