From 0c2604d1a1203be7064fffeca6f67340ae60b376 Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Mon, 18 Jul 2016 13:03:39 +0200 Subject: [PATCH] add unit test for initial creating tenant without security context Signed-off-by: Michael Hirsch --- .../hawkbit/repository/jpa/SystemManagementTest.java | 10 ++++++++++ .../repository/test/util/WithSpringAuthorityRule.java | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SystemManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SystemManagementTest.java index a89486757..701494b3d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SystemManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SystemManagementTest.java @@ -17,6 +17,7 @@ import java.util.Random; import org.eclipse.hawkbit.repository.jpa.model.JpaSoftwareModule; import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.Target; +import org.eclipse.hawkbit.repository.model.TenantMetaData; import org.eclipse.hawkbit.repository.report.model.TenantUsage; import org.eclipse.hawkbit.repository.test.util.WithSpringAuthorityRule; import org.junit.Test; @@ -29,6 +30,15 @@ import ru.yandex.qatools.allure.annotations.Stories; @Stories("System Management") public class SystemManagementTest extends AbstractJpaIntegrationTestWithMongoDB { + @Test + @Description("Micha TODO!") + public void createInitialTenantWithoutSecurityContext() { + securityRule.clear(); + final String tenantToBeCreated = "newTenantToCreate"; + final TenantMetaData tenantMetadata = systemManagement.getTenantMetadata(tenantToBeCreated); + assertThat(tenantMetadata).isNotNull(); + } + @Test @Description("Ensures that findTenants returns all tenants and not only restricted to the tenant which currently is logged in") public void findTenantsReturnsAllTenantsNotOnlyWhichLoggedIn() throws Exception { diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithSpringAuthorityRule.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithSpringAuthorityRule.java index 8f5f8e94b..a2bc90555 100644 --- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithSpringAuthorityRule.java +++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithSpringAuthorityRule.java @@ -63,7 +63,7 @@ public class WithSpringAuthorityRule implements TestRule { } return oldContext; } - + /** * @param annotation */ @@ -129,6 +129,14 @@ public class WithSpringAuthorityRule implements TestRule { private void after(final SecurityContext oldContext) { SecurityContextHolder.setContext(oldContext); } + + /** + * Clears the current security context. + */ + public void clear() + { + SecurityContextHolder.clearContext(); + } /** * @param callable