lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Added tests for DS management. Removed boilerplate.

Browse Source
This commit is contained in:
Kai Zimmermann
2016-03-27 17:18:32 +02:00
parent 8a26ded4c4
commit a2a0a5697e
7 changed files with 138 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/DistributionSetManagementTest.java
View File

@@ -33,6 +33,7 @@ import org.eclipse.hawkbit.repository.model.DistributionSetTag;
import org.eclipse.hawkbit.repository.model.DistributionSetType;
import org.eclipse.hawkbit.repository.model.SoftwareModule;
import org.eclipse.hawkbit.repository.model.Target;
import org.fest.assertions.core.Condition;
import org.junit.Test;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -149,8 +150,7 @@ public class DistributionSetManagementTest extends AbstractIntegrationTest {
.createDistributionSetType(new DistributionSetType("softdeleted", "to be deletd", ""));
assertThat(distributionSetTypeRepository.findAll()).contains(softDelete);
final DistributionSet dsNewType = distributionSetManagement
.createDistributionSet(new DistributionSet("newtypesoft", "1", "", softDelete, null));
distributionSetManagement.createDistributionSet(new DistributionSet("newtypesoft", "1", "", softDelete, null));
distributionSetManagement.deleteDistributionSetType(softDelete);
assertThat(distributionSetManagement.findDistributionSetTypeByKey("softdeleted").isDeleted()).isEqualTo(true);
@@ -165,6 +165,46 @@ public class DistributionSetManagementTest extends AbstractIntegrationTest {
}
@Test
@Description("Verfies that a DS is of default type if not specified explicitly at creation time.")
public void createDistributionSetWithImplicitType() {
final DistributionSet set = distributionSetManagement
.createDistributionSet(new DistributionSet("newtypesoft", "1", "", null, null));
assertThat(set.getType()).as("Type should be equal to default type of tenant")
.isEqualTo(systemManagement.getTenantMetadata().getDefaultDsType());
}
@Test
@Description("Verfies that multiple DS are of default type if not specified explicitly at creation time.")
public void createMultipleDistributionSetsWithImplicitType() {
List<DistributionSet> sets = new ArrayList<>();
for (int i = 0; i < 10; i++) {
sets.add(new DistributionSet("another DS" + i, "X" + i, "", null, null));
}
sets = distributionSetManagement.createDistributionSets(sets);
assertThat(sets).as("Type should be equal to default type of tenant").are(new Condition<DistributionSet>() {
@Override
public boolean matches(final DistributionSet value) {
return value.getType().equals(systemManagement.getTenantMetadata().getDefaultDsType());
}
});
}
@Test(expected = EntityAlreadyExistsException.class)
@Description("Verfies that a DS entity cannot be used for creation.")
public void createDistributionSetFailsOnExistingEntity() {
final DistributionSet set = distributionSetManagement
.createDistributionSet(new DistributionSet("newtypesoft", "1", "", null, null));
distributionSetManagement.createDistributionSet(set);
}
@Test
@Description("Checks that metadata for a distribution set can be created.")
public void createDistributionSetMetadata() {
@@ -725,7 +765,7 @@ public class DistributionSetManagementTest extends AbstractIntegrationTest {
dsAssigned.getVersion());
final Target target = new Target("4712");
final Target savedTarget = targetManagement.createTarget(target);
final List<Target> toAssign = new ArrayList<Target>();
final List<Target> toAssign = new ArrayList<>();
toAssign.add(savedTarget);
deploymentManagement.assignDistributionSet(dsAssigned, toAssign);
@@ -739,38 +779,6 @@ public class DistributionSetManagementTest extends AbstractIntegrationTest {
.getTotalElements()).isEqualTo(2);
}
/**
* helper method which re-orders a list as expected. Re-orders the given
* distribution set in the order as given and returns a new list with the
* new order.
*
* @param dsThree
* @param buildDistributionSets
* @return
*/
private List<DistributionSet> reOrderDSList(final Iterable<DistributionSet> buildDistributionSets,
final DistributionSet... ds) {
final List<DistributionSet> reOrderedList = new ArrayList<>();
final Iterator<DistributionSet> iterator = buildDistributionSets.iterator();
while (iterator.hasNext()) {
final DistributionSet next = iterator.next();
int reorder = -1;
for (int index = 0; index < ds.length; index++) {
if (next.equals(ds[index])) {
reorder = index;
}
}
if (reorder >= 0) {
reOrderedList.add(reorder, next);
} else {
reOrderedList.add(next);
}
}
return reOrderedList;
}
private Target sendUpdateActionStatusToTarget(final Status status, final Action updActA, final Target t,
final String... msgs) {
updActA.setStatus(status);