Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make default methods work in lambdas (#714)
Change on 2016/03/07 by lukhnos <lukhnos@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=116586412
- Loading branch information
Showing
16 changed files
with
308 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
128 changes: 128 additions & 0 deletions
128
jre_emul/Tests/com/google/j2objc/java8/DefaultMethodsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| /* | ||
| * Licensed 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 com.google.j2objc.java8; | ||
|
|
||
| import static junit.framework.Assert.assertEquals; | ||
| import static junit.framework.TestCase.assertFalse; | ||
| import static junit.framework.TestCase.assertTrue; | ||
|
|
||
| import junit.framework.TestCase; | ||
|
|
||
| /** | ||
| * Tests for default method support. | ||
| * | ||
| * @author Lukhnos Liu | ||
| */ | ||
| public class DefaultMethodsTest extends TestCase { | ||
| interface A { | ||
| default boolean f() { | ||
| return true; | ||
| } | ||
|
|
||
| default boolean notF() { | ||
| return !f(); | ||
| } | ||
|
|
||
| default String getPrefix() { | ||
| return ""; | ||
| } | ||
|
|
||
| default String getTag(String name) { | ||
| return getPrefix() + name; | ||
| } | ||
|
|
||
| default String getDefaultTag() { | ||
| return getTag("default"); | ||
| } | ||
| } | ||
|
|
||
| interface B extends A { | ||
| boolean f(); | ||
|
|
||
| // TODO: This should return a capturing lambda to capture the implicit this/self. | ||
| default B not() { | ||
| return () -> !f(); | ||
| } | ||
| } | ||
|
|
||
| interface C extends A { | ||
| default boolean f() { | ||
| return !A.super.f(); | ||
| } | ||
| } | ||
|
|
||
| interface D extends A { | ||
| static String getDPrefix() { | ||
| return "static-"; | ||
| } | ||
|
|
||
| String getTag(String name); | ||
| } | ||
|
|
||
| static class AP implements A { | ||
| } | ||
|
|
||
| static class AQ implements A { | ||
| @Override | ||
| public boolean f() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public String getPrefix() { | ||
| return "prefix-"; | ||
| } | ||
|
|
||
| @Override | ||
| public String getDefaultTag() { | ||
| return getTag("DEFAULT"); | ||
| } | ||
| } | ||
|
|
||
| public void testBasicInstantiation() { | ||
| AP a = new AP(); | ||
| assertTrue(a.f()); | ||
| assertFalse(a.notF()); | ||
| assertEquals("default", a.getDefaultTag()); | ||
| } | ||
|
|
||
| public void testSuperInvocation() { | ||
| A c = new C() {}; | ||
| assertFalse(c.f()); | ||
| assertTrue(c.notF()); | ||
| } | ||
|
|
||
| public void testOverriding() { | ||
| AQ a = new AQ(); | ||
| assertFalse(a.f()); | ||
| assertTrue(a.notF()); | ||
| assertEquals("prefix-DEFAULT", a.getDefaultTag()); | ||
| } | ||
|
|
||
| public void testLambdaWithDefaultMethods() { | ||
| B b1 = () -> true; | ||
| assertTrue(b1.f()); | ||
| assertFalse(b1.notF()); | ||
| // TODO: Enable this assertion once the non-capturing lambda bug is fixed. | ||
| // assertFalse(b1.not().f()); | ||
|
|
||
| B b2 = () -> false; | ||
| assertFalse(b2.f()); | ||
| assertTrue(b2.notF()); | ||
| // assertTrue(b2.not().f()); | ||
|
|
||
| D d = (name) -> D.getDPrefix() + name; | ||
| assertEquals("static-default", d.getDefaultTag()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.