changed tests package

.gitignore

@@ -49,3 +49,5 @@ jakon_config.properties
 /jakond.iml
 /modules/backend/src/main/resources/static/jakon/
 /modules/backend/jakonUnitTest.sqlite
+/modules/backend/src/main/main.iml
+/modules/backend/src/test/test.iml

modules/backend/src/test/scala/ProdTestRunner.scala → modules/backend/src/test/scala/jakontest/ProdTestRunner.scala

@@ -1,13 +1,15 @@
-import core.pagelet.{JsonPageletTest, PageletTest}
+package jakontest
+
+import jakontest.core.pagelet.{JsonPageletTest, PageletTest}
 import cz.kamenitxan.jakon.core.Director
 import cz.kamenitxan.jakon.core.configuration.Settings
 import cz.kamenitxan.jakon.core.custom_pages.AbstractStaticPage
 import cz.kamenitxan.jakon.core.model.Page
 import cz.kamenitxan.jakon.core.template.Pebble
 import org.scalatest.{BeforeAndAfterAll, Suites}
-import utils.SecurityTest
-import utils.mail.EmailTest
-import webui._
+import jakontest.utils.SecurityTest
+import jakontest.utils.mail.EmailTest
+import jakontest.webui._
 
 import java.io.{File, IOException}
 

modules/backend/src/test/scala/TestRunner.scala → modules/backend/src/test/scala/jakontest/TestRunner.scala

@@ -1,7 +1,9 @@
-import core.functions.LinkTest
-import core.pagelet.{JsonPageletTest, PageletTest}
-import core.task.TaskRunnerTest
-import core._
+package jakontest
+
+import jakontest.core.functions.LinkTest
+import jakontest.core.pagelet.{JsonPageletTest, PageletTest}
+import jakontest.core.task.TaskRunnerTest
+import jakontest.core._
 import cz.kamenitxan.jakon.JakonInit
 import cz.kamenitxan.jakon.core.Director
 import cz.kamenitxan.jakon.core.configuration.Settings
@@ -10,14 +12,14 @@ import cz.kamenitxan.jakon.core.custom_pages.AbstractStaticPage
 import cz.kamenitxan.jakon.core.database.DBHelper
 import cz.kamenitxan.jakon.core.model.{Category, Page, Post}
 import cz.kamenitxan.jakon.core.template.Pebble
-import devtools.DevtoolsTest
-import logging.LoggingTest
+import jakontest.devtools.DevtoolsTest
+import jakontest.logging.LoggingTest
 import org.scalatest.{BeforeAndAfterAll, Suites}
-import utils.entity.{TestExtNoFields, TestExtUser, TestObject}
-import utils.mail.EmailTest
-import utils.{I18NUtilTest, SecurityTest, SqlGenTest, UtilsTest}
-import validation.ValidationTest
-import webui._
+import jakontest.utils.entity.{TestExtNoFields, TestExtUser, TestObject}
+import jakontest.utils.mail.EmailTest
+import jakontest.utils.{I18NUtilTest, SecurityTest, SqlGenTest, UtilsTest}
+import jakontest.validation.ValidationTest
+import jakontest.webui.*
 
 import java.io.{File, IOException}
 

modules/backend/src/test/scala/UnitTestRunner.scala → modules/backend/src/test/scala/jakontest/UnitTestRunner.scala

@@ -1,8 +1,10 @@
-import core.database.ConvertersTest
-import core.functions.FunctionHelperTest
-import core.pagelet.JsonParserTest
-import core.template.TemplateUtilsTest
-import core.template.pebble.Pebble
+package jakontest
+
+import jakontest.core.database.ConvertersTest
+import jakontest.core.functions.FunctionHelperTest
+import jakontest.core.pagelet.JsonParserTest
+import jakontest.core.template.TemplateUtilsTest
+import jakontest.core.template.pebble.Pebble
 import org.scalatest.{BeforeAndAfterAll, Suites}
 import utils.UtilsUnitTest
 import validation.ValidationUnitTest

