test/tools/javac/varargs/6313164/T7175433.java

changeset 2531
fc2a01ba3d79
parent 0
959103a6100f
     1.1 --- a/test/tools/javac/varargs/6313164/T7175433.java	Wed Jun 25 16:50:12 2014 +0100
     1.2 +++ b/test/tools/javac/varargs/6313164/T7175433.java	Tue Jun 17 17:33:01 2014 +0100
     1.3 @@ -1,31 +1,8 @@
     1.4  /*
     1.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.7 - *
     1.8 - * This code is free software; you can redistribute it and/or modify it
     1.9 - * under the terms of the GNU General Public License version 2 only, as
    1.10 - * published by the Free Software Foundation.
    1.11 - *
    1.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
    1.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    1.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    1.15 - * version 2 for more details (a copy is included in the LICENSE file that
    1.16 - * accompanied this code).
    1.17 - *
    1.18 - * You should have received a copy of the GNU General Public License version
    1.19 - * 2 along with this work; if not, write to the Free Software Foundation,
    1.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1.21 - *
    1.22 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    1.23 - * or visit www.oracle.com if you need additional information or have any
    1.24 - * questions.
    1.25 - */
    1.26 -
    1.27 -/*
    1.28 - * @test
    1.29 + * @test /nodynamiccopyright/
    1.30   * @bug 7175433 6313164
    1.31   * @summary Inference cleanup: add helper class to handle inference variables
    1.32 - *
    1.33 + * @compile/fail/ref=T7175433.out -XDrawDiagnostics T7175433.java
    1.34   */
    1.35  
    1.36  import java.util.List;
    1.37 @@ -34,26 +11,16 @@
    1.38  
    1.39      private class Foo { }
    1.40  
    1.41 -    <Z> List<Z> m(Object... o) { T7175433.assertTrue(true); return null; }
    1.42 -    <Z> List<Z> m(Foo... o) { T7175433.assertTrue(false); return null; }
    1.43 +    <Z> List<Z> m(Object... o) { return null; }
    1.44 +    <Z> List<Z> m(Foo... o) { return null; }
    1.45  
    1.46      Foo getFoo() { return null; }
    1.47  }
    1.48  
    1.49  public class T7175433 {
    1.50  
    1.51 -    static int assertionCount;
    1.52 -
    1.53 -    static void assertTrue(boolean b) {
    1.54 -        assertionCount++;
    1.55 -        if (!b) {
    1.56 -            throw new AssertionError();
    1.57 -        }
    1.58 -    }
    1.59 -
    1.60      public static void main(String[] args) {
    1.61          Bar b = new Bar();
    1.62          b.m(b.getFoo());
    1.63 -        assertTrue(assertionCount == 1);
    1.64      }
    1.65  }

mercurial