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

} }


private void doCancel(boolean afterBeingSaved) { private void doCancel(boolean afterBeingSaved) {
T editedBean = edited;
doClose(); doClose();
if (!afterBeingSaved) { 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

import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;


import com.vaadin.ui.Grid;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
public static class TestEditorImpl extends EditorImpl<Object> implements public static class TestEditorImpl extends EditorImpl<Object> implements
EditorSaveListener<Object>, EditorCancelListener<Object> { EditorSaveListener<Object>, EditorCancelListener<Object> {


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

public TestEditorImpl() { public TestEditorImpl() {
super(new PropertySet<Object>() { super(new PropertySet<Object>() {
@Override @Override
return null; return null;
} }
}); });

}

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


EditorCancelEvent<Object> cancelEvent; EditorCancelEvent<Object> cancelEvent;


EditorServerRpc rpc; EditorServerRpc rpc;


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

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


private Object beanToEdit = new Object();

private TestEditorImpl editor; private TestEditorImpl editor;
private Binder<Object> binder; private Binder<Object> binder;


editor.addCancelListener(editor); editor.addCancelListener(editor);
binder = Mockito.mock(Binder.class); binder = Mockito.mock(Binder.class);
editor.setBinder(binder); editor.setBinder(binder);
editor.setEnabled(true);
editor.doEdit(beanToEdit);
} }


@Test @Test
Assert.assertNull(editor.cancelEvent); Assert.assertNull(editor.cancelEvent);


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


@Test @Test
Assert.assertNotNull(editor.cancelEvent); Assert.assertNotNull(editor.cancelEvent);


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

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


@Test @Test
Assert.assertNull(editor.cancelEvent); Assert.assertNull(editor.cancelEvent);


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

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


@Test @Test
Assert.assertNotNull(editor.cancelEvent); Assert.assertNotNull(editor.cancelEvent);


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

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


@Test @Test

Loading…
Cancel
Save