From 4cae18dd4ea7cb143a40f023f377a1582ab306b1 Mon Sep 17 00:00:00 2001
From: Hippolyte Durix <hdurix@ippon.fr>
Date: Fri, 8 Jul 2022 15:10:59 +0200
Subject: [PATCH] Fix tests (temporary change, will be improved in a next PR

---
 .../jackson/JacksonProjectFolderDeserializer.java   |  2 +-
 src/test/java/tech/jhipster/lite/TestUtils.java     |  2 +-
 .../lite/module/domain/JHipsterModulesFixture.java  | 13 ++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/tech/jhipster/lite/technical/infrastructure/primary/jackson/JacksonProjectFolderDeserializer.java b/src/main/java/tech/jhipster/lite/technical/infrastructure/primary/jackson/JacksonProjectFolderDeserializer.java
index ad20b167bc8..bfb2d151cb7 100644
--- a/src/main/java/tech/jhipster/lite/technical/infrastructure/primary/jackson/JacksonProjectFolderDeserializer.java
+++ b/src/main/java/tech/jhipster/lite/technical/infrastructure/primary/jackson/JacksonProjectFolderDeserializer.java
@@ -18,7 +18,7 @@ public class JacksonProjectFolderDeserializer extends JsonDeserializer<String> {
   @Override
   public String deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
     String text = jsonParser.getText();
-    if (!text.startsWith(forcedProjectFolder) || text.contains("..")) {
+    if (forcedProjectFolder != null && (!text.startsWith(forcedProjectFolder) || text.contains(".."))) {
       throw new InvalidProjectFolderException(forcedProjectFolder);
     }
     return text;
diff --git a/src/test/java/tech/jhipster/lite/TestUtils.java b/src/test/java/tech/jhipster/lite/TestUtils.java
index dd71df02693..a2aeccc4f1d 100644
--- a/src/test/java/tech/jhipster/lite/TestUtils.java
+++ b/src/test/java/tech/jhipster/lite/TestUtils.java
@@ -295,7 +295,7 @@ public static <T> T readFileToObject(String path, Class<T> valueType) {
     try {
       return mapper.readValue(stringObject, valueType);
     } catch (JsonProcessingException e) {
-      throw new AssertionError("Can't read value");
+      throw new AssertionError("Can't read value", e);
     }
   }
 }
diff --git a/src/test/java/tech/jhipster/lite/module/domain/JHipsterModulesFixture.java b/src/test/java/tech/jhipster/lite/module/domain/JHipsterModulesFixture.java
index fe90ae3cecd..5823ecb0663 100644
--- a/src/test/java/tech/jhipster/lite/module/domain/JHipsterModulesFixture.java
+++ b/src/test/java/tech/jhipster/lite/module/domain/JHipsterModulesFixture.java
@@ -1,5 +1,11 @@
 package tech.jhipster.lite.module.domain;
 
+import static tech.jhipster.lite.module.domain.JHipsterModule.*;
+import static tech.jhipster.lite.module.domain.properties.JHipsterModulePropertyDefinition.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import tech.jhipster.lite.TestFileUtils;
@@ -20,13 +26,6 @@
 import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition;
 import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static tech.jhipster.lite.module.domain.JHipsterModule.*;
-import static tech.jhipster.lite.module.domain.properties.JHipsterModulePropertyDefinition.*;
-
 public final class JHipsterModulesFixture {
 
   private static final Logger log = LoggerFactory.getLogger(JHipsterModulesFixture.class);