Skip to content
Snippets Groups Projects

fix(test): Update user delete request test to better check hosts

Merged Martin Lowe requested to merge malowe/main/delete-request-test into main
1 file
+ 11
5
Compare changes
  • Side-by-side
  • Inline
@@ -15,6 +15,7 @@ import java.net.URI;
@@ -15,6 +15,7 @@ import java.net.URI;
import java.util.List;
import java.util.List;
import java.util.Map;
import java.util.Map;
 
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipsefoundation.http.model.FlatRequestWrapper;
import org.eclipsefoundation.http.model.FlatRequestWrapper;
import org.eclipsefoundation.http.model.RequestWrapper;
import org.eclipsefoundation.http.model.RequestWrapper;
import org.eclipsefoundation.persistence.dao.impl.DefaultHibernateDao;
import org.eclipsefoundation.persistence.dao.impl.DefaultHibernateDao;
@@ -234,6 +235,9 @@ class AccountResourceTest {
@@ -234,6 +235,9 @@ class AccountResourceTest {
DefaultHibernateDao defaultDao;
DefaultHibernateDao defaultDao;
@Inject
@Inject
FilterService filters;
FilterService filters;
 
 
@ConfigProperty(name = "eclipse.profile.user-delete.hosts")
 
Map<String, String> hosts;
/*
/*
* GET /account/profile
* GET /account/profile
@@ -666,17 +670,19 @@ class AccountResourceTest {
@@ -666,17 +670,19 @@ class AccountResourceTest {
List<GerritCount> gerritResults = defaultDao.get(new RDBMSQuery<>(wrap, filters.get(GerritCount.class), params));
List<GerritCount> gerritResults = defaultDao.get(new RDBMSQuery<>(wrap, filters.get(GerritCount.class), params));
Assertions.assertFalse(gerritResults.isEmpty());
Assertions.assertFalse(gerritResults.isEmpty());
 
// assert that the user had 0 entries before
 
List<UserDeleteRequest> deletionResults = defaultDao.get(new RDBMSQuery<>(wrap, filters.get(UserDeleteRequest.class), params));
 
Assertions.assertTrue(deletionResults.isEmpty());
 
EndpointTestBuilder.from(buildDeleteTestCaseForUser("firstlast")).doPost(null).run();
EndpointTestBuilder.from(buildDeleteTestCaseForUser("firstlast")).doPost(null).run();
// Ensure record cleaned up
// Ensure record cleaned up
gerritResults = defaultDao.get(new RDBMSQuery<>(wrap, filters.get(GerritCount.class), params));
gerritResults = defaultDao.get(new RDBMSQuery<>(wrap, filters.get(GerritCount.class), params));
Assertions.assertTrue(gerritResults.isEmpty());
Assertions.assertTrue(gerritResults.isEmpty());
// Ensure new USS host was added to the DB for consumption downstream, use same uid from above
// assert that the proper number of results was created
params.add(ProfileAPIParameterNames.HOST.getName(), "api.eclipse.org/uss");
deletionResults = defaultDao.get(new RDBMSQuery<>(wrap, filters.get(UserDeleteRequest.class), params));
List<UserDeleteRequest> deletionResults = defaultDao.get(new RDBMSQuery<>(wrap, filters.get(UserDeleteRequest.class), params));
Assertions.assertEquals(hosts.size(), deletionResults.size());
Assertions.assertFalse(deletionResults.isEmpty());
Assertions.assertEquals(1, deletionResults.size());
// Test again to validate conflict response
// Test again to validate conflict response
EndpointTestBuilder.from(buildConflictDeleteCaseForUser("firstlast")).doPost(null).run();
EndpointTestBuilder.from(buildConflictDeleteCaseForUser("firstlast")).doPost(null).run();
Loading