1.1 --- a/test/tools/javac/annotations/repeatingAnnotations/combo/RetentionAnnoCombo.java Mon Jan 14 19:52:36 2013 +0100
1.2 +++ b/test/tools/javac/annotations/repeatingAnnotations/combo/RetentionAnnoCombo.java Mon Jan 14 13:50:01 2013 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -120,7 +120,7 @@
1.11 new DiagnosticCollector<JavaFileObject>();
1.12 boolean ok = compileCode(className, contents, diagnostics);
1.13
1.14 - String expectedErrKey = "compiler.err.invalid.containedby" +
1.15 + String expectedErrKey = "compiler.err.invalid.repeatable" +
1.16 ".annotation.retention";
1.17 if (!shouldCompile && !ok) {
1.18 for (Diagnostic<?> d : diagnostics.getDiagnostics()) {
1.19 @@ -175,10 +175,9 @@
1.20 StringBuilder annoData = new StringBuilder();
1.21 annoData.append(Helper.ContentVars.IMPORTCONTAINERSTMTS.getVal())
1.22 .append(Helper.ContentVars.IMPORTRETENTION.getVal())
1.23 - .append(Helper.ContentVars.CONTAINERFOR.getVal())
1.24 .append(replacedRetCAVal)
1.25 .append(Helper.ContentVars.CONTAINER.getVal())
1.26 - .append(Helper.ContentVars.CONTAINEDBY.getVal())
1.27 + .append(Helper.ContentVars.REPEATABLE.getVal())
1.28 .append(replacedRetBaseVal)
1.29 .append(Helper.ContentVars.BASE.getVal());
1.30