modules/backend/src/test/scala/core/DeployTest.scala → modules/backend/src/test/scala/jakontest/core/DeployTest.scala

@@ -1,9 +1,9 @@
-package core
+package jakontest.core
 
 import cz.kamenitxan.jakon.core.deploy.LocalDeploy
 import cz.kamenitxan.jakon.core.deploy.entity.Server
 import org.scalatest.DoNotDiscover
-import test.TestBase
+import jakontest.test.TestBase
 
 @DoNotDiscover
 class DeployTest extends TestBase {

modules/backend/src/test/scala/core/ModelTest.scala → modules/backend/src/test/scala/jakontest/core/ModelTest.scala

@@ -1,11 +1,11 @@
-package core
+package jakontest.core
 
 import cz.kamenitxan.jakon.core.database.DBHelper
 import cz.kamenitxan.jakon.core.model.*
 import cz.kamenitxan.jakon.core.service.UserService
 import org.scalatest.DoNotDiscover
-import test.TestBase
-import utils.entity.{TestEmbeddedObject, TestObject}
+import jakontest.test.TestBase
+import jakontest.utils.entity.{TestEmbeddedObject, TestObject}
 
 import java.util.Date
 import scala.util.Random

modules/backend/src/test/scala/core/RenderTest.scala → modules/backend/src/test/scala/jakontest/core/RenderTest.scala

@@ -1,7 +1,7 @@
-package core
+package jakontest.core
 
 import org.scalatest.DoNotDiscover
-import test.TestBase
+import jakontest.test.TestBase
 
 import scala.io.Source
 

modules/backend/src/test/scala/core/ServiceTest.scala → modules/backend/src/test/scala/jakontest/core/ServiceTest.scala

@@ -1,10 +1,10 @@
-package core
+package jakontest.core
 
 import cz.kamenitxan.jakon.core.database.DBHelper
 import cz.kamenitxan.jakon.core.model.JakonUser
 import cz.kamenitxan.jakon.core.service.{JakonFileService, UserService}
 import org.scalatest.DoNotDiscover
-import test.TestBase
+import jakontest.test.TestBase
 
 /**
   * Created by TPa on 08/04/2021.

modules/backend/src/test/scala/core/SettingsTest.scala → modules/backend/src/test/scala/jakontest/core/SettingsTest.scala

@@ -1,10 +1,10 @@
-package core
+package jakontest.core
 
 import cz.kamenitxan.jakon.core.configuration.{DeployMode, Settings}
 import cz.kamenitxan.jakon.core.template.utils.JakonPebbleTemplateEngine
 import cz.kamenitxan.jakon.webui.util.JakonFileLoader
 import org.scalatest.DoNotDiscover
-import test.{TestBase, TestEmailTypeHandler}
+import jakontest.test.{TestBase, TestEmailTypeHandler}
 
 @DoNotDiscover
 class SettingsTest extends TestBase {

modules/backend/src/test/scala/core/TestJakonApp.scala → modules/backend/src/test/scala/jakontest/core/TestJakonApp.scala

@@ -1,4 +1,4 @@
-package core
+package jakontest.core
 
 import cz.kamenitxan.jakon.JakonInit
 import cz.kamenitxan.jakon.core.Director

modules/backend/src/test/scala/core/database/ConvertersTest.scala → modules/backend/src/test/scala/jakontest/core/database/ConvertersTest.scala

@@ -1,4 +1,4 @@
-package core.database
+package jakontest.core.database
 
 import java.util
 import cz.kamenitxan.jakon.core.database.converters.{LocaleConverter, StringListConverter}

modules/backend/src/test/scala/core/functions/FunctionHelperTest.scala → modules/backend/src/test/scala/jakontest/core/functions/FunctionHelperTest.scala

@@ -1,10 +1,10 @@
-package core.functions
+package jakontest.core.functions
 
 import cz.kamenitxan.jakon.core.template.function.FunctionHelper
 import cz.kamenitxan.jakon.core.template.pebble.ValueFun
 import org.scalatest.DoNotDiscover
 import org.scalatest.funsuite.AnyFunSuite
-import test.HelloFun
+import jakontest.test.HelloFun
 
 import java.util
 

modules/backend/src/test/scala/core/functions/LinkTest.scala → modules/backend/src/test/scala/jakontest/core/functions/LinkTest.scala

@@ -1,4 +1,4 @@
-package core.functions
+package jakontest.core.functions
 
 import cz.kamenitxan.jakon.core.model.Page
 import cz.kamenitxan.jakon.core.template.function.FunctionHelper

modules/backend/src/test/scala/core/pagelet/JsonPageletTest.scala → modules/backend/src/test/scala/jakontest/core/pagelet/JsonPageletTest.scala

@@ -1,12 +1,12 @@
-package core.pagelet
+package jakontest.core.pagelet
 
 import com.google.gson.Gson
-import core.pagelet.entity.GetResponse
+import jakontest.core.pagelet.entity.GetResponse
 import cz.kamenitxan.jakon.core.dynamic.JsonPageletInitializer
 import cz.kamenitxan.jakon.core.dynamic.entity.{JsonErrorResponse, JsonFailResponse, ResponseStatus}
 import org.scalatest.DoNotDiscover
-import test.JsonHelper.*
-import test.TestBase
+import jakontest.test.JsonHelper.*
+import jakontest.test.TestBase
 
 import java.net.URI
 import java.net.http.HttpResponse.BodyHandlers

modules/backend/src/test/scala/core/pagelet/JsonParserTest.scala → modules/backend/src/test/scala/jakontest/core/pagelet/JsonParserTest.scala

@@ -1,6 +1,6 @@
-package core.pagelet
+package jakontest.core.pagelet
 
-import core.pagelet.entity.JsonDataEnum
+import jakontest.core.pagelet.entity.JsonDataEnum
 import cz.kamenitxan.jakon.core.dynamic.arguments.{CirceJsonParser, ParsedValue}
 import io.circe.*
 import io.circe.generic.auto.*

modules/backend/src/test/scala/core/pagelet/PageletTest.scala → modules/backend/src/test/scala/jakontest/core/pagelet/PageletTest.scala

@@ -1,10 +1,10 @@
-package core.pagelet
+package jakontest.core.pagelet
 
 import cz.kamenitxan.jakon.core.custom_pages.CustomPageInitializer
 import cz.kamenitxan.jakon.core.dynamic.PageletInitializer
 import org.openqa.selenium.By
 import org.scalatest.DoNotDiscover
-import test.TestBase
+import jakontest.test.TestBase
 
 @DoNotDiscover
 class PageletTest extends TestBase {

modules/backend/src/test/scala/core/pagelet/TestJsonPagelet.scala → modules/backend/src/test/scala/jakontest/core/pagelet/TestJsonPagelet.scala

@@ -1,7 +1,7 @@
-package core.pagelet
+package jakontest.core.pagelet
 
-import core.pagelet.entity.OldTestJsonPageletData
-import core.pagelet.entity.TestJsonPageletData
+import jakontest.core.pagelet.entity.OldTestJsonPageletData
+import jakontest.core.pagelet.entity.TestJsonPageletData
 import cz.kamenitxan.jakon.core.dynamic.entity.JsonFailResponse
 import cz.kamenitxan.jakon.core.dynamic.{AbstractJsonPagelet, Get, JsonPagelet, Post}
 import cz.kamenitxan.jakon.utils.Utils._

modules/backend/src/test/scala/core/pagelet/TestPagelet.scala → modules/backend/src/test/scala/jakontest/core/pagelet/TestPagelet.scala

@@ -1,4 +1,4 @@
-package core.pagelet
+package jakontest.core.pagelet
 
 import cz.kamenitxan.jakon.core.dynamic.{AbstractPagelet, Get, Pagelet, Post}
 import spark.{Request, Response}

modules/backend/src/test/scala/core/pagelet/entity/GetResponse.scala → modules/backend/src/test/scala/jakontest/core/pagelet/entity/GetResponse.scala

@@ -1,4 +1,4 @@
-package core.pagelet.entity
+package jakontest.core.pagelet.entity
 
 import cz.kamenitxan.jakon.core.dynamic.entity.ResponseStatus
 

modules/backend/src/test/scala/jakontest/core/pagelet/entity/JsonDataEnum.java

@@ -0,0 +1,5 @@
+package jakontest.core.pagelet.entity;
+
+public enum JsonDataEnum {
+	A, B
+}

modules/backend/src/test/scala/core/pagelet/entity/OldTestJsonPageletData.scala → modules/backend/src/test/scala/jakontest/core/pagelet/entity/OldTestJsonPageletData.scala

@@ -1,4 +1,4 @@
-package core.pagelet.entity
+package jakontest.core.pagelet.entity
 
 import cz.kamenitxan.jakon.validation.validators.NotEmpty
 

modules/backend/src/test/scala/core/pagelet/entity/TestJsonPageletData.scala → modules/backend/src/test/scala/jakontest/core/pagelet/entity/TestJsonPageletData.scala

@@ -1,4 +1,4 @@
-package core.pagelet.entity
+package jakontest.core.pagelet.entity
 
 import cz.kamenitxan.jakon.validation.validators.NotEmpty
 

modules/backend/src/test/scala/core/task/TaskRunnerTest.scala → modules/backend/src/test/scala/jakontest/core/task/TaskRunnerTest.scala

@@ -1,8 +1,8 @@
-package core.task
+package jakontest.core.task
 
 import cz.kamenitxan.jakon.core.task.{FulltextTask, TaskRunner}
 import org.scalatest.DoNotDiscover
-import test.TestBase
+import jakontest.test.TestBase
 
 @DoNotDiscover
 class TaskRunnerTest extends TestBase {

modules/backend/src/test/scala/core/template/TemplateUtilsTest.scala → modules/backend/src/test/scala/jakontest/core/template/TemplateUtilsTest.scala

@@ -1,11 +1,11 @@
-package core.template
+package jakontest.core.template
 
 import cz.kamenitxan.jakon.core.model.Post
 import cz.kamenitxan.jakon.core.template.function.FunctionHelper
 import cz.kamenitxan.jakon.core.template.utils.TemplateUtils
 import org.scalatest.DoNotDiscover
 import org.scalatest.funsuite.AnyFunSuite
-import test.HelloFun
+import jakontest.test.HelloFun
 
 /**
   * Created by TPa on 04.04.2020.

modules/backend/src/test/scala/core/template/pebble/Pebble.scala → modules/backend/src/test/scala/jakontest/core/template/pebble/Pebble.scala

@@ -1,4 +1,4 @@
-package core.template.pebble
+package jakontest.core.template.pebble
 
 import cz.kamenitxan.jakon.core.template.pebble.MarkdownFilter
 import org.scalatest.DoNotDiscover

modules/backend/src/test/scala/devtools/DevtoolsTest.scala → modules/backend/src/test/scala/jakontest/devtools/DevtoolsTest.scala

@@ -1,9 +1,9 @@
-package devtools
+package jakontest.devtools
 
 import cz.kamenitxan.jakon.webui.controller.impl.FileManagerController
 import org.openqa.selenium.WebDriver
 import org.scalatest.DoNotDiscover
-import test.TestBase
+import jakontest.test.TestBase
 
 import java.io.File
 import java.io.BufferedWriter

modules/backend/src/test/scala/logging/LoggingTest.scala → modules/backend/src/test/scala/jakontest/logging/LoggingTest.scala

@@ -1,8 +1,8 @@
-package logging
+package jakontest.logging
 
 import cz.kamenitxan.jakon.logging._
 import org.scalatest.DoNotDiscover
-import test.TestBase
+import jakontest.test.TestBase
 
 @DoNotDiscover
 class LoggingTest extends TestBase{

modules/backend/src/test/scala/test/HelloFun.scala → modules/backend/src/test/scala/jakontest/test/HelloFun.scala

@@ -1,4 +1,4 @@
-package test
+package jakontest.test
 
 import cz.kamenitxan.jakon.core.template.function.IFuncion
 

modules/backend/src/test/scala/test/JsonHelper.scala → modules/backend/src/test/scala/jakontest/test/JsonHelper.scala

@@ -1,4 +1,4 @@
-package test
+package jakontest.test
 
 import com.google.gson.{JsonArray, JsonElement, JsonNull, JsonObject, JsonPrimitive}
 

modules/backend/src/test/scala/test/ReflectionUtils.scala → modules/backend/src/test/scala/jakontest/test/ReflectionUtils.scala

@@ -1,4 +1,4 @@
-package test
+package jakontest.test
 
 /**
   * Created by TPa on 08/04/2021.

modules/backend/src/test/scala/test/TestBase.scala → modules/backend/src/test/scala/jakontest/test/TestBase.scala

@@ -1,4 +1,4 @@
-package test
+package jakontest.test
 
 import cz.kamenitxan.jakon.core.configuration.Settings
 import org.openqa.selenium.htmlunit.HtmlUnitDriver

modules/backend/src/test/scala/test/TestCustomPage.scala → modules/backend/src/test/scala/jakontest/test/TestCustomPage.scala

@@ -1,4 +1,4 @@
-package test
+package jakontest.test
 
 import cz.kamenitxan.jakon.core.custom_pages.{AbstractStaticPage, CustomPage}
 

modules/backend/src/test/scala/test/TestEmailTypeHandler.scala → modules/backend/src/test/scala/jakontest/test/TestEmailTypeHandler.scala

@@ -1,4 +1,4 @@
-package test
+package jakontest.test
 
 import cz.kamenitxan.jakon.utils.mail.EmailTypeHandler
 import jakarta.mail.Message

modules/backend/src/test/scala/test/TestHttpServletRequest.scala → modules/backend/src/test/scala/jakontest/test/TestHttpServletRequest.scala

@@ -1,4 +1,4 @@
-package test
+package jakontest.test
 
 import jakarta.servlet.*
 import jakarta.servlet.http.*

modules/backend/src/test/scala/test/TestStaticPage.scala → modules/backend/src/test/scala/jakontest/test/TestStaticPage.scala

@@ -1,4 +1,4 @@
-package test
+package jakontest.test
 
 import cz.kamenitxan.jakon.core.custom_pages.{AbstractStaticPage, StaticPage}
 

modules/backend/src/test/scala/utils/I18NUtilTest.scala → modules/backend/src/test/scala/jakontest/utils/I18NUtilTest.scala

@@ -1,9 +1,9 @@
-package utils
+package jakontest.utils
 
 import java.util.Locale
 import cz.kamenitxan.jakon.utils.I18nUtil
 import org.scalatest.DoNotDiscover
-import test.TestBase
+import jakontest.test.TestBase
 
 @DoNotDiscover
 class I18NUtilTest extends TestBase {

modules/backend/src/test/scala/utils/SecurityTest.scala → modules/backend/src/test/scala/jakontest/utils/SecurityTest.scala

@@ -1,4 +1,4 @@
-package utils
+package jakontest.utils
 
 import cz.kamenitxan.jakon.core.database.DBHelper
 import cz.kamenitxan.jakon.utils.PageContext
@@ -9,7 +9,7 @@ import cz.kamenitxan.jakon.webui.entity.{Message, MessageSeverity}
 import jakarta.servlet.http.HttpServletRequest
 import org.scalatest.DoNotDiscover
 import spark.Request
-import test.{TestBase, TestHttpServletRequest}
+import jakontest.test.{TestBase, TestHttpServletRequest}
 
 import java.sql.Connection