Fixed Unittests
diff --git a/src/main/java/org/eclipse/openk/elogbook/controller/BaseWebService.java b/src/main/java/org/eclipse/openk/elogbook/controller/BaseWebService.java
index d2118de..db65743 100644
--- a/src/main/java/org/eclipse/openk/elogbook/controller/BaseWebService.java
+++ b/src/main/java/org/eclipse/openk/elogbook/controller/BaseWebService.java
@@ -11,9 +11,6 @@
*/
package org.eclipse.openk.elogbook.controller;
-import java.util.HashMap;
-import java.util.Map;
-import javax.ws.rs.core.Response;
import org.apache.http.HttpStatus;
import org.apache.log4j.Logger;
import org.eclipse.openk.elogbook.auth2.model.JwtPayload;
@@ -21,6 +18,10 @@
import org.eclipse.openk.elogbook.exceptions.BtbException;
import org.eclipse.openk.elogbook.exceptions.BtbExceptionMapper;
+import javax.ws.rs.core.Response;
+import java.util.HashMap;
+import java.util.Map;
+
public abstract class BaseWebService {
public enum SecureType {NONE, NORMAL, HIGH}
private final Map<String, Long> currentTimeMeasures = new HashMap<>();
@@ -31,8 +32,12 @@
static {
// determine static VersionInfo
- String versionString = BaseWebService.class.getPackage().getImplementationVersion().toUpperCase();
- DEVELOP_MODE = versionString.contains("DEVELOP") || versionString.contains("SNAPSHOT");
+ String versionString = BaseWebService.class
+ .getPackage()
+ .getImplementationVersion();
+ DEVELOP_MODE = versionString == null // <-- during unit tests
+ || versionString.toUpperCase().contains("DEVELOP")
+ || versionString.contains("SNAPSHOT");
}
public BaseWebService(Logger logger) {
diff --git a/src/test/java/org/eclipse/openk/elogbook/common/util/ResourceLoaderBaseTest.java b/src/test/java/org/eclipse/openk/elogbook/common/util/ResourceLoaderBaseTest.java
index ea09e51..a826821 100644
--- a/src/test/java/org/eclipse/openk/elogbook/common/util/ResourceLoaderBaseTest.java
+++ b/src/test/java/org/eclipse/openk/elogbook/common/util/ResourceLoaderBaseTest.java
@@ -12,15 +12,15 @@
package org.eclipse.openk.elogbook.common.util;
-import static org.junit.Assert.assertEquals;
-
import org.junit.Test;
+import static org.junit.Assert.assertNull;
+
public class ResourceLoaderBaseTest {
@Test
public void testloadStringFromResourceError() {
ResourceLoaderBase rlb = new ResourceLoaderBase();
String str = rlb.loadStringFromResource("UNKNOWN_FILE");
- assertEquals(str, "");
+ assertNull(str);
}
}
diff --git a/src/test/java/org/eclipse/openk/elogbook/controller/BackendControllerUserTest.java b/src/test/java/org/eclipse/openk/elogbook/controller/BackendControllerUserTest.java
new file mode 100644
index 0000000..ce46e16
--- /dev/null
+++ b/src/test/java/org/eclipse/openk/elogbook/controller/BackendControllerUserTest.java
@@ -0,0 +1,62 @@
+/**
+******************************************************************************
+* Copyright © 2017-2018 PTA GmbH.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+*
+* http://www.eclipse.org/legal/epl-v10.html
+*
+******************************************************************************
+*/
+package org.eclipse.openk.elogbook.controller;
+
+import org.eclipse.openk.elogbook.persistence.dao.EntityHelper;
+import org.eclipse.openk.elogbook.persistence.dao.TblUserSettingsDao;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.reflect.Whitebox;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import java.util.Optional;
+
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.anyString;
+import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({TblUserSettingsDao.class, BackendControllerUser.class})
+public class BackendControllerUserTest {
+
+ @Before
+ public void init() throws Exception {
+ EntityHelper entityHelper = Whitebox.invokeConstructor(EntityHelper.class);
+ Whitebox.setInternalState(EntityHelper.class, "instance", entityHelper);
+ EntityManagerFactory emfMock = PowerMock.createMock(EntityManagerFactory.class);
+ expect(emfMock.createEntityManager()).andReturn(PowerMock.createNiceMock(EntityManager.class));
+ PowerMock.replay( emfMock );
+ Whitebox.setInternalState(EntityHelper.class, "entityManagerFactory", emfMock);
+ }
+
+
+ @Test
+ public void shouldNotGetUserSettings() throws Exception {
+ TblUserSettingsDao usDao = PowerMock.createNiceMock(TblUserSettingsDao.class);
+ // no usersettings available
+ expect(usDao.getSettingsForUser(anyString(), anyString())).andReturn(Optional.empty());
+ PowerMock.replay( usDao );
+ PowerMock.expectNew(TblUserSettingsDao.class, anyObject(EntityManager.class)).andReturn(usDao);
+ PowerMock.replay(TblUserSettingsDao.class);
+
+ BackendControllerUser bcUser = new BackendControllerUser();
+ assertEquals( "{}", bcUser.getUserSettings("bruno") );
+
+ }
+
+}
