Browse Source

Make test for EditorSaveEvent.bean field

* Fixes #8810, #8658
tags/8.1.0.alpha1
Ilia Motornyi 7 years ago
parent
commit
156da8b130

+ 2
- 1
server/src/main/java/com/vaadin/ui/components/grid/EditorImpl.java View File

@@ -265,9 +265,10 @@ public class EditorImpl<T> extends AbstractGridExtension<T>
}

private void doCancel(boolean afterBeingSaved) {
T editedBean = edited;
doClose();
if (!afterBeingSaved) {
eventRouter.fireEvent(new EditorCancelEvent<>(this, edited));
eventRouter.fireEvent(new EditorCancelEvent<>(this, editedBean));
}
}


+ 23
- 5
server/src/test/java/com/vaadin/tests/server/component/grid/EditorImplTest.java View File

@@ -18,6 +18,7 @@ package com.vaadin.tests.server.component.grid;
import java.util.Optional;
import java.util.stream.Stream;

import com.vaadin.ui.Grid;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -43,6 +44,11 @@ public class EditorImplTest {
public static class TestEditorImpl extends EditorImpl<Object> implements
EditorSaveListener<Object>, EditorCancelListener<Object> {

@Override
public void doEdit(Object bean) {
super.doEdit(bean);
}

public TestEditorImpl() {
super(new PropertySet<Object>() {
@Override
@@ -56,6 +62,12 @@ public class EditorImplTest {
return null;
}
});

}

@Override
public Grid<Object> getParent() {
return new Grid<>();
}

EditorCancelEvent<Object> cancelEvent;
@@ -64,11 +76,6 @@ public class EditorImplTest {

EditorServerRpc rpc;

@Override
public boolean isOpen() {
return true;
}

@Override
public boolean isBuffered() {
return true;
@@ -99,6 +106,8 @@ public class EditorImplTest {
}
}

private Object beanToEdit = new Object();

private TestEditorImpl editor;
private Binder<Object> binder;

@@ -109,6 +118,8 @@ public class EditorImplTest {
editor.addCancelListener(editor);
binder = Mockito.mock(Binder.class);
editor.setBinder(binder);
editor.setEnabled(true);
editor.doEdit(beanToEdit);
}

@Test
@@ -121,6 +132,7 @@ public class EditorImplTest {
Assert.assertNull(editor.cancelEvent);

Assert.assertEquals(editor, editor.saveEvent.getSource());
Assert.assertEquals(beanToEdit, editor.saveEvent.getBean());
}

@Test
@@ -131,6 +143,8 @@ public class EditorImplTest {
Assert.assertNotNull(editor.cancelEvent);

Assert.assertEquals(editor, editor.cancelEvent.getSource());

Assert.assertEquals(beanToEdit, editor.cancelEvent.getBean());
}

@Test
@@ -143,6 +157,8 @@ public class EditorImplTest {
Assert.assertNull(editor.cancelEvent);

Assert.assertEquals(editor, editor.saveEvent.getSource());

Assert.assertEquals(beanToEdit, editor.saveEvent.getBean());
}

@Test
@@ -153,6 +169,8 @@ public class EditorImplTest {
Assert.assertNotNull(editor.cancelEvent);

Assert.assertEquals(editor, editor.cancelEvent.getSource());

Assert.assertEquals(beanToEdit, editor.cancelEvent.getBean());
}

@Test

Loading…
Cancel
Save