This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_2_5_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit c9fdc50cc8623c3e957f0d252310d153a3e260bf Author: Paul King <pa...@asert.com.au> AuthorDate: Wed Mar 20 22:42:21 2019 +1000 move new tests to existing subdirectory --- .../runtime/typehandling/EqualityTest.groovy | 12 --------- .../runtime/typehandling/EqualityTestClassA.java | 9 ------- .../runtime/typehandling/EqualityTestClassB.java | 9 ------- .../typehandling/EqualityTestInterface.java | 6 ----- .../runtime/typehandling/EqualityTest.groovy | 30 ++++++++++++++++++++++ .../typehandling/EqualityTestAbstractClass.java | 20 ++++++++++++++- .../runtime/typehandling/EqualityTestClassA.java | 27 +++++++++++++++++++ .../runtime/typehandling/EqualityTestClassB.java | 27 +++++++++++++++++++ .../typehandling/EqualityTestInterface.java | 24 +++++++++++++++++ 9 files changed, 127 insertions(+), 37 deletions(-) diff --git a/src/test/groovy/runtime/typehandling/EqualityTest.groovy b/src/test/groovy/runtime/typehandling/EqualityTest.groovy deleted file mode 100755 index b5d42ba..0000000 --- a/src/test/groovy/runtime/typehandling/EqualityTest.groovy +++ /dev/null @@ -1,12 +0,0 @@ -package groovy.runtime.typehandling - -class EqualityTest extends GroovyTestCase { - - void testEquality() { - def classA = new EqualityTestClassA(1, "Test") - def classB = new EqualityTestClassB(1, "Test") - - assert classA == classB - assert classA.equals(classB) - } -} diff --git a/src/test/groovy/runtime/typehandling/EqualityTestClassA.java b/src/test/groovy/runtime/typehandling/EqualityTestClassA.java deleted file mode 100755 index 8bfa539..0000000 --- a/src/test/groovy/runtime/typehandling/EqualityTestClassA.java +++ /dev/null @@ -1,9 +0,0 @@ -package groovy.runtime.typehandling; - -public class EqualityTestClassA extends EqualityTestAbstractClass { - - public EqualityTestClassA(int id, String value) { - super(id, value); - } - -} diff --git a/src/test/groovy/runtime/typehandling/EqualityTestClassB.java b/src/test/groovy/runtime/typehandling/EqualityTestClassB.java deleted file mode 100755 index 7381082..0000000 --- a/src/test/groovy/runtime/typehandling/EqualityTestClassB.java +++ /dev/null @@ -1,9 +0,0 @@ -package groovy.runtime.typehandling; - -public class EqualityTestClassB extends EqualityTestAbstractClass { - - public EqualityTestClassB(int id, String value) { - super(id, value); - } - -} diff --git a/src/test/groovy/runtime/typehandling/EqualityTestInterface.java b/src/test/groovy/runtime/typehandling/EqualityTestInterface.java deleted file mode 100755 index 4c4ef24..0000000 --- a/src/test/groovy/runtime/typehandling/EqualityTestInterface.java +++ /dev/null @@ -1,6 +0,0 @@ -package groovy.runtime.typehandling; - -public interface EqualityTestInterface extends Comparable<EqualityTestInterface> { - int getId(); - String getValue(); -} diff --git a/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTest.groovy b/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTest.groovy new file mode 100644 index 0000000..d15fa60 --- /dev/null +++ b/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTest.groovy @@ -0,0 +1,30 @@ +/* + * 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. + */ +package org.codehaus.groovy.runtime.typehandling + +class EqualityTest extends GroovyTestCase { + + void testEquality() { + def classA = new EqualityTestClassA(1, "Test") + def classB = new EqualityTestClassB(1, "Test") + + assert classA == classB + assert classA.equals(classB) + } +} diff --git a/src/test/groovy/runtime/typehandling/EqualityTestAbstractClass.java b/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTestAbstractClass.java old mode 100755 new mode 100644 similarity index 58% rename from src/test/groovy/runtime/typehandling/EqualityTestAbstractClass.java rename to src/test/org/codehaus/groovy/runtime/typehandling/EqualityTestAbstractClass.java index 6b5d138..dd611cb --- a/src/test/groovy/runtime/typehandling/EqualityTestAbstractClass.java +++ b/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTestAbstractClass.java @@ -1,4 +1,22 @@ -package groovy.runtime.typehandling; +/* + * 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. + */ +package org.codehaus.groovy.runtime.typehandling; public class EqualityTestAbstractClass implements EqualityTestInterface { diff --git a/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTestClassA.java b/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTestClassA.java new file mode 100644 index 0000000..a7d1039 --- /dev/null +++ b/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTestClassA.java @@ -0,0 +1,27 @@ +/* + * 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. + */ +package org.codehaus.groovy.runtime.typehandling; + +public class EqualityTestClassA extends EqualityTestAbstractClass { + + public EqualityTestClassA(int id, String value) { + super(id, value); + } + +} diff --git a/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTestClassB.java b/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTestClassB.java new file mode 100644 index 0000000..f8fb8ff --- /dev/null +++ b/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTestClassB.java @@ -0,0 +1,27 @@ +/* + * 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. + */ +package org.codehaus.groovy.runtime.typehandling; + +public class EqualityTestClassB extends EqualityTestAbstractClass { + + public EqualityTestClassB(int id, String value) { + super(id, value); + } + +} diff --git a/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTestInterface.java b/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTestInterface.java new file mode 100644 index 0000000..8bc3160 --- /dev/null +++ b/src/test/org/codehaus/groovy/runtime/typehandling/EqualityTestInterface.java @@ -0,0 +1,24 @@ +/* + * 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. + */ +package org.codehaus.groovy.runtime.typehandling; + +public interface EqualityTestInterface extends Comparable<EqualityTestInterface> { + int getId(); + String getValue(); +}