OZG-4870 add test for realm smtpServer config

ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java

@@ -53,14 +53,14 @@ interface KeycloakRealmMapper {
 	}
 	
 	@Named("smtpServer")
-	 default Map<String, String> mapsmtpServer(OzgCloudKeycloakRealmSpec.KeycloakRealmSMTPServer server) {
+	 default Map<String, String> mapSmtpServer(OzgCloudKeycloakRealmSpec.KeycloakRealmSMTPServer server) {
 		Map<String, String> smtpServer = new HashMap<>();
 		smtpServer.put("host", server.getHost());
 		smtpServer.put("port", server.getPort());
 		smtpServer.put("user", server.getUser());
 		smtpServer.put("password", server.getPassword());
-		smtpServer.put("starttls", server.getStarttls().toString()); 
-		smtpServer.put("auth", server.getAuth().toString()); 
+		smtpServer.put("starttls", server.getStarttls()); 
+		smtpServer.put("auth", server.getAuth()); 
 		smtpServer.put("from", server.getFrom()); 
 		smtpServer.put("fromDisplayName", server.getFromDisplayName()); 
 		return smtpServer;

ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java

@@ -56,17 +56,17 @@ class OzgCloudKeycloakRealmSpec {
 @AllArgsConstructor
 static class KeycloakRealmSMTPServer {
 
-	private String host;
 	
-	private String user;
 
+	private String user;
+	private String host;
 	private String password;
 
 	private String port;
 
-	private Boolean starttls;
+	private String starttls;
 
-	private Boolean auth;
+	private String auth;
 
 	private String from;
 	

ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java

@@ -24,6 +24,7 @@
 package de.ozgcloud.operator.keycloak.realm;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
@@ -99,16 +100,26 @@ class KeycloakRealmMapperTest {
 
 	@Test
 	void shouldContainSmtpServerKeysValues() {
-		var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
+		var mapped = mapper.map(KeycloakRealmSmtpServerTestFactory.create());
 		var mappedSmtpServer = mapped.getSmtpServer();
-		assertThat(mappedSmtpServer.get("host")).isEqualTo("host");
+		assertThat(mappedSmtpServer.get("host")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_HOST);
 		assertThat(mappedSmtpServer.get("port")).isEqualTo("432");
-		assertThat(mappedSmtpServer.get("password")).isEqualTo("psw");
-		assertThat(mappedSmtpServer.get("user")).isEqualTo("user");
-		assertThat(mappedSmtpServer.get("starttls")).isEqualTo("true");
-		assertThat(mappedSmtpServer.get("auth")).isEqualTo("true");
-		assertThat(mappedSmtpServer.get("from")).isEqualTo("test@test.de");
-		assertThat(mappedSmtpServer.get("fromDisplayName")).isEqualTo("displayed name");
+		assertThat(mappedSmtpServer.get("password")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_PASSWORD);
+		assertThat(mappedSmtpServer.get("user")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_USER);
+		assertThat(mappedSmtpServer.get("starttls")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_STARTTLS.toString());
+		assertThat(mappedSmtpServer.get("auth")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_AUTH.toString());
+		assertThat(mappedSmtpServer.get("from")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_FROM);
+		assertThat(mappedSmtpServer.get("fromDisplayName")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_FROM_DISPLAY_NAME);
 		
 	}	
+
+
+	@Test
+	void shouldNotThrowOnRealmWithoutSMTP() {
+		//create realm without SMTP Servr configs
+		OzgCloudKeycloakRealm realm = OzgCloudKeycloakRealmTestFactory.create();
+		assertDoesNotThrow(() -> mapper.map(realm.getSpec()));
+	}
+	
+
 }

ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmSmtpServerTestFactory.java

+package de.ozgcloud.operator.keycloak.realm;
+
+import de.ozgcloud.operator.keycloak.realm.OzgCloudKeycloakRealmSpec.KeycloakRealmSMTPServer;
+
+public class KeycloakRealmSmtpServerTestFactory {
+
+    
+    public final static String SMTP_SERVER_PORT = "432";
+    public final static String  SMTP_SERVER_HOST = "host";
+    public final static String  SMTP_SERVER_FROM = "test@test.de";
+    public final static String  SMTP_SERVER_FROM_DISPLAY_NAME = "displayed name";
+    public final static String  SMTP_SERVER_USER = "user"; 
+    public final static String  SMTP_SERVER_PASSWORD = "psw";
+    public final static String SMTP_SERVER_AUTH = "true";
+    public final static String SMTP_SERVER_STARTTLS = "true";
+    public final static KeycloakRealmSMTPServer SMTP_SERVER = KeycloakRealmSMTPServer.builder().host(SMTP_SERVER_HOST).user(SMTP_SERVER_USER).
+	password(SMTP_SERVER_PASSWORD).port(SMTP_SERVER_PORT).starttls(SMTP_SERVER_STARTTLS).auth(SMTP_SERVER_AUTH).from(SMTP_SERVER_FROM).fromDisplayName(SMTP_SERVER_FROM_DISPLAY_NAME).build();
+    
+    public static OzgCloudKeycloakRealmSpec create() {
+		return createBuilder().build();
+	}
+
+	public static OzgCloudKeycloakRealmSpec.OzgCloudKeycloakRealmSpecBuilder createBuilder() {
+		return OzgCloudKeycloakRealmSpec.builder()
+				.smtpServer(SMTP_SERVER);
+	}
+    
+}

ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java

@@ -23,14 +23,10 @@
  */
 package de.ozgcloud.operator.keycloak.realm;
 
-import de.ozgcloud.operator.keycloak.realm.OzgCloudKeycloakRealmSpec.KeycloakRealmSMTPServer;
-
 public class OzgCloudKeycloakRealmSpecTestFactory {
 
 	public final static String DISPLAY_NAME = "TestDisplayName";
 	public final static boolean KEEP_AFTER_DELETE = false;
-	public final static KeycloakRealmSMTPServer SMTP_SERVER = KeycloakRealmSMTPServer.builder().host("host").user("user").
-	password("psw").port("432").starttls(true).auth(true).from("test@test.de").fromDisplayName("displayed name").build();
 	
 	public static OzgCloudKeycloakRealmSpec create() {
 		return createBuilder().build();
@@ -39,7 +35,6 @@ public class OzgCloudKeycloakRealmSpecTestFactory {
 	public static OzgCloudKeycloakRealmSpec.OzgCloudKeycloakRealmSpecBuilder createBuilder() {
 		return OzgCloudKeycloakRealmSpec.builder()
 				.keepAfterDelete(KEEP_AFTER_DELETE)
-				.displayName(DISPLAY_NAME)
-				.smtpServer(SMTP_SERVER);
+				.displayName(DISPLAY_NAME);
 	}
 }