feat(jans-auth-server): avoid compilation problem when version is fli…

…pped in test code #3148

jans-auth-server/client/pom.xml

@@ -181,17 +181,16 @@
 			<artifactId>testng</artifactId>
             <scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.jans</groupId>
-			<artifactId>jans-auth-model</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>htmlunit-driver</artifactId>
 			<scope>test</scope>
 		</dependency>
+        <dependency>
+            <groupId>io.jans</groupId>
+            <artifactId>jans-auth-test-model</artifactId>
+            <scope>test</scope>
+        </dependency>
 		<dependency>
 			<groupId>net.sourceforge.htmlunit</groupId>
 			<artifactId>htmlunit</artifactId>

jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/ClientTestUtil.java

@@ -8,7 +8,7 @@
 
 import io.jans.as.client.RegisterResponse;
 
-import static io.jans.as.model.uma.TestUtil.assertNotBlank;
+import static io.jans.as.test.TestUtil.assertNotBlank;
 import static org.testng.Assert.assertNotNull;
 
 /**

jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/AccessProtectedResourceFlowHttpTest.java

@@ -28,7 +28,7 @@
 import jakarta.ws.rs.core.Response;
 import java.io.UnsupportedEncodingException;
 
-import static io.jans.as.model.uma.UmaTestUtil.assertIt;
+import static io.jans.as.test.UmaTestUtil.assertIt;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 

jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/ClientAuthenticationByAccessTokenHttpTest.java

@@ -43,8 +43,7 @@
 import java.util.List;
 import java.util.UUID;
 
-import static io.jans.as.client.client.Asserter.*;
-import static io.jans.as.model.uma.UmaTestUtil.assertIt;
+import static io.jans.as.test.UmaTestUtil.assertIt;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 

jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/MetaDataFlowHttpTest.java

@@ -10,7 +10,7 @@
 import io.jans.as.client.uma.UmaClientFactory;
 import io.jans.as.client.uma.UmaMetadataService;
 import io.jans.as.model.uma.UmaMetadata;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
 

jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/ObtainPatTokenFlowHttpTest.java

@@ -11,7 +11,7 @@
 import io.jans.as.client.TokenResponse;
 import io.jans.as.client.client.AssertBuilder;
 import io.jans.as.client.uma.wrapper.UmaClient;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import io.jans.as.model.uma.wrapper.Token;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;

jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/RegisterResourceFlowHttpTest.java

@@ -14,7 +14,7 @@
 import io.jans.as.model.uma.UmaResource;
 import io.jans.as.model.uma.UmaResourceResponse;
 import io.jans.as.model.uma.UmaResourceWithId;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import io.jans.as.model.uma.wrapper.Token;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Parameters;

jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/ScopeHttpTest.java

@@ -10,7 +10,7 @@
 import io.jans.as.client.uma.UmaScopeService;
 import io.jans.as.model.uma.UmaMetadata;
 import io.jans.as.model.uma.UmaScopeDescription;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
 

jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/UmaRegisterPermissionFlowHttpTest.java

@@ -13,7 +13,7 @@
 import io.jans.as.model.uma.UmaMetadata;
 import io.jans.as.model.uma.UmaPermission;
 import io.jans.as.model.uma.UmaPermissionList;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Parameters;

jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/UmaSpontaneousScopeHttpTest.java

@@ -12,7 +12,6 @@
 import io.jans.as.client.RegisterRequest;
 import io.jans.as.client.RegisterResponse;
 import io.jans.as.client.client.AssertBuilder;
-import io.jans.as.client.client.Asserter;
 import io.jans.as.client.uma.UmaClientFactory;
 import io.jans.as.client.uma.UmaRptIntrospectionService;
 import io.jans.as.client.uma.UmaTokenService;
@@ -35,11 +34,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-
-import static io.jans.as.model.uma.UmaTestUtil.assertIt;
+import static io.jans.as.test.UmaTestUtil.assertIt;
 import static org.junit.Assert.assertTrue;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
 
 /**
  * @author Yuriy Zabrovarnyy

jans-auth-server/pom.xml

@@ -105,6 +105,7 @@
 		<module>static</module>
 		<module>common</module>
 		<module>server</module>
+		<module>test-model</module>
   </modules>
 
 	<dependencyManagement>
@@ -151,9 +152,8 @@
 			</dependency>
 			<dependency>
 				<groupId>io.jans</groupId>
-				<artifactId>jans-auth-model</artifactId>
+				<artifactId>jans-auth-test-model</artifactId>
 				<version>${project.version}</version>
-				<type>test-jar</type>
 			</dependency>
 			<dependency>
 				<groupId>io.jans</groupId>

jans-auth-server/server/pom.xml

@@ -590,12 +590,9 @@
 		<!-- Test -->
 		<dependency>
 			<groupId>io.jans</groupId>
-			<artifactId>jans-auth-model</artifactId>
-			<version>${project.version}</version>
-			<type>test-jar</type>
+			<artifactId>jans-auth-test-model</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.testng</groupId>
 			<artifactId>testng</artifactId>

jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TConfiguration.java

@@ -8,7 +8,7 @@
 
 import io.jans.as.model.uma.UmaConstants;
 import io.jans.as.model.uma.UmaMetadata;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import io.jans.as.server.BaseTest;
 import io.jans.as.server.util.ServerUtil;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;

jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TRegisterPermission.java

@@ -10,7 +10,7 @@
 import io.jans.as.model.uma.PermissionTicket;
 import io.jans.as.model.uma.UmaConstants;
 import io.jans.as.model.uma.UmaPermission;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import io.jans.as.model.uma.wrapper.Token;
 import io.jans.as.server.BaseTest;
 import io.jans.as.server.util.ServerUtil;

jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TRegisterResource.java

@@ -9,7 +9,7 @@
 import io.jans.as.model.uma.UmaConstants;
 import io.jans.as.model.uma.UmaResource;
 import io.jans.as.model.uma.UmaResourceResponse;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import io.jans.as.model.uma.wrapper.Token;
 import io.jans.as.server.BaseTest;
 import io.jans.as.server.util.ServerUtil;

jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TTokenRequest.java

@@ -17,7 +17,7 @@
 import io.jans.as.model.uma.RptIntrospectionResponse;
 import io.jans.as.model.uma.UmaConstants;
 import io.jans.as.model.uma.UmaScopeType;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import io.jans.as.model.uma.wrapper.Token;
 import io.jans.as.model.util.QueryStringDecoder;
 import io.jans.as.server.BaseTest;

jans-auth-server/server/src/test/java/io/jans/as/server/uma/ws/rs/AccessProtectedResourceFlowWSTest.java

@@ -11,7 +11,7 @@
 import io.jans.as.model.uma.RptIntrospectionResponse;
 import io.jans.as.model.uma.UmaPermission;
 import io.jans.as.model.uma.UmaResourceResponse;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import io.jans.as.model.uma.wrapper.Token;
 import io.jans.as.server.BaseTest;
 import io.jans.as.server.model.uma.TUma;

jans-auth-server/server/src/test/java/io/jans/as/server/uma/ws/rs/ObtainPatWSTest.java

@@ -6,7 +6,7 @@
 
 package io.jans.as.server.uma.ws.rs;
 
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import io.jans.as.model.uma.wrapper.Token;
 import io.jans.as.server.BaseTest;
 import io.jans.as.server.model.uma.TUma;

jans-auth-server/server/src/test/java/io/jans/as/server/uma/ws/rs/RegisterPermissionWSTest.java

@@ -10,7 +10,7 @@
 import io.jans.as.model.uma.UmaConstants;
 import io.jans.as.model.uma.UmaPermission;
 import io.jans.as.model.uma.UmaResourceResponse;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import io.jans.as.model.uma.wrapper.Token;
 import io.jans.as.server.BaseTest;
 import io.jans.as.server.model.uma.TUma;

jans-auth-server/server/src/test/java/io/jans/as/server/uma/ws/rs/UmaConfigurationWSTest.java

@@ -7,7 +7,7 @@
 package io.jans.as.server.uma.ws.rs;
 
 import io.jans.as.model.uma.UmaMetadata;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import io.jans.as.server.BaseTest;
 import io.jans.as.server.model.uma.TUma;
 import org.jboss.arquillian.test.api.ArquillianResource;

jans-auth-server/server/src/test/java/io/jans/as/server/uma/ws/rs/UmaRegisterResourceWSTest.java

@@ -8,7 +8,7 @@
 
 import io.jans.as.model.uma.UmaResource;
 import io.jans.as.model.uma.UmaResourceResponse;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import io.jans.as.model.uma.wrapper.Token;
 import io.jans.as.server.BaseTest;
 import io.jans.as.server.model.uma.TUma;

jans-auth-server/server/src/test/java/io/jans/as/server/uma/ws/rs/UmaScopeWSTest.java

@@ -8,7 +8,7 @@
 
 import io.jans.as.model.uma.UmaConstants;
 import io.jans.as.model.uma.UmaScopeDescription;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import io.jans.as.server.BaseTest;
 import io.jans.as.server.model.uma.TUma;
 import org.jboss.arquillian.test.api.ArquillianResource;

jans-auth-server/server/src/test/java/io/jans/as/server/util/TestUtil.java

@@ -5,7 +5,7 @@
 import jakarta.ws.rs.core.Response;
 import org.apache.commons.lang3.StringUtils;
 
-import static io.jans.as.model.uma.TestUtil.assertNotBlank;
+import static io.jans.as.test.TestUtil.assertNotBlank;
 import static org.testng.Assert.*;
 
 /**

jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/IntrospectionWebServiceEmbeddedTest.java

@@ -7,7 +7,7 @@
 package io.jans.as.server.ws.rs;
 
 import io.jans.as.model.common.IntrospectionResponse;
-import io.jans.as.model.uma.UmaTestUtil;
+import io.jans.as.test.UmaTestUtil;
 import io.jans.as.model.uma.wrapper.Token;
 import io.jans.as.server.BaseTest;
 import io.jans.as.server.model.uma.TUma;

jans-auth-server/server/src/test/java/io/jans/as/server/ws/rs/RegistrationRestWebServiceEmbeddedTest.java

@@ -15,7 +15,7 @@
 import io.jans.as.model.crypto.signature.SignatureAlgorithm;
 import io.jans.as.model.register.ApplicationType;
 import io.jans.as.model.register.RegisterResponseParam;
-import io.jans.as.model.uma.TestUtil;
+import io.jans.as.test.TestUtil;
 import io.jans.as.model.util.StringUtils;
 import io.jans.as.server.BaseTest;
 import io.jans.as.server.util.ServerUtil;