Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(jans-auth-server): avoid compilation problem when version is flipped in test code #3148 #3210

Merged
merged 1 commit into from
Dec 5, 2022
Merged

feat(jans-auth-server): avoid compilation problem when version is flipped in test code #3148 #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions jans-auth-server/client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/ClientTestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...client/src/test/java/io/jans/as/client/ws/rs/uma/AccessProtectedResourceFlowHttpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions .../src/test/java/io/jans/as/client/ws/rs/uma/ClientAuthenticationByAccessTokenHttpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/MetaDataFlowHttpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...h-server/client/src/test/java/io/jans/as/client/ws/rs/uma/ObtainPatTokenFlowHttpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...server/client/src/test/java/io/jans/as/client/ws/rs/uma/RegisterResourceFlowHttpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/ScopeHttpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...r/client/src/test/java/io/jans/as/client/ws/rs/uma/UmaRegisterPermissionFlowHttpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 1 addition & 5 deletions ...-server/client/src/test/java/io/jans/as/client/ws/rs/uma/UmaSpontaneousScopeHttpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
108 changes: 0 additions & 108 deletions jans-auth-server/model/src/test/java/io/jans/as/model/uma/UmaTestUtil.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions jans-auth-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
<module>static</module>
<module>common</module>
<module>server</module>
<module>test-model</module>
</modules>

<dependencyManagement>
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 1 addition & 4 deletions jans-auth-server/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TRegisterPermission.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TRegisterResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TTokenRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...r/server/src/test/java/io/jans/as/server/uma/ws/rs/AccessProtectedResourceFlowWSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/server/src/test/java/io/jans/as/server/uma/ws/rs/ObtainPatWSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...uth-server/server/src/test/java/io/jans/as/server/uma/ws/rs/RegisterPermissionWSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...-auth-server/server/src/test/java/io/jans/as/server/uma/ws/rs/UmaConfigurationWSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...th-server/server/src/test/java/io/jans/as/server/uma/ws/rs/UmaRegisterResourceWSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/server/src/test/java/io/jans/as/server/uma/ws/rs/UmaScopeWSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/server/src/test/java/io/jans/as/server/util/TestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...ver/server/src/test/java/io/jans/as/server/ws/rs/IntrospectionWebServiceEmbeddedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../server/src/test/java/io/jans/as/server/ws/rs/RegistrationRestWebServiceEmbeddedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading