From a95dadcde5a223aacc3005b298d66e00419454e8 Mon Sep 17 00:00:00 2001
From: Aleksi Hietanen <aleksi@vaadin.com>
Date: Thu, 8 Dec 2016 18:44:32 +0200
Subject: Change return type of Binder#getBean to BEAN

---
 .../com/vaadin/data/BinderConverterValidatorTest.java    |  8 ++++----
 server/src/test/java/com/vaadin/data/BinderTest.java     | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'server/src/test/java')

diff --git a/server/src/test/java/com/vaadin/data/BinderConverterValidatorTest.java b/server/src/test/java/com/vaadin/data/BinderConverterValidatorTest.java
index f6a7463a12..81cfbb5484 100644
--- a/server/src/test/java/com/vaadin/data/BinderConverterValidatorTest.java
+++ b/server/src/test/java/com/vaadin/data/BinderConverterValidatorTest.java
@@ -202,16 +202,16 @@ public class BinderConverterValidatorTest
     @Test
     public void convertDataToField() {
         bindAgeWithValidatorConverterValidator();
-        binder.getBean().get().setAge(12);
-        binder.readBean(binder.getBean().get());
+        binder.getBean().setAge(12);
+        binder.readBean(binder.getBean());
         assertEquals("12", ageField.getValue());
     }
 
     @Test
     public void convertNotValidatableDataToField() {
         bindAgeWithValidatorConverterValidator();
-        binder.getBean().get().setAge(-12);
-        binder.readBean(binder.getBean().get());
+        binder.getBean().setAge(-12);
+        binder.readBean(binder.getBean());
         assertEquals("-12", ageField.getValue());
     }
 
diff --git a/server/src/test/java/com/vaadin/data/BinderTest.java b/server/src/test/java/com/vaadin/data/BinderTest.java
index d1f831003b..397676c062 100644
--- a/server/src/test/java/com/vaadin/data/BinderTest.java
+++ b/server/src/test/java/com/vaadin/data/BinderTest.java
@@ -1,9 +1,9 @@
 package com.vaadin.data;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 
 import java.util.Locale;
 import java.util.Objects;
@@ -34,10 +34,10 @@ public class BinderTest extends BinderTestBase<Binder<Person>, Person> {
     @Test
     public void bindNullBean_noBeanPresent() {
         binder.setBean(item);
-        assertTrue(binder.getBean().isPresent());
+        assertNotNull(binder.getBean());
 
         binder.setBean(null);
-        assertFalse(binder.getBean().isPresent());
+        assertNull(binder.getBean());
     }
 
     @Test(expected = NullPointerException.class)
@@ -76,16 +76,16 @@ public class BinderTest extends BinderTestBase<Binder<Person>, Person> {
 
     @Test
     public void bound_getBean_returnsBoundBean() {
-        assertFalse(binder.getBean().isPresent());
+        assertNull(binder.getBean());
         binder.setBean(item);
-        assertSame(item, binder.getBean().get());
+        assertSame(item, binder.getBean());
     }
 
     @Test
     public void unbound_getBean_returnsNothing() {
         binder.setBean(item);
         binder.removeBean();
-        assertFalse(binder.getBean().isPresent());
+        assertNull(binder.getBean());
     }
 
     @Test
@@ -122,7 +122,7 @@ public class BinderTest extends BinderTestBase<Binder<Person>, Person> {
         binder.setBean(p2);
         assertEquals("Marlon", nameField.getValue());
         assertEquals("Leif", item.getFirstName());
-        assertSame(p2, binder.getBean().get());
+        assertSame(p2, binder.getBean());
 
         nameField.setValue("Ilia");
         assertEquals("Ilia", p2.getFirstName());
-- 
cgit v1.2.3