From f689eb8ecb4a7a6598acc863a64e0eee9b46aa4b Mon Sep 17 00:00:00 2001 From: anhefti Date: Mon, 22 Jun 2020 16:27:22 +0200 Subject: [PATCH] more tests --- .../model/institution/LmsSetupTestResult.java | 2 +- .../gbl/model/ModelObjectJSONGenerator.java | 49 +++++++++++++++++-- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/LmsSetupTestResult.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/LmsSetupTestResult.java index bba6c37f..fe631d8b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/LmsSetupTestResult.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/LmsSetupTestResult.java @@ -126,7 +126,7 @@ public final class LmsSetupTestResult { public final String message; @JsonCreator - protected Error( + public Error( @JsonProperty(ATTR_ERROR_TYPE) final ErrorType errorType, @JsonProperty(ATTR_ERROR_MESSAGE) final String message) { diff --git a/src/test/java/ch/ethz/seb/sebserver/gbl/model/ModelObjectJSONGenerator.java b/src/test/java/ch/ethz/seb/sebserver/gbl/model/ModelObjectJSONGenerator.java index f24c12f7..d15610f7 100644 --- a/src/test/java/ch/ethz/seb/sebserver/gbl/model/ModelObjectJSONGenerator.java +++ b/src/test/java/ch/ethz/seb/sebserver/gbl/model/ModelObjectJSONGenerator.java @@ -18,21 +18,62 @@ import org.junit.Test; import com.fasterxml.jackson.databind.ObjectWriter; +import ch.ethz.seb.sebserver.gbl.api.APIMessage; +import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.api.JSONMapper; +import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup; +import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup.LmsType; +import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetupTestResult; +import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetupTestResult.ErrorType; +import ch.ethz.seb.sebserver.gbl.model.user.PasswordChange; +import ch.ethz.seb.sebserver.gbl.model.user.UserActivityLog; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; +import ch.ethz.seb.sebserver.gbl.model.user.UserLogActivityType; +import ch.ethz.seb.sebserver.gbl.model.user.UserMod; import ch.ethz.seb.sebserver.gbl.model.user.UserRole; public class ModelObjectJSONGenerator { @Test public void generateJSON() throws Exception { - final Object domainObject = new UserInfo("uuid", 1L, DateTime.now(), "name", "surname", "username", "email", + final JSONMapper mapper = new JSONMapper(); + final ObjectWriter writerWithDefaultPrettyPrinter = mapper.writerWithDefaultPrettyPrinter(); + + Object domainObject = new UserInfo("uuid", 1L, DateTime.now(), "name", "surname", "username", "email", true, Locale.ENGLISH, DateTimeZone.UTC, new HashSet<>(Arrays.asList(UserRole.EXAM_ADMIN.name(), UserRole.EXAM_SUPPORTER.name()))); - final JSONMapper mapper = new JSONMapper(); - final ObjectWriter writerWithDefaultPrettyPrinter = mapper.writerWithDefaultPrettyPrinter(); - System.out.print(writerWithDefaultPrettyPrinter.writeValueAsString(domainObject)); + System.out.println(domainObject.getClass().getSimpleName() + ":"); + System.out.println(writerWithDefaultPrettyPrinter.writeValueAsString(domainObject)); + + domainObject = new UserMod( + "UUID", 1L, "NAME", "SURNAME", "USERNAME", "newPassword", "confirmNewPassword", "EMAIL", + Locale.ENGLISH, DateTimeZone.UTC, + new HashSet<>(Arrays.asList(UserRole.EXAM_ADMIN.name(), UserRole.EXAM_SUPPORTER.name()))); + System.out.println(domainObject.getClass().getSimpleName() + ":"); + System.out.println(writerWithDefaultPrettyPrinter.writeValueAsString(domainObject)); + + domainObject = new PasswordChange("userUUID", "password", "newPassword", "confirmNewPassword"); + System.out.println(domainObject.getClass().getSimpleName() + ":"); + System.out.println(writerWithDefaultPrettyPrinter.writeValueAsString(domainObject)); + + domainObject = new UserActivityLog( + 3L, "userUUID", "username", 123L, UserLogActivityType.EXPORT, + EntityType.USER, "5", "message"); + System.out.println(domainObject.getClass().getSimpleName() + ":"); + System.out.println(writerWithDefaultPrettyPrinter.writeValueAsString(domainObject)); + + domainObject = new LmsSetup( + 1L, 1L, "name", LmsType.OPEN_EDX, "lmsApiAccountName", "lmsApiAccountPassword", + "lmsApiUrl", "lmsApiToken", "proxyHost", 8085, "proxyAuthUsername", "proxyAuthSecret", true); + System.out.println(domainObject.getClass().getSimpleName() + ":"); + System.out.println(writerWithDefaultPrettyPrinter.writeValueAsString(domainObject)); + + domainObject = new LmsSetupTestResult( + Arrays.asList(new LmsSetupTestResult.Error(ErrorType.QUIZ_ACCESS_API_REQUEST, "No Access")), + Arrays.asList(APIMessage.ErrorMessage.UNEXPECTED.of())); + System.out.println(domainObject.getClass().getSimpleName() + ":"); + System.out.println(writerWithDefaultPrettyPrinter.writeValueAsString(domainObject)); }