You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by bd...@apache.org on 2023/03/01 22:32:49 UTC
[directory-scimple] branch flaky-user-test created (now a113565d)
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a change to branch flaky-user-test
in repository https://gitbox.apache.org/repos/asf/directory-scimple.git
at a113565d Remove duplicate get user by id test
This branch includes the following new commits:
new a113565d Remove duplicate get user by id test
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[directory-scimple] 01/01: Remove duplicate get user by id test
Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch flaky-user-test
in repository https://gitbox.apache.org/repos/asf/directory-scimple.git
commit a113565dffb52f68804a2a3cac35d5ab1d5f9f1d
Author: Brian Demers <bd...@apache.org>
AuthorDate: Wed Mar 1 17:32:37 2023 -0500
Remove duplicate get user by id test
This test depended on a precondition of the SCIM server under test, if a user does not exist, or another test caused an issue with the first user returned, the test would fail
UsersIT.createUser() covers this case by creating a user then retrieving that user. This ensure the test doesn't depend on existing state
---
.../scim/compliance/tests/ScimpleITSupport.java | 23 ++++++++++++++++------
.../directory/scim/compliance/tests/UsersIT.java | 19 ------------------
2 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/scim-compliance-tests/src/main/java/org/apache/directory/scim/compliance/tests/ScimpleITSupport.java b/scim-compliance-tests/src/main/java/org/apache/directory/scim/compliance/tests/ScimpleITSupport.java
index b7623610..5d72dea9 100644
--- a/scim-compliance-tests/src/main/java/org/apache/directory/scim/compliance/tests/ScimpleITSupport.java
+++ b/scim-compliance-tests/src/main/java/org/apache/directory/scim/compliance/tests/ScimpleITSupport.java
@@ -19,6 +19,9 @@
package org.apache.directory.scim.compliance.tests;
+import io.restassured.RestAssured;
+import io.restassured.config.Config;
+import io.restassured.config.RestAssuredConfig;
import io.restassured.filter.Filter;
import io.restassured.filter.FilterContext;
import io.restassured.filter.log.LogDetail;
@@ -51,6 +54,9 @@ public class ScimpleITSupport {
private final boolean loggingEnabled = Boolean.getBoolean("scim.tests.logging.enabled");
+ private final RestAssuredConfig config = RestAssured.config()
+ .logConfig(RestAssured.config().getLogConfig().enableLoggingOfRequestAndResponseIfValidationFails());
+
private final Map<String, String> requestHeaders = Map.of(
"User-Agent", "Apache SCIMple Compliance Tests",
"Accept-Charset", "utf-8",
@@ -86,6 +92,7 @@ public class ScimpleITSupport {
protected ValidatableResponse get(String path, Map<String, String> query) {
ValidatableResponse responseSpec =
given()
+ .config(config)
.urlEncodingEnabled(false) // URL encoding is handled but the URI
.redirects().follow(false)
.accept(SCIM_MEDIA_TYPE)
@@ -93,19 +100,20 @@ public class ScimpleITSupport {
.when()
.filter(logging(loggingEnabled))
.get(uri(path, query))
- .then();
+ .then()
+ .contentType(SCIM_MEDIA_TYPE);
- if (loggingEnabled) {
- responseSpec.log().everything();
- }
+ if (loggingEnabled) {
+ responseSpec.log().everything();
+ }
- return responseSpec
- .contentType(SCIM_MEDIA_TYPE);
+ return responseSpec;
}
protected ValidatableResponse post(String path, String body) {
ValidatableResponse responseSpec =
given()
+ .config(config)
.urlEncodingEnabled(false) // URL encoding is handled but the URI
.redirects().follow(false)
.accept(SCIM_MEDIA_TYPE)
@@ -127,6 +135,7 @@ public class ScimpleITSupport {
protected ValidatableResponse put(String path, String body) {
ValidatableResponse responseSpec =
given()
+ .config(config)
.urlEncodingEnabled(false) // URL encoding is handled but the URI
.redirects().follow(false)
.accept(SCIM_MEDIA_TYPE)
@@ -148,6 +157,7 @@ public class ScimpleITSupport {
protected ValidatableResponse patch(String path, String body) {
ValidatableResponse responseSpec =
given()
+ .config(config)
.urlEncodingEnabled(false) // URL encoding is handled but the URI
.redirects().follow(false)
.accept(SCIM_MEDIA_TYPE)
@@ -169,6 +179,7 @@ public class ScimpleITSupport {
protected ValidatableResponse delete(String path) {
ValidatableResponse responseSpec =
given()
+ .config(config)
.urlEncodingEnabled(false) // URL encoding is handled but the URI
.redirects().follow(false)
.accept(SCIM_MEDIA_TYPE)
diff --git a/scim-compliance-tests/src/main/java/org/apache/directory/scim/compliance/tests/UsersIT.java b/scim-compliance-tests/src/main/java/org/apache/directory/scim/compliance/tests/UsersIT.java
index 27bd4aea..2dc7d58e 100644
--- a/scim-compliance-tests/src/main/java/org/apache/directory/scim/compliance/tests/UsersIT.java
+++ b/scim-compliance-tests/src/main/java/org/apache/directory/scim/compliance/tests/UsersIT.java
@@ -58,25 +58,6 @@ public class UsersIT extends ScimpleITSupport {
);
}
- @Test
- @DisplayName("Get Users/{{id}}")
- public void userById() {
- String id = get("/Users", Map.of("count", "1","startIndex", "1"))
- .statusCode(200)
- .extract().jsonPath().get("Resources[0].id");
-
- get("/Users/" + id)
- .statusCode(200)
- .body(
- "id", is(id),
- "name.familyName", not(emptyString()),
- "name.givenName", not(emptyString()),
- "userName", not(emptyString()),
- "active", isBoolean(),
- "emails[0].value", not(emptyString())
- );
- }
-
@Test
@DisplayName("Test invalid User by username")
public void invalidUserNameFilter() {