From 7abe998d17f8709ae4a28561d3661d70186037cd Mon Sep 17 00:00:00 2001 From: patrick heyroth Date: Tue, 25 Jan 2022 10:29:12 +0100 Subject: [PATCH 1/2] Add Integrationtest for the Crowd plugin the integrationtest covers all enpoints with all their implement methods. --- .../ApplicationLinksResourceFuncTest.java | 79 ++++++++++++++ .../rest/ApplicationsResourceFuncTest.java | 101 ++++++++++++++++++ .../rest/DirectoriesResourceFuncTest.java | 29 +++++ .../crowd/rest/LicensesResourceFuncTest.java | 35 ++++++ .../rest/MailServerResourceFuncTest.java | 30 ++++++ .../SettingsBrandingResourceFuncTest.java | 46 ++++++++ .../crowd/rest/SettingsResourceFuncTest.java | 19 ++++ 7 files changed, 339 insertions(+) create mode 100644 src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationLinksResourceFuncTest.java create mode 100644 src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationsResourceFuncTest.java create mode 100644 src/test/java/it/de/aservo/confapi/crowd/rest/DirectoriesResourceFuncTest.java create mode 100644 src/test/java/it/de/aservo/confapi/crowd/rest/LicensesResourceFuncTest.java create mode 100644 src/test/java/it/de/aservo/confapi/crowd/rest/MailServerResourceFuncTest.java create mode 100644 src/test/java/it/de/aservo/confapi/crowd/rest/SettingsBrandingResourceFuncTest.java create mode 100644 src/test/java/it/de/aservo/confapi/crowd/rest/SettingsResourceFuncTest.java diff --git a/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationLinksResourceFuncTest.java b/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationLinksResourceFuncTest.java new file mode 100644 index 0000000..1d4323a --- /dev/null +++ b/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationLinksResourceFuncTest.java @@ -0,0 +1,79 @@ +package it.de.aservo.confapi.crowd.rest; + +import de.aservo.confapi.commons.constants.ConfAPI; +import de.aservo.confapi.commons.model.ApplicationLinkBean; +import de.aservo.confapi.commons.model.ApplicationLinksBean; +import it.de.aservo.confapi.commons.rest.ResourceBuilder; +import org.apache.wink.client.ClientResponse; +import org.apache.wink.client.Resource; +import org.junit.Test; + +import javax.ws.rs.core.Response; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; + +public class ApplicationLinksResourceFuncTest { + + @Test + public void testGetAllApplicationLinks() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS).build(); + ClientResponse clientResponse = settingsResource.get(); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testGetIdApplicationLink() { + UUID applicationLinkUuid = createApplicationLinkGetId(ApplicationLinkBean.EXAMPLE_1); + + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "/" + applicationLinkUuid + "?ignore-setup-errors=true").build(); + ClientResponse clientResponse = settingsResource.get(); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testDeleteAllApplicationLinks() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "?force=true").build(); + ClientResponse clientResponse = settingsResource.delete(); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testDeleteIdApplicationLink() { + UUID applicationLinkUuid = createApplicationLinkGetId(ApplicationLinkBean.EXAMPLE_1); + + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "/" + applicationLinkUuid + "?ignore-setup-errors=true").build(); + ClientResponse clientResponse = settingsResource.delete(); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testPutAllApplicationLinks() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "?ignore-setup-errors=true").build(); + ClientResponse clientResponse = settingsResource.put(ApplicationLinksBean.EXAMPLE_1); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testPutIdApplicationLink() { + UUID applicationLinkUuid = createApplicationLinkGetId(ApplicationLinkBean.EXAMPLE_1); + + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "/" + applicationLinkUuid + "?ignore-setup-errors=true").build(); + ClientResponse clientResponse = settingsResource.put(ApplicationLinkBean.EXAMPLE_1); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testAddNewApplicationLink() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "?ignore-setup-errors=true").build(); + ClientResponse clientResponse = settingsResource.post(ApplicationLinkBean.EXAMPLE_1); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + private UUID createApplicationLinkGetId(ApplicationLinkBean bean) { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "?ignore-setup-errors=true").build(); + ClientResponse clientResponse = settingsResource.post(bean); + + return clientResponse.getEntity(ApplicationLinkBean.class).getUuid(); + } +} diff --git a/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationsResourceFuncTest.java b/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationsResourceFuncTest.java new file mode 100644 index 0000000..2698df8 --- /dev/null +++ b/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationsResourceFuncTest.java @@ -0,0 +1,101 @@ +package it.de.aservo.confapi.crowd.rest; + +import de.aservo.confapi.commons.constants.ConfAPI; +import de.aservo.confapi.crowd.model.ApplicationBean; +import de.aservo.confapi.crowd.model.ApplicationsBean; +import it.de.aservo.confapi.commons.rest.ResourceBuilder; +import org.apache.wink.client.ClientResponse; +import org.apache.wink.client.Resource; +import org.junit.Test; + +import javax.ws.rs.core.Response; +import java.util.Collections; + +import static org.junit.Assert.assertEquals; + +public class ApplicationsResourceFuncTest { + + @Test + public void testGetAllApplications() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS).build(); + ClientResponse clientResponse = settingsResource.get(); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testGetIdApplication() { + Long applicationId = createApplicationGetId(createApplicationBean("testGetExample")); + + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/" + applicationId).build(); + ClientResponse clientResponse = settingsResource.get(); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testDeleteAllApplications() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/?force=true").build(); + createApplicationGetId(createApplicationBean("testDeleteAllExample1")); + createApplicationGetId(createApplicationBean("testDeleteAllExample2")); + + ClientResponse clientResponse = settingsResource.delete(); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testDeleteIdApplication() { + Long applicationId = createApplicationGetId(createApplicationBean("testDeleteExample")); + + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/" + applicationId).build(); + ClientResponse clientResponse = settingsResource.delete(); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testDeleteIdApplicationWithError() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/1").build(); + ClientResponse clientResponse = settingsResource.delete(); + assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testPutAllApplications() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS).build(); + createApplicationBean("app_name"); + ClientResponse clientResponse = settingsResource.put(new ApplicationsBean((Collections.singletonList(ApplicationBean.EXAMPLE_1)))); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testPutIdApplication() { + Long applicationId = createApplicationGetId(createApplicationBean("testPutExample")); + + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/" + applicationId).build(); + ClientResponse clientResponse = settingsResource.put(ApplicationBean.EXAMPLE_2); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testAddNewApplication() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS).build(); + ClientResponse clientResponse = settingsResource.post(ApplicationBean.EXAMPLE_1); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + private Long createApplicationGetId(ApplicationBean bean) { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS).build(); + ClientResponse clientResponse = settingsResource.post(bean); + + return clientResponse.getEntity(ApplicationBean.class).getId(); + } + + private ApplicationBean createApplicationBean (String name) { + ApplicationBean applicationBean = new ApplicationBean(); + applicationBean.setName(name); + applicationBean.setDescription(name); + applicationBean.setActive(true); + applicationBean.setPassword("3x4mpl3"); + applicationBean.setType(ApplicationBean.ApplicationType.GENERIC); + + return applicationBean; + } +} diff --git a/src/test/java/it/de/aservo/confapi/crowd/rest/DirectoriesResourceFuncTest.java b/src/test/java/it/de/aservo/confapi/crowd/rest/DirectoriesResourceFuncTest.java new file mode 100644 index 0000000..6ee45ef --- /dev/null +++ b/src/test/java/it/de/aservo/confapi/crowd/rest/DirectoriesResourceFuncTest.java @@ -0,0 +1,29 @@ +package it.de.aservo.confapi.crowd.rest; + +import de.aservo.confapi.commons.constants.ConfAPI; +import it.de.aservo.confapi.commons.rest.ResourceBuilder; +import org.apache.wink.client.ClientResponse; +import org.apache.wink.client.Resource; +import org.junit.Test; + +import javax.ws.rs.core.Response; + +import static org.junit.Assert.assertEquals; + +public class DirectoriesResourceFuncTest { + + @Test + public void testGetAllDirectories() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.DIRECTORIES).build(); + ClientResponse clientResponse = settingsResource.get(); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testGetIdDirectory() { + //The ID need to be hardcoded here because there is no Add method to generate and catch the ID for a test directory + Resource settingsResource = ResourceBuilder.builder(ConfAPI.DIRECTORIES + "/131073").build(); + ClientResponse clientResponse = settingsResource.get(); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } +} diff --git a/src/test/java/it/de/aservo/confapi/crowd/rest/LicensesResourceFuncTest.java b/src/test/java/it/de/aservo/confapi/crowd/rest/LicensesResourceFuncTest.java new file mode 100644 index 0000000..b4bf864 --- /dev/null +++ b/src/test/java/it/de/aservo/confapi/crowd/rest/LicensesResourceFuncTest.java @@ -0,0 +1,35 @@ +package it.de.aservo.confapi.crowd.rest; + +import de.aservo.confapi.commons.model.LicensesBean; +import it.de.aservo.confapi.commons.rest.AbstractLicenseResourceFuncTest; +import org.junit.Ignore; +import org.junit.Test; + +public class LicensesResourceFuncTest extends AbstractLicenseResourceFuncTest { + + @Override + protected LicensesBean getExampleBean() { + return LicensesBean.EXAMPLE_2_DEVELOPER_LICENSE; + } + + @Test + @Ignore("There is no set method to test") + @Override + public void testSetLicenses(){ + //NOSONAR: no test + } + + @Test + @Ignore("There is no set method to test") + @Override + public void testSetLicensesUnauthenticated(){ + //NOSONAR: no test + } + + @Test + @Ignore("There is no set method to test") + @Override + public void testSetLicensesUnauthorized(){ + //NOSONAR: no test + } +} diff --git a/src/test/java/it/de/aservo/confapi/crowd/rest/MailServerResourceFuncTest.java b/src/test/java/it/de/aservo/confapi/crowd/rest/MailServerResourceFuncTest.java new file mode 100644 index 0000000..a0fb6f3 --- /dev/null +++ b/src/test/java/it/de/aservo/confapi/crowd/rest/MailServerResourceFuncTest.java @@ -0,0 +1,30 @@ +package it.de.aservo.confapi.crowd.rest; + + +import de.aservo.confapi.commons.constants.ConfAPI; +import de.aservo.confapi.commons.model.MailServerSmtpBean; +import it.de.aservo.confapi.commons.rest.ResourceBuilder; +import org.apache.wink.client.ClientResponse; +import org.apache.wink.client.Resource; +import org.junit.Test; + +import javax.ws.rs.core.Response; + +import static org.junit.Assert.assertEquals; + +public class MailServerResourceFuncTest { + + @Test + public void testGetMailServerSmtp() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.MAIL_SERVER + "/" + ConfAPI.MAIL_SERVER_SMTP).build(); + ClientResponse clientResponse = settingsResource.get(); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testSetMailServerSmtp() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.MAIL_SERVER + "/" + ConfAPI.MAIL_SERVER_SMTP).build(); + ClientResponse clientResponse = settingsResource.put(MailServerSmtpBean.EXAMPLE_1); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } +} diff --git a/src/test/java/it/de/aservo/confapi/crowd/rest/SettingsBrandingResourceFuncTest.java b/src/test/java/it/de/aservo/confapi/crowd/rest/SettingsBrandingResourceFuncTest.java new file mode 100644 index 0000000..ffabef4 --- /dev/null +++ b/src/test/java/it/de/aservo/confapi/crowd/rest/SettingsBrandingResourceFuncTest.java @@ -0,0 +1,46 @@ +package it.de.aservo.confapi.crowd.rest; + + +import de.aservo.confapi.commons.constants.ConfAPI; +import de.aservo.confapi.commons.model.SettingsBean; +import de.aservo.confapi.crowd.model.SettingsBrandingLoginPageBean; +import it.de.aservo.confapi.commons.rest.ResourceBuilder; +import org.apache.wink.client.ClientResponse; +import org.apache.wink.client.Resource; +import org.junit.Test; + +import javax.ws.rs.core.Response; + +import static org.junit.Assert.assertEquals; + + +public class SettingsBrandingResourceFuncTest { + + @Test + public void testGetLoginPage() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.SETTINGS + "/" + ConfAPI.SETTINGS_BRANDING + "/" + ConfAPI.SETTINGS_BRANDING_LOGIN_PAGE).build(); + ClientResponse clientResponse = settingsResource.get(); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testGetSettings() { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.SETTINGS).build(); + ClientResponse clientResponse = settingsResource.get(); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testPutLoginPage () { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.SETTINGS + "/" + ConfAPI.SETTINGS_BRANDING + "/" + ConfAPI.SETTINGS_BRANDING_LOGIN_PAGE).build(); + ClientResponse clientResponse = settingsResource.put(SettingsBrandingLoginPageBean.EXAMPLE_2); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } + + @Test + public void testPutSettings () { + Resource settingsResource = ResourceBuilder.builder(ConfAPI.SETTINGS).build(); + ClientResponse clientResponse = settingsResource.put(SettingsBean.EXAMPLE_1); + assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + } +} diff --git a/src/test/java/it/de/aservo/confapi/crowd/rest/SettingsResourceFuncTest.java b/src/test/java/it/de/aservo/confapi/crowd/rest/SettingsResourceFuncTest.java new file mode 100644 index 0000000..0c05a79 --- /dev/null +++ b/src/test/java/it/de/aservo/confapi/crowd/rest/SettingsResourceFuncTest.java @@ -0,0 +1,19 @@ +package it.de.aservo.confapi.crowd.rest; + + +import de.aservo.confapi.commons.model.SettingsBean; +import it.de.aservo.confapi.commons.rest.AbstractSettingsResourceFuncTest; + +import java.net.URI; + + +public class SettingsResourceFuncTest extends AbstractSettingsResourceFuncTest { + + @Override + protected SettingsBean getExampleBean() { + SettingsBean settingsBean = new SettingsBean(); + settingsBean.setTitle("Example"); + settingsBean.setBaseUrl(URI.create("https://example.com")); + return settingsBean; + } +} From bcdd25049f2c16691aabb9b63f9c9432d6922c00 Mon Sep 17 00:00:00 2001 From: patrick heyroth Date: Thu, 10 Feb 2022 09:06:43 +0100 Subject: [PATCH 2/2] wip: waiting for instruction relating to the PUT methods --- .../ApplicationLinksResourceFuncTest.java | 55 +++++++++++----- .../rest/ApplicationsResourceFuncTest.java | 66 +++++++++++-------- .../rest/DirectoriesResourceFuncTest.java | 11 ++-- .../rest/MailServerResourceFuncTest.java | 12 ++-- .../SettingsBrandingResourceFuncTest.java | 23 ++++--- 5 files changed, 103 insertions(+), 64 deletions(-) diff --git a/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationLinksResourceFuncTest.java b/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationLinksResourceFuncTest.java index 1d4323a..4aedfb1 100644 --- a/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationLinksResourceFuncTest.java +++ b/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationLinksResourceFuncTest.java @@ -17,62 +17,81 @@ public class ApplicationLinksResourceFuncTest { @Test public void testGetAllApplicationLinks() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS).build(); - ClientResponse clientResponse = settingsResource.get(); + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS).build(); + ClientResponse clientResponse = resource.get(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + ApplicationLinksBean applicationLinksBean = clientResponse.getEntity(ApplicationLinksBean.class); + assertEquals(1, applicationLinksBean.getApplicationLinks().size()); } @Test public void testGetIdApplicationLink() { UUID applicationLinkUuid = createApplicationLinkGetId(ApplicationLinkBean.EXAMPLE_1); - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "/" + applicationLinkUuid + "?ignore-setup-errors=true").build(); - ClientResponse clientResponse = settingsResource.get(); + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "/" + applicationLinkUuid + "?ignore-setup-errors=true").build(); + ClientResponse clientResponse = resource.get(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + assertEquals(applicationLinkUuid, clientResponse.getEntity(ApplicationLinkBean.class).getUuid()); } @Test public void testDeleteAllApplicationLinks() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "?force=true").build(); - ClientResponse clientResponse = settingsResource.delete(); + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "?force=true").build(); + ClientResponse clientResponse = resource.delete(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + ClientResponse clientGetResponse = resource.get(); + assertEquals(Response.Status.OK.getStatusCode(), clientGetResponse.getStatusCode()); + ApplicationLinksBean applicationLinksBean = clientGetResponse.getEntity(ApplicationLinksBean.class); + assertEquals(0, applicationLinksBean.getApplicationLinks().size()); } @Test public void testDeleteIdApplicationLink() { UUID applicationLinkUuid = createApplicationLinkGetId(ApplicationLinkBean.EXAMPLE_1); - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "/" + applicationLinkUuid + "?ignore-setup-errors=true").build(); - ClientResponse clientResponse = settingsResource.delete(); + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "/" + applicationLinkUuid + "?ignore-setup-errors=true").build(); + ClientResponse clientResponse = resource.delete(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + ClientResponse clientGetResponse = resource.get(); + assertEquals(Response.Status.NOT_FOUND.getStatusCode(), clientGetResponse.getStatusCode()); } @Test - public void testPutAllApplicationLinks() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "?ignore-setup-errors=true").build(); - ClientResponse clientResponse = settingsResource.put(ApplicationLinksBean.EXAMPLE_1); + public void testPutAllApplicationLinks() {// TODO + UUID applicationLinkUuidExampleOne = createApplicationLinkGetId(ApplicationLinkBean.EXAMPLE_1); + UUID applicationLinkUuidExampleTwo = createApplicationLinkGetId(ApplicationLinkBean.EXAMPLE_1); + + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "?ignore-setup-errors=true").build(); + ClientResponse clientResponse = resource.put(ApplicationLinksBean.EXAMPLE_1); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); } @Test - public void testPutIdApplicationLink() { + public void testPutIdApplicationLink() {// TODO UUID applicationLinkUuid = createApplicationLinkGetId(ApplicationLinkBean.EXAMPLE_1); - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "/" + applicationLinkUuid + "?ignore-setup-errors=true").build(); - ClientResponse clientResponse = settingsResource.put(ApplicationLinkBean.EXAMPLE_1); + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "/" + applicationLinkUuid + "?ignore-setup-errors=true").build(); + ApplicationLinkBean exampleBean = ApplicationLinkBean.EXAMPLE_1; + exampleBean.setUsername("new-user"); + ClientResponse clientResponse = resource.put(exampleBean); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + ClientResponse clientGetResponse = resource.get(); + assertEquals(clientGetResponse.getEntity(ApplicationLinkBean.class).getName(),exampleBean.getUsername()); } @Test public void testAddNewApplicationLink() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "?ignore-setup-errors=true").build(); - ClientResponse clientResponse = settingsResource.post(ApplicationLinkBean.EXAMPLE_1); + UUID applicationLinkUuid = createApplicationLinkGetId(ApplicationLinkBean.EXAMPLE_1); + + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "/" + applicationLinkUuid + "?ignore-setup-errors=true").build(); + ClientResponse clientResponse = resource.get(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + assertEquals(applicationLinkUuid, clientResponse.getEntity(ApplicationLinkBean.class).getUuid()); } private UUID createApplicationLinkGetId(ApplicationLinkBean bean) { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "?ignore-setup-errors=true").build(); - ClientResponse clientResponse = settingsResource.post(bean); + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATION_LINKS + "?ignore-setup-errors=true").build(); + ClientResponse clientResponse = resource.post(bean); return clientResponse.getEntity(ApplicationLinkBean.class).getUuid(); } diff --git a/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationsResourceFuncTest.java b/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationsResourceFuncTest.java index 2698df8..00e77ca 100644 --- a/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationsResourceFuncTest.java +++ b/src/test/java/it/de/aservo/confapi/crowd/rest/ApplicationsResourceFuncTest.java @@ -17,78 +17,88 @@ public class ApplicationsResourceFuncTest { @Test public void testGetAllApplications() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS).build(); - ClientResponse clientResponse = settingsResource.get(); + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATIONS).build(); + ClientResponse clientResponse = resource.get(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + ApplicationsBean response = clientResponse.getEntity(ApplicationsBean.class); + assertEquals(4, response.getApplications().size()); } @Test public void testGetIdApplication() { - Long applicationId = createApplicationGetId(createApplicationBean("testGetExample")); + Long applicationId = createApplicationGetId(createApplicationBeanWithName("ExampleBean")); - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/" + applicationId).build(); - ClientResponse clientResponse = settingsResource.get(); + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/" + applicationId).build(); + ClientResponse clientResponse = resource.get(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + assertEquals(applicationId, clientResponse.getEntity(ApplicationBean.class).getId()); } @Test public void testDeleteAllApplications() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/?force=true").build(); - createApplicationGetId(createApplicationBean("testDeleteAllExample1")); - createApplicationGetId(createApplicationBean("testDeleteAllExample2")); - - ClientResponse clientResponse = settingsResource.delete(); + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/?force=true").build(); + ClientResponse clientResponse = resource.delete(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + ClientResponse clientGetResponse = resource.get(); + assertEquals(Response.Status.OK.getStatusCode(), clientGetResponse.getStatusCode()); + ApplicationsBean response = clientGetResponse.getEntity(ApplicationsBean.class); + assertEquals(2, response.getApplications().size()); } @Test public void testDeleteIdApplication() { - Long applicationId = createApplicationGetId(createApplicationBean("testDeleteExample")); + Long applicationId = createApplicationGetId(createApplicationBeanWithName("ExampleBean2")); - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/" + applicationId).build(); - ClientResponse clientResponse = settingsResource.delete(); + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/" + applicationId).build(); + ClientResponse clientResponse = resource.delete(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + ClientResponse clientGetResponse = resource.get(); + assertEquals(Response.Status.NOT_FOUND.getStatusCode(), clientGetResponse.getStatusCode()); } @Test public void testDeleteIdApplicationWithError() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/1").build(); - ClientResponse clientResponse = settingsResource.delete(); + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/1").build(); + ClientResponse clientResponse = resource.delete(); assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), clientResponse.getStatusCode()); } @Test - public void testPutAllApplications() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS).build(); - createApplicationBean("app_name"); - ClientResponse clientResponse = settingsResource.put(new ApplicationsBean((Collections.singletonList(ApplicationBean.EXAMPLE_1)))); + public void testPutAllApplications() {// TODO + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATIONS).build(); + createApplicationBeanWithName("Example1"); + createApplicationBeanWithName("Example2"); + ClientResponse clientResponse = resource.put(new ApplicationsBean((Collections.singletonList(ApplicationBean.EXAMPLE_1)))); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); } @Test - public void testPutIdApplication() { - Long applicationId = createApplicationGetId(createApplicationBean("testPutExample")); + public void testPutIdApplication() { // TODO + Long applicationId = createApplicationGetId(createApplicationBeanWithName("testPutExample")); - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/" + applicationId).build(); - ClientResponse clientResponse = settingsResource.put(ApplicationBean.EXAMPLE_2); + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/" + applicationId).build(); + ClientResponse clientResponse = resource.put(ApplicationBean.EXAMPLE_2); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); } @Test public void testAddNewApplication() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS).build(); - ClientResponse clientResponse = settingsResource.post(ApplicationBean.EXAMPLE_1); + Long applicationId = createApplicationGetId(ApplicationBean.EXAMPLE_1); + + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATIONS + "/" + applicationId).build(); + ClientResponse clientResponse = resource.get(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + assertEquals( applicationId, clientResponse.getEntity(ApplicationBean.class).getId()); } private Long createApplicationGetId(ApplicationBean bean) { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.APPLICATIONS).build(); - ClientResponse clientResponse = settingsResource.post(bean); + Resource resource = ResourceBuilder.builder(ConfAPI.APPLICATIONS).build(); + ClientResponse clientResponse = resource.post(bean); return clientResponse.getEntity(ApplicationBean.class).getId(); } - private ApplicationBean createApplicationBean (String name) { + private ApplicationBean createApplicationBeanWithName (String name) { ApplicationBean applicationBean = new ApplicationBean(); applicationBean.setName(name); applicationBean.setDescription(name); diff --git a/src/test/java/it/de/aservo/confapi/crowd/rest/DirectoriesResourceFuncTest.java b/src/test/java/it/de/aservo/confapi/crowd/rest/DirectoriesResourceFuncTest.java index 6ee45ef..c8a9fd3 100644 --- a/src/test/java/it/de/aservo/confapi/crowd/rest/DirectoriesResourceFuncTest.java +++ b/src/test/java/it/de/aservo/confapi/crowd/rest/DirectoriesResourceFuncTest.java @@ -1,6 +1,7 @@ package it.de.aservo.confapi.crowd.rest; import de.aservo.confapi.commons.constants.ConfAPI; +import de.aservo.confapi.commons.model.DirectoriesBean; import it.de.aservo.confapi.commons.rest.ResourceBuilder; import org.apache.wink.client.ClientResponse; import org.apache.wink.client.Resource; @@ -14,16 +15,18 @@ public class DirectoriesResourceFuncTest { @Test public void testGetAllDirectories() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.DIRECTORIES).build(); - ClientResponse clientResponse = settingsResource.get(); + Resource resource = ResourceBuilder.builder(ConfAPI.DIRECTORIES).build(); + ClientResponse clientResponse = resource.get(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + DirectoriesBean directoriesBean = clientResponse.getEntity(DirectoriesBean.class); + assertEquals(1, directoriesBean.getDirectories().size()); } @Test public void testGetIdDirectory() { //The ID need to be hardcoded here because there is no Add method to generate and catch the ID for a test directory - Resource settingsResource = ResourceBuilder.builder(ConfAPI.DIRECTORIES + "/131073").build(); - ClientResponse clientResponse = settingsResource.get(); + Resource resource = ResourceBuilder.builder(ConfAPI.DIRECTORIES + "/131073").build(); + ClientResponse clientResponse = resource.get(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); } } diff --git a/src/test/java/it/de/aservo/confapi/crowd/rest/MailServerResourceFuncTest.java b/src/test/java/it/de/aservo/confapi/crowd/rest/MailServerResourceFuncTest.java index a0fb6f3..0199302 100644 --- a/src/test/java/it/de/aservo/confapi/crowd/rest/MailServerResourceFuncTest.java +++ b/src/test/java/it/de/aservo/confapi/crowd/rest/MailServerResourceFuncTest.java @@ -16,15 +16,19 @@ public class MailServerResourceFuncTest { @Test public void testGetMailServerSmtp() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.MAIL_SERVER + "/" + ConfAPI.MAIL_SERVER_SMTP).build(); - ClientResponse clientResponse = settingsResource.get(); + Resource resource = ResourceBuilder.builder(ConfAPI.MAIL_SERVER + "/" + ConfAPI.MAIL_SERVER_SMTP).build(); + ClientResponse clientResponse = resource.get(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); } @Test public void testSetMailServerSmtp() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.MAIL_SERVER + "/" + ConfAPI.MAIL_SERVER_SMTP).build(); - ClientResponse clientResponse = settingsResource.put(MailServerSmtpBean.EXAMPLE_1); + Resource resource = ResourceBuilder.builder(ConfAPI.MAIL_SERVER + "/" + ConfAPI.MAIL_SERVER_SMTP).build(); + ClientResponse clientResponse = resource.put(MailServerSmtpBean.EXAMPLE_1); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + assertEquals(MailServerSmtpBean.EXAMPLE_1.getAdminContact(), clientResponse.getEntity(MailServerSmtpBean.class).getAdminContact()); + assertEquals(MailServerSmtpBean.EXAMPLE_1.getPrefix(), clientResponse.getEntity(MailServerSmtpBean.class).getPrefix()); + assertEquals(MailServerSmtpBean.EXAMPLE_1.getFrom(), clientResponse.getEntity(MailServerSmtpBean.class).getFrom()); + assertEquals(MailServerSmtpBean.EXAMPLE_1.getUseTls(), clientResponse.getEntity(MailServerSmtpBean.class).getUseTls()); } } diff --git a/src/test/java/it/de/aservo/confapi/crowd/rest/SettingsBrandingResourceFuncTest.java b/src/test/java/it/de/aservo/confapi/crowd/rest/SettingsBrandingResourceFuncTest.java index ffabef4..faadec2 100644 --- a/src/test/java/it/de/aservo/confapi/crowd/rest/SettingsBrandingResourceFuncTest.java +++ b/src/test/java/it/de/aservo/confapi/crowd/rest/SettingsBrandingResourceFuncTest.java @@ -18,29 +18,32 @@ public class SettingsBrandingResourceFuncTest { @Test public void testGetLoginPage() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.SETTINGS + "/" + ConfAPI.SETTINGS_BRANDING + "/" + ConfAPI.SETTINGS_BRANDING_LOGIN_PAGE).build(); - ClientResponse clientResponse = settingsResource.get(); + Resource resource = ResourceBuilder.builder(ConfAPI.SETTINGS + "/" + ConfAPI.SETTINGS_BRANDING + "/" + ConfAPI.SETTINGS_BRANDING_LOGIN_PAGE).build(); + ClientResponse clientResponse = resource.get(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + assertEquals(SettingsBrandingLoginPageBean.EXAMPLE_2, clientResponse.getEntity(SettingsBrandingLoginPageBean.class)); } @Test public void testGetSettings() { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.SETTINGS).build(); - ClientResponse clientResponse = settingsResource.get(); + Resource resource = ResourceBuilder.builder(ConfAPI.SETTINGS).build(); + ClientResponse clientResponse = resource.get(); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); + assertEquals(SettingsBean.EXAMPLE_1.getBaseUrl(), clientResponse.getEntity(SettingsBean.class).getBaseUrl()); + assertEquals(SettingsBean.EXAMPLE_1.getTitle(), clientResponse.getEntity(SettingsBean.class).getTitle()); } @Test - public void testPutLoginPage () { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.SETTINGS + "/" + ConfAPI.SETTINGS_BRANDING + "/" + ConfAPI.SETTINGS_BRANDING_LOGIN_PAGE).build(); - ClientResponse clientResponse = settingsResource.put(SettingsBrandingLoginPageBean.EXAMPLE_2); + public void testPutLoginPage () { // TODO + Resource resource = ResourceBuilder.builder(ConfAPI.SETTINGS + "/" + ConfAPI.SETTINGS_BRANDING + "/" + ConfAPI.SETTINGS_BRANDING_LOGIN_PAGE).build(); + ClientResponse clientResponse = resource.put(SettingsBrandingLoginPageBean.EXAMPLE_2); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); } @Test - public void testPutSettings () { - Resource settingsResource = ResourceBuilder.builder(ConfAPI.SETTINGS).build(); - ClientResponse clientResponse = settingsResource.put(SettingsBean.EXAMPLE_1); + public void testPutSettings () { // TODO + Resource resource = ResourceBuilder.builder(ConfAPI.SETTINGS).build(); + ClientResponse clientResponse = resource.put(SettingsBean.EXAMPLE_1); assertEquals(Response.Status.OK.getStatusCode(), clientResponse.getStatusCode()); } }