zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more tests and find-bug fixes

Browse source
This commit is contained in:
anhefti 2019-09-10 10:26:07 +02:00
parent 02446b5003
commit 71635c85f6
4 changed files with 118 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
findbugs-excludes.xml
View file

@ -27,6 +27,10 @@
<Package name="ch.ethz.seb.sebserver.gui.*" />
<Bug pattern="SE_BAD_FIELD" />
</Match>
<Match>
<Package name="ch.ethz.seb.sebserver.gui.content.*" />
<Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT" />
</Match>

40
src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java
View file

@ -9,8 +9,6 @@
package ch.ethz.seb.sebserver.gui;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
@ -18,9 +16,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.client.WebClient;
import org.eclipse.rap.rwt.internal.application.ApplicationContextImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
@ -36,7 +31,6 @@ import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import ch.ethz.seb.sebserver.gbl.api.API;
import ch.ethz.seb.sebserver.gui.RAPConfiguration.RAPSpringEntryPointFactory;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.WebserviceURIService;
@Lazy
@ -146,24 +140,24 @@ final class InstitutionalAuthenticationEntryPoint implements AuthenticationEntry
/** TODO this seems not to work as expected. Different Theme is only possible in RAP on different
* entry-points and since entry-points are statically defined within the RAPConficuration
* there is no possibility to apply them dynamically within an institution so far.
*
*
* @param institutionalEndpoint
* @return */
private boolean initInstitutionalBasedThemeEntryPoint(final String institutionalEndpoint) {
try {
final ApplicationContextImpl appContext = (ApplicationContextImpl) RWT.getApplicationContext();
final Map<String, String> properties = new HashMap<>();
properties.put(WebClient.THEME_ID, "sms");
appContext.getEntryPointManager().register(
institutionalEndpoint,
new RAPSpringEntryPointFactory(),
properties);
return true;
} catch (final Exception e) {
log.warn("Failed to dynamically set entry point for institution: {}", institutionalEndpoint, e);
return false;
}
}
// private boolean initInstitutionalBasedThemeEntryPoint(final String institutionalEndpoint) {
// try {
// final ApplicationContextImpl appContext = (ApplicationContextImpl) RWT.getApplicationContext();
// final Map<String, String> properties = new HashMap<>();
// properties.put(WebClient.THEME_ID, "sms");
// appContext.getEntryPointManager().register(
// institutionalEndpoint,
// new RAPSpringEntryPointFactory(),
// properties);
//
// return true;
// } catch (final Exception e) {
// log.warn("Failed to dynamically set entry point for institution: {}", institutionalEndpoint, e);
// return false;
// }
// }
}

3
src/main/java/ch/ethz/seb/sebserver/gui/RAPConfiguration.java
View file

@ -151,6 +151,9 @@ public class RAPConfiguration implements ApplicationConfiguration {
return WebApplicationContextUtils
.getRequiredWebApplicationContext(servletContext);
} catch (final RuntimeException e) {
log.error("Failed to initialize Spring-Context on HttpSession: " + httpSession);
throw e;
} catch (final Exception e) {
log.error("Failed to initialize Spring-Context on HttpSession: " + httpSession);
throw new RuntimeException("Failed to initialize Spring-Context on HttpSession: " + httpSession);

94
src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java
View file

@ -10,6 +10,8 @@ package ch.ethz.seb.sebserver.gui.integration;
import static org.junit.Assert.*;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
@ -28,6 +30,9 @@ import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport;
import ch.ethz.seb.sebserver.gbl.model.Page;
import ch.ethz.seb.sebserver.gbl.model.exam.Exam;
import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamType;
import ch.ethz.seb.sebserver.gbl.model.exam.Indicator;
import ch.ethz.seb.sebserver.gbl.model.exam.Indicator.IndicatorType;
import ch.ethz.seb.sebserver.gbl.model.exam.Indicator.Threshold;
import ch.ethz.seb.sebserver.gbl.model.exam.QuizData;
import ch.ethz.seb.sebserver.gbl.model.institution.Institution;
import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup;
@ -40,8 +45,13 @@ import ch.ethz.seb.sebserver.gbl.util.Utils;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCallError;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestServiceImpl;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExam;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamNames;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamPage;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicator;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicatorPage;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.NewIndicator;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveExam;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveIndicator;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.ActivateInstitution;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.GetInstitution;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.GetInstitutionNames;
@ -663,4 +673,88 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
assertFalse(savedExam.supporter.isEmpty());
}
@Test
@Order(7)
// *************************************
// Use Case 7: Login as examAdmin2
// - Get imported exam
// - add new indicator for exam
// - save exam with new indicator and test
// - create some thresholds for the new indicator
public void testUsecase7() {
final RestServiceImpl restService = createRestServiceForUser(
"examAdmin2",
"examAdmin2",
new GetExam(),
new GetExamNames(),
new NewIndicator(),
new SaveIndicator(),
new GetIndicator(),
new GetIndicatorPage());
final Result<List<EntityName>> examNamesResult = restService
.getBuilder(GetExamNames.class)
.call();
assertNotNull(examNamesResult);
assertFalse(examNamesResult.hasError());
final List<EntityName> exams = examNamesResult.get();
assertFalse(exams.isEmpty());
final EntityName examName = exams.get(0);
assertEquals("Demo Quiz 1", examName.name);
final Result<Exam> examResult = restService
.getBuilder(GetExam.class)
.withURIVariable(API.PARAM_MODEL_ID, examName.modelId)
.call();
assertNotNull(examResult);
assertFalse(examResult.hasError());
final Exam exam = examResult.get();
final Result<Indicator> newIndicatorResult = restService
.getBuilder(NewIndicator.class)
.withFormParam(Domain.INDICATOR.ATTR_EXAM_ID, exam.getModelId())
.withFormParam(Domain.INDICATOR.ATTR_NAME, "Ping")
.withFormParam(Domain.INDICATOR.ATTR_TYPE, IndicatorType.LAST_PING.name)
.withFormParam(Domain.INDICATOR.ATTR_COLOR, "000001")
.call();
assertNotNull(newIndicatorResult);
assertFalse(newIndicatorResult.hasError());
final Indicator newIndicator = newIndicatorResult.get();
assertEquals("Ping", newIndicator.name);
assertEquals("000001", newIndicator.defaultColor);
final Indicator indicatorToSave = new Indicator(
newIndicator.id, newIndicator.examId, newIndicator.name, newIndicator.type, newIndicator.defaultColor,
Utils.immutableCollectionOf(
new Indicator.Threshold(2000d, "000011"),
new Indicator.Threshold(5000d, "001111")));
final Result<Indicator> savedIndicatorResult = restService
.getBuilder(SaveIndicator.class)
.withBody(indicatorToSave)
.call();
assertNotNull(savedIndicatorResult);
assertFalse(savedIndicatorResult.hasError());
final Indicator savedIndicator = savedIndicatorResult.get();
assertEquals("Ping", savedIndicator.name);
assertEquals("000001", savedIndicator.defaultColor);
final Collection<Threshold> thresholds = savedIndicator.getThresholds();
assertFalse(thresholds.isEmpty());
assertTrue(thresholds.size() == 2);
final Iterator<Threshold> iterator = thresholds.iterator();
final Threshold t1 = iterator.next();
final Threshold t2 = iterator.next();
assertTrue(2000d - t1.value < .0001);
assertEquals("000011", t1.color);
assertTrue(5000d - t2.value < .0001);
assertEquals("001111", t2.color);
}
}