groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sun...@apache.org
Subject [45/50] [abbrv] groovy git commit: remove "subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule" (it is auto-generated by Gradle) and fix the assumption in test
Date Fri, 07 Apr 2017 13:31:28 GMT
remove "subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule"
(it is auto-generated by Gradle) and fix the assumption in test


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/68acdae2
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/68acdae2
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/68acdae2

Branch: refs/heads/parrot
Commit: 68acdae20654c3beb5e3dfe1a439b4fb824f16b2
Parents: 42b9a42
Author: Sergei Egorov <sergei.egorov@zeroturnaround.com>
Authored: Wed Mar 29 17:01:39 2017 +0200
Committer: Sergei Egorov <sergei.egorov@zeroturnaround.com>
Committed: Wed Mar 29 17:01:39 2017 +0200

----------------------------------------------------------------------
 .../org.codehaus.groovy.runtime.ExtensionModule    | 17 -----------------
 .../org/codehaus/groovy/macro/MacroTest.groovy     |  5 ++++-
 2 files changed, 4 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/68acdae2/subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
b/subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
deleted file mode 100644
index 2d10063..0000000
--- a/subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-moduleName=macro-module
-moduleVersion=1.0
-extensionClasses=org.codehaus.groovy.macro.methods.MacroGroovyMethods

http://git-wip-us.apache.org/repos/asf/groovy/blob/68acdae2/subprojects/groovy-macro/src/test/groovy/org/codehaus/groovy/macro/MacroTest.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/test/groovy/org/codehaus/groovy/macro/MacroTest.groovy
b/subprojects/groovy-macro/src/test/groovy/org/codehaus/groovy/macro/MacroTest.groovy
index 4ccb46b..a091335 100644
--- a/subprojects/groovy-macro/src/test/groovy/org/codehaus/groovy/macro/MacroTest.groovy
+++ b/subprojects/groovy-macro/src/test/groovy/org/codehaus/groovy/macro/MacroTest.groovy
@@ -19,6 +19,7 @@
 package org.codehaus.groovy.macro
 
 import groovy.transform.CompileStatic;
+import org.codehaus.groovy.runtime.metaclass.MethodSelectionException;
 
 /**
  *
@@ -226,7 +227,9 @@ class MacroTest extends GroovyTestCase {
     }
 
     void testNotAMacroCall() {
-        shouldFail(MissingMethodException) {
+        // FIXME should fail with "MissingMethodException" because none of MacroGroovy extension
methods
+        // are defined with "no-args" version
+        shouldFail(MethodSelectionException) {
             assertScript 'macro()'
         }
     }


Mime
View raw message