vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-06-25 19:11:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed remaining non-idempotent tests (#758)

Browse Source
This commit is contained in:
Kaiyao Ke 2024-06-03 16:28:10 +08:00 committed by GitHub
parent 11ae0ea7d3
commit 8f1ff56d34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 104 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
docs-web/src/test/java/com/sismics/docs/rest/TestAppResource.java
View File

@ -37,7 +37,10 @@ public class TestAppResource extends BaseJerseyTest {
* Test the API resource.
*/
// Record if config has been changed by previous test runs
private static boolean configInboxChanged = false;
private static boolean configSmtpChanged = false;
private static boolean configLdapChanged = false;
@Test
public void testAppResource() {
@ -191,6 +194,12 @@ public class TestAppResource extends BaseJerseyTest {
target().path("/document/list").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, guestToken)
.get(JsonObject.class);
// Disable guest login (clean up state)
target().path("/app/guest_login").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.post(Entity.form(new Form()
.param("enabled", "false")), JsonObject.class);
}
/**
@ -205,11 +214,13 @@ public class TestAppResource extends BaseJerseyTest {
JsonObject json = target().path("/app/config_smtp").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.get(JsonObject.class);
Assert.assertTrue(json.isNull("hostname"));
Assert.assertTrue(json.isNull("port"));
Assert.assertTrue(json.isNull("username"));
Assert.assertTrue(json.isNull("password"));
Assert.assertTrue(json.isNull("from"));
if (!configSmtpChanged) {
Assert.assertTrue(json.isNull("hostname"));
Assert.assertTrue(json.isNull("port"));
Assert.assertTrue(json.isNull("username"));
Assert.assertTrue(json.isNull("password"));
Assert.assertTrue(json.isNull("from"));
}
// Change SMTP configuration
target().path("/app/config_smtp").request()
@ -220,6 +231,7 @@ public class TestAppResource extends BaseJerseyTest {
.param("username", "sismics")
.param("from", "contact@sismics.com")
), JsonObject.class);
configSmtpChanged = true;
// Get SMTP configuration
json = target().path("/app/config_smtp").request()
@ -389,7 +401,9 @@ public class TestAppResource extends BaseJerseyTest {
JsonObject json = target().path("/app/config_ldap").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.get(JsonObject.class);
Assert.assertFalse(json.getBoolean("enabled"));
if (!configLdapChanged) {
Assert.assertFalse(json.getBoolean("enabled"));
}
// Change LDAP configuration
target().path("/app/config_ldap").request()
@ -406,6 +420,7 @@ public class TestAppResource extends BaseJerseyTest {
.param("default_email", "devnull@teedy.io")
.param("default_storage", "100000000")
), JsonObject.class);
configLdapChanged = true;
// Get the LDAP configuration
json = target().path("/app/config_ldap").request()

6
docs-web/src/test/java/com/sismics/docs/rest/TestAuditLogResource.java
View File

@ -118,6 +118,12 @@ public class TestAuditLogResource extends BaseJerseyTest {
Assert.assertEquals(countByClass(logs, "Document"), 1);
Assert.assertEquals(countByClass(logs, "Acl"), 2);
Assert.assertEquals(countByClass(logs, "File"), 1);
// Delete auditlog1
String adminToken = adminToken();
target().path("/user/auditlog1").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete();
}
/**

20
docs-web/src/test/java/com/sismics/docs/rest/TestGroupResource.java
View File

@ -188,5 +188,25 @@ public class TestGroupResource extends BaseJerseyTest {
Assert.assertEquals(2, groups.size());
Assert.assertTrue(groupList.contains("g11"));
Assert.assertTrue(groupList.contains("g112"));
// Delete all remaining groups and users
target().path("/group/g11").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete(JsonObject.class);
target().path("/group/g12new").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete(JsonObject.class);
target().path("/group/g111").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete(JsonObject.class);
target().path("/group/g112").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete(JsonObject.class);
target().path("/user/group1").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete();
target().path("/user/admin2").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete();
}
}

5
docs-web/src/test/java/com/sismics/docs/rest/TestRouteModelResource.java
View File

@ -137,5 +137,10 @@ public class TestRouteModelResource extends BaseJerseyTest {
.get(JsonObject.class);
routeModels = json.getJsonArray("routemodels");
Assert.assertEquals(1, routeModels.size());
// Deletes routeModel1 user
target().path("/user/routeModel1").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete();
}
}

12
docs-web/src/test/java/com/sismics/docs/rest/TestSecurity.java
View File

@ -73,6 +73,12 @@ public class TestSecurity extends BaseJerseyTest {
// User testsecurity logs out
clientUtil.logout(testSecurityToken);
// Delete the user
String adminToken = adminToken();
target().path("/user/testsecurity").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete();
}
@Test
@ -98,5 +104,11 @@ public class TestSecurity extends BaseJerseyTest {
.header(HeaderBasedSecurityFilter.AUTHENTICATED_USER_HEADER, "idontexist")
.get()
.getStatus());
// Delete the user
String adminToken = adminToken();
target().path("/user/header_auth_test").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete();
}
}

9
docs-web/src/test/java/com/sismics/docs/rest/TestShareResource.java
View File

@ -127,5 +127,14 @@ public class TestShareResource extends BaseJerseyTest {
Assert.assertEquals(Status.BAD_REQUEST, Status.fromStatusCode(response.getStatus()));
json = response.readEntity(JsonObject.class);
Assert.assertEquals("ShareNotFound", json.getString("type"));
// Deletes share1 and share 2
String adminToken = adminToken();
target().path("/user/share1").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete();
target().path("/user/share2").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete();
}
}

6
docs-web/src/test/java/com/sismics/docs/rest/TestTagResource.java
View File

@ -230,5 +230,11 @@ public class TestTagResource extends BaseJerseyTest {
Assert.assertEquals(1, tags.size());
Assert.assertEquals("UpdatedName", tags.getJsonObject(0).getString("name"));
Assert.assertNull(tags.getJsonObject(0).get("parent"));
// Deletes user tag1
String adminToken = adminToken();
target().path("/user/tag1").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete();
}
}

8
docs-web/src/test/java/com/sismics/docs/rest/TestThemeResource.java
View File

@ -103,5 +103,13 @@ public class TestThemeResource extends BaseJerseyTest {
// Get the background
response = target().path("/theme/image/background").request().get();
Assert.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
// Reset the main color as admin
target().path("/theme").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.post(Entity.form(new Form()
.param("color", "#ffffff")
.param("name", "Teedy")
.param("css", "")), JsonObject.class);
}
}

13
docs-web/src/test/java/com/sismics/docs/rest/TestUserResource.java
View File

@ -230,6 +230,11 @@ public class TestUserResource extends BaseJerseyTest {
.param("username", "alice")
.param("password", "12345678")));
Assert.assertEquals(Status.FORBIDDEN, Status.fromStatusCode(response.getStatus()));
// Delete user bob
target().path("/user").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, bobToken)
.delete();
}
/**
@ -416,7 +421,7 @@ public class TestUserResource extends BaseJerseyTest {
response = target().path("/user/totp1").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete();
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(Response.Status.OK, Response.Status.fromStatusCode(response.getStatus()));
}
@Test
@ -489,5 +494,11 @@ public class TestUserResource extends BaseJerseyTest {
Assert.assertEquals(Response.Status.BAD_REQUEST, Response.Status.fromStatusCode(response.getStatus()));
json = response.readEntity(JsonObject.class);
Assert.assertEquals("KeyNotFound", json.getString("type"));
// Delete absent_minded
response = target().path("/user/absent_minded").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete();
Assert.assertEquals(Response.Status.OK, Response.Status.fromStatusCode(response.getStatus()));
}
}

5
docs-web/src/test/java/com/sismics/docs/rest/TestWebhookResource.java
View File

@ -84,5 +84,10 @@ public class TestWebhookResource extends BaseJerseyTest {
.get(JsonObject.class);
webhooks = json.getJsonArray("webhooks");
Assert.assertEquals(0, webhooks.size());
// Deletes webhook1
target().path("/user/webhook1").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.delete();
}
}