From ce359522379ea832802fa8d818aae7c8390adb9f Mon Sep 17 00:00:00 2001
From: Markus Kreth <markus.kreth@web.de>
Date: Thu, 2 May 2019 22:19:02 +0200
Subject: [PATCH] Fixes for tests

---
 .../ui/navigation/MainViewDesktop.java         | 17 +++++++++++++----
 src/main/resources/log4j2.xml                  |  6 +++---
 .../ui/navigation/MainViewMobileSmokeTest.java | 10 ++++++++--
 src/test/resources/log4j2.xml                  | 18 ++++++++++++++++++
 4 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 src/test/resources/log4j2.xml

diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewDesktop.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewDesktop.java
index fdbae24..c7f53a4 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewDesktop.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewDesktop.java
@@ -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());
 		}
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 8cbedd8..a9160f7 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -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>
diff --git a/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobileSmokeTest.java b/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobileSmokeTest.java
index 537528f..f98129b 100644
--- a/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobileSmokeTest.java
+++ b/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobileSmokeTest.java
@@ -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);
 	}
 
diff --git a/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml
new file mode 100644
index 0000000..9ace4d4
--- /dev/null
+++ b/src/test/resources/log4j2.xml
@@ -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>