You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/04/24 23:13:37 UTC
[2/2] wicket git commit: Add a test for IModel#flatMap
Add a test for IModel#flatMap
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/445965f1
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/445965f1
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/445965f1
Branch: refs/heads/master
Commit: 445965f1f9e1f0c62ed9ecdaa060ba3d1c8f61a2
Parents: 406daf1
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Apr 24 23:13:08 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Apr 24 23:13:08 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/model/LambdaModel.java | 2 +-
.../java/org/apache/wicket/model/IModelTest.java | 18 ++++++++----------
2 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/445965f1/wicket-core/src/main/java/org/apache/wicket/model/LambdaModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/LambdaModel.java b/wicket-core/src/main/java/org/apache/wicket/model/LambdaModel.java
index f28fdc9..3266992 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/LambdaModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/LambdaModel.java
@@ -109,7 +109,7 @@ public class LambdaModel<T> implements IModel<T>
* @param <T> model object type
*/
public static <T> IModel<T> of(WicketSupplier<T> getter, WicketConsumer<T> setter) {
- return new LambdaModel<T>(getter, setter);
+ return new LambdaModel<>(getter, setter);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/445965f1/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java
index d2b9c85..7b27158 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java
@@ -26,7 +26,6 @@ import org.apache.wicket.model.lambda.Address;
import org.apache.wicket.model.lambda.Person;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -132,20 +131,19 @@ public class IModelTest extends Assert
IModel.of(person).mapWith(null, Model.of("Jane"));
}
- @Ignore
@Test
public void flatMap()
{
- IModel<String> heirModel = IModel.of(person).flatMap(person1 -> new Model<String>() {
- @Override
- public String getObject()
- {
- return person1.getName() + " is my parent";
- }
- });
+ IModel<String> heirModel = IModel.of(person)
+ .flatMap(john ->
+ LambdaModel.of(
+ () -> john.getName() + " is my parent",
+ john::setName
+ )
+ );
assertThat(heirModel.getObject(), is(equalTo("John is my parent")));
- String newValue = "New Value";
+ String newValue = "Matthias";
heirModel.setObject(newValue);
assertThat(heirModel.getObject(), is(equalTo("Matthias is my parent")));
}