Fixes for tests

master
Markus Kreth 7 years ago
parent cf6ed1b950
commit ce35952237
  1. 17
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewDesktop.java
  2. 6
      src/main/resources/log4j2.xml
  3. 10
      src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobileSmokeTest.java
  4. 18
      src/test/resources/log4j2.xml

@ -28,10 +28,13 @@ public class MainViewDesktop extends MainView {
private static final long serialVersionUID = -3293470536470926668L;
private VerticalLayout eastLayout;
private HorizontalLayout mainLayout;
private HorizontalLayout eventButtonLayout;
private CalendarComponent calendar;
private DesktopHeadView head;
public MainViewDesktop(PersonDao personDao, GroupDao groupDao, EventBusiness eventBusiness,
@ -94,10 +97,15 @@ public class MainViewDesktop extends MainView {
final List<ClubEvent> events = eventBusiness.loadEvents();
LOGGER.info("Loaded events: {}", events);
final UI ui = calendar.getUI();
ui.access(() -> {
if (ui != null) {
ui.access(() -> {
calendar.setItems(events);
ui.push();
});
}
else {
calendar.setItems(events);
ui.push();
});
}
});
exec.shutdown();
@ -116,7 +124,8 @@ public class MainViewDesktop extends MainView {
ClubEvent ev = (ClubEvent) event.getCalendarItem();
if (securityVerifier.isLoggedin()) {
openDetailForEvent(ev);
} else {
}
else {
eventBusiness.setSelected(ev);
navigator.navigateTo(ClubhelperViews.LoginUI.name() + '/' + ev.getId());
}

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="INFO">
<Configuration status="warn">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
@ -9,12 +9,12 @@
</File>
</Appenders>
<Loggers>
<Root level="info">
<Root level="error">
<AppenderRef ref="Console" />
<AppenderRef ref="MyFile"/>
</Root>
<Logger name="de.kreth.vaadin.clubhelper" additivity="false" level="trace">
<Logger name="de.kreth.vaadin.clubhelper" additivity="false" level="warn">
<AppenderRef ref="Console" />
<AppenderRef ref="MyFile"/>
</Logger>

@ -1,5 +1,7 @@
package de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.navigation;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import java.time.ZonedDateTime;
@ -29,6 +31,7 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEventBuilder;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.GroupDef;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.security.SecurityVerifier;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.security.SecurityVerifierImpl;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.CalendarView;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.SingleEventView;
@ -40,7 +43,6 @@ public class MainViewMobileSmokeTest {
@Autowired
PersonDao personDao;
@Autowired
SecurityVerifier securityGroupVerifier;
@Autowired
@ -57,11 +59,15 @@ public class MainViewMobileSmokeTest {
@BeforeEach
void initUi() {
MockitoAnnotations.initMocks(this);
assertNotNull(personDao);
Person person = new Person();
GroupDef g1 = new GroupDef();
person.setGroups(new HashSet<GroupDef>(Arrays.asList(g1)));
securityGroupVerifier.setLoggedinPerson(person);
securityGroupVerifier = new SecurityVerifierImpl();
assertFalse(securityGroupVerifier.isLoggedin());
mainView = new MainViewMobile(personDao, groupDao, eventBusiness, securityGroupVerifier);
securityGroupVerifier.setLoggedinPerson(person);
mainView.initUI(event);
}

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="warn">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
</Console>
</Appenders>
<Loggers>
<Root level="error">
<AppenderRef ref="Console" />
</Root>
<Logger name="de.kreth.vaadin.clubhelper" additivity="false" level="warn">
<AppenderRef ref="Console" />
</Logger>
</Loggers>
</Configuration>
Loading…
Cancel
Save