changeset 1774:08daea43a7f8

7164114: Two jtreg tests are not run due to no file extension on the test files Reviewed-by: mcimadamore
author vromero
date Tue, 21 May 2013 14:33:09 +0100
parents 37295244f534
children 31344e8e3343
files test/tools/javac/HiddenAbstractMethod/Test test/tools/javac/HiddenAbstractMethod/Test.java test/tools/javac/NonAmbiguousField/Test test/tools/javac/NonAmbiguousField/Test.java test/tools/javac/NonAmbiguousField/two/Child2.java
diffstat 5 files changed, 25 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/test/tools/javac/HiddenAbstractMethod/Test	Tue May 21 13:50:56 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-/*
- * @test
- * @bug 1240831
- * @summary Certain classes should have been reported as abstract, but
- *          the compiler failed to detect this.  This comes up when a
- *          subclass declares a method with the same name as an
- *          unimplemented, unaccessible method in a superclass.  Even though
- *          the method has the same name, it does not override.
- * @author turnidge
- *
- * @compile/fail -nowrite one/Parent.java two/Child.java
- */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/HiddenAbstractMethod/Test.java	Tue May 21 14:33:09 2013 +0100
@@ -0,0 +1,12 @@
+/*
+ * @test
+ * @bug 1240831
+ * @summary Certain classes should have been reported as abstract, but
+ *          the compiler failed to detect this.  This comes up when a
+ *          subclass declares a method with the same name as an
+ *          unimplemented, unaccessible method in a superclass.  Even though
+ *          the method has the same name, it does not override.
+ * @author turnidge
+ *
+ * @compile/fail one/Parent.java two/Child.java
+ */
--- a/test/tools/javac/NonAmbiguousField/Test	Tue May 21 13:50:56 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-/*
- * @test
- * @bug 4053724
- * @summary Certain non-ambiguous field references were reported by the
- *          compiler as ambigous.
- * @author turnidge
- *
- * @compile -nowrite one/Parent.java two/Child.java
- * @compile -nowrite one/Parent2.java two/Child2.java
- */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/NonAmbiguousField/Test.java	Tue May 21 14:33:09 2013 +0100
@@ -0,0 +1,10 @@
+/*
+ * @test
+ * @bug 4053724
+ * @summary Certain non-ambiguous field references were reported by the
+ *          compiler as ambigous.
+ * @author turnidge
+ *
+ * @compile one/Parent.java two/Child.java
+ * @compile/fail one/Parent2.java two/Child2.java
+ */
--- a/test/tools/javac/NonAmbiguousField/two/Child2.java	Tue May 21 13:50:56 2013 +0100
+++ b/test/tools/javac/NonAmbiguousField/two/Child2.java	Tue May 21 14:33:09 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, 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
@@ -28,9 +28,7 @@
 }
 
 public class Child2 extends one.Parent2 implements I {
-    class inner {
-        void method() {
-            System.out.println(i);
-        }
+    void method() {
+        System.out.println(i);
     }
 }