Mercurial > hg > truffle

changeset 16485:d6604020da93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed com.oracle.graal.api.meta.jdk8.test project
author Doug Simon <doug.simon@oracle.com>
date Thu, 10 Jul 2014 23:15:02 +0200
parents 27f2ee618883
children d3fc4779fc60
files graal/com.oracle.graal.api.meta.jdk8.test/src/com/oracle/graal/api/meta/jdk8/test/TestResolvedJavaMethodJDK8.java graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaMethod.java graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java mx/projects
diffstat 4 files changed, 14 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.meta.jdk8.test/src/com/oracle/graal/api/meta/jdk8/test/TestResolvedJavaMethodJDK8.java	Thu Jul 10 23:07:55 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.api.meta.jdk8.test;
-
-import static org.junit.Assert.*;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import org.junit.*;
-
-import com.oracle.graal.api.meta.*;
-import com.oracle.graal.api.meta.test.*;
-
-/**
- * Tests for {@link ResolvedJavaMethod} that require JDK &ge; 8.
- */
-public class TestResolvedJavaMethodJDK8 extends MethodUniverse {
-
-    public TestResolvedJavaMethodJDK8() {
-    }
-
-    @Test
-    public void isDefaultTest() {
-        for (Map.Entry<Method, ResolvedJavaMethod> e : methods.entrySet()) {
-            ResolvedJavaMethod m = e.getValue();
-            assertEquals(e.getKey().isDefault(), m.isDefault());
-        }
-        for (Map.Entry<Constructor<?>, ResolvedJavaMethod> e : constructors.entrySet()) {
-            ResolvedJavaMethod m = e.getValue();
-            assertFalse(m.isDefault());
-        }
-    }
-}
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaMethod.java	Thu Jul 10 23:07:55 2014 +0200
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaMethod.java	Thu Jul 10 23:15:02 2014 +0200
@@ -267,6 +267,18 @@
         assertTrue(2 <= method2StackSize && method2StackSize <= 4);
     }
 
+    @Test
+    public void isDefaultTest() {
+        for (Map.Entry<Method, ResolvedJavaMethod> e : methods.entrySet()) {
+            ResolvedJavaMethod m = e.getValue();
+            assertEquals(e.getKey().isDefault(), m.isDefault());
+        }
+        for (Map.Entry<Constructor<?>, ResolvedJavaMethod> e : constructors.entrySet()) {
+            ResolvedJavaMethod m = e.getValue();
+            assertFalse(m.isDefault());
+        }
+    }
+
     private Method findTestMethod(Method apiMethod) {
         String testName = apiMethod.getName() + "Test";
         for (Method m : getClass().getDeclaredMethods()) {
@@ -291,7 +303,7 @@
         "getLineNumberTable",
         "getLocalVariableTable",
         "isInVirtualMethodTable",
-        "isDefault" // tested in TestResolvedJavaMethodJDK8
+        "getParameterAnnotation"
     };
     // @formatter:on
 
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java	Thu Jul 10 23:07:55 2014 +0200
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java	Thu Jul 10 23:15:02 2014 +0200
@@ -710,6 +710,7 @@
         "getClassFilePath",
         "isLocal",
         "isMember",
+        "getElementalType",
         "getEnclosingType"
     };
     // @formatter:on
--- a/mx/projects	Thu Jul 10 23:07:55 2014 +0200
+++ b/mx/projects	Thu Jul 10 23:15:02 2014 +0200
@@ -135,14 +135,6 @@
 project@com.oracle.graal.api.meta.test@javaCompliance=1.8
 project@com.oracle.graal.api.meta.test@workingSets=API,Graal,Test
 
-# graal.api.meta.jdk8.test
-project@com.oracle.graal.api.meta.jdk8.test@subDir=graal
-project@com.oracle.graal.api.meta.jdk8.test@sourceDirs=src
-project@com.oracle.graal.api.meta.jdk8.test@dependencies=com.oracle.graal.api.meta.test
-project@com.oracle.graal.api.meta.jdk8.test@checkstyle=com.oracle.graal.graph
-project@com.oracle.graal.api.meta.jdk8.test@javaCompliance=1.8
-project@com.oracle.graal.api.meta.jdk8.test@workingSets=API,Graal,Test
-
 # graal.api.code
 project@com.oracle.graal.api.code@subDir=graal
 project@com.oracle.graal.api.code@sourceDirs=src