import com.amdocs.zusammen.datatypes.itemversion.Tag;
import org.openecomp.core.zusammen.api.ZusammenAdaptor;
import org.openecomp.core.zusammen.db.ZusammenConnector;
-import org.openecomp.sdc.versioning.dao.types.Revision;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import java.util.function.Predicate;
}
@Override
- public Optional<ElementConflict> getElementConflict(SessionContext context, ElementContext elementContext,
+ public Optional<ElementConflict> getElementConflict(SessionContext context,
+ ElementContext elementContext,
Id elementId) {
return Optional.ofNullable(connector.getElementConflict(context, elementContext, elementId));
}
@Override
public Optional<ItemVersion> getFirstVersion(SessionContext context, Id itemId) {
Collection<ItemVersion> versions = connector.listPublicVersions(context, itemId);
- if (versions == null || versions.size() == 0) {
+ if (versions == null || versions.isEmpty()) {
return Optional.empty();
}
List<ItemVersion> itemVersions = new ArrayList<>(versions);
connector.resetVersionHistory(context, itemId, versionId, changeRef);
}
- /*@Override
- public void revertVersionToRevision(SessionContext context, Id itemId, Id versionId,
- Id revisionId) {
- connector.resetVersionRevision(context, itemId, versionId, revisionId);
- }*/
-
- /*@Override
- public ItemVersionRevisions listVersionRevisions(SessionContext context, Id itemId, Id
- versionId) {
- return connector.listVersionRevisions(context, itemId, versionId);
- }*/
-
@Override
public void publishVersion(SessionContext context, Id itemId, Id versionId, String message) {
connector.publishVersion(context, itemId, versionId, message);
}
@Override
- public Collection<HealthInfo> checkHealth(SessionContext context) {
- return connector.checkHealth(context);
+ public void revert(SessionContext context, Id itemId, Id versionId, Id revisionId) {
+ connector.revertVersionRevision(context, itemId, versionId, revisionId);
}
@Override
- public String getVersion(SessionContext sessionContext) {
- return connector.getVersion(sessionContext);
+ public ItemVersionRevisions listRevisions(SessionContext context, Id itemId, Id versionId) {
+ return connector.listVersionRevisions(context, itemId, versionId);
}
@Override
- public void revert(SessionContext sessionContext, String itemId, String versionId,
- String revisionId) {
- connector.revertVersionRevision(sessionContext, new Id(itemId), new Id(versionId),
- new Id(revisionId));
+ public Collection<HealthInfo> checkHealth(SessionContext context) {
+ return connector.checkHealth(context);
}
@Override
- public List<Revision> listRevisions(SessionContext sessionContext, String itemId,
- String versionId) {
- List<Revision> revisions = new ArrayList<>();
- ItemVersionRevisions itemVersionRevisions =
- connector.listVersionRevisions(sessionContext, new Id(itemId), new Id
- (versionId));
- if(itemVersionRevisions == null || itemVersionRevisions.getItemVersionRevisions()==null ||
- itemVersionRevisions.getItemVersionRevisions().size()==0) {
- return revisions;
- }
- else{
- revisions = itemVersionRevisions.getItemVersionRevisions().stream().map
- (revision -> {
- Revision rev = new Revision();
- rev.setId(revision.getRevisionId().getValue());
- rev.setTime(revision.getTime());
- rev.setUser(revision.getUser());
- rev.setMessage(revision.getMessage());
- return rev;
- }).collect(Collectors.toList());
- revisions.sort(new Comparator<Revision>() {
- @Override
- public int compare(Revision o1, Revision o2) {
- if(o1.getTime().before(o2.getTime())) return 1;
- else return -1;
- }
- });
- // when creating a new item an initial version is created with
- // invalid data. this revision is not an applicable revision.
- //the logic of identifying this revision is:
- //1- only the first version of item has this issue
- //2- only in the first item version there are 2 revisions created
- //3- the second revision is in format "Initial {vlm/vsp}: {name of the vlm/vsp}
- //4- only if a revision in this format exists we remove the first revision.
- if(revisions.size()>1 && revisions.get(revisions.size()-2).getMessage().matches("Initial " +
- ".*:.*")){
- revisions.remove(revisions.size()-1);
- }
- return revisions;
- }
+ public String getVersion(SessionContext context) {
+ return connector.getVersion(context);
}
private static void sortItemVersionListByModificationTimeDescOrder(
import com.amdocs.zusammen.datatypes.Id;
import com.amdocs.zusammen.datatypes.SessionContext;
-import com.amdocs.zusammen.datatypes.UserInfo;
import com.amdocs.zusammen.datatypes.item.Info;
import com.amdocs.zusammen.datatypes.item.ItemVersion;
import com.amdocs.zusammen.datatypes.item.ItemVersionData;
import com.amdocs.zusammen.datatypes.item.ItemVersionStatus;
import com.amdocs.zusammen.datatypes.item.SynchronizationStatus;
+import com.amdocs.zusammen.datatypes.itemversion.ItemVersionRevisions;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.openecomp.core.zusammen.api.ZusammenAdaptor;
import org.openecomp.sdc.common.session.SessionContextProviderFactory;
+import org.openecomp.sdc.versioning.dao.types.Revision;
import org.openecomp.sdc.versioning.dao.types.Version;
import org.openecomp.sdc.versioning.dao.types.VersionStatus;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isNull;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
+import static org.openecomp.sdc.versioning.dao.impl.zusammen.TestUtil.createZusammenContext;
public class VersionZusammenDaoImplTest {
SessionContextProviderFactory.getInstance().createInterface().create(USER);
}
+ @Test
+ public void testListWhenNone() throws Exception {
+ String itemId = "itemId";
+
+ doReturn(new ArrayList<>()).when(zusammenAdaptorMock)
+ .listPublicVersions(eq(createZusammenContext(USER)), eq(new Id(itemId)));
+
+ List<Version> versions = versionDao.list(itemId);
+
+ Assert.assertTrue(versions.isEmpty());
+ }
+
@Test
public void testList() throws Exception {
String itemId = "itemId";
List<ItemVersion> zusammenVersions = Stream.of(
createZusammenVersion(versionId1, null, "version desc", "1.0", VersionStatus.Certified),
- createZusammenVersion(versionId2, versionId1, "version desc", "2.0", VersionStatus.Certified
- ),
+ createZusammenVersion(versionId2, versionId1, "version desc", "2.0",
+ VersionStatus.Certified),
createZusammenVersion(versionId3, versionId2, "version desc", "3.0", VersionStatus.Draft))
.collect(Collectors.toList());
doReturn(zusammenVersions).when(zusammenAdaptorMock)
- .listPublicVersions(eq(createZusammenContext()), eq(new Id(itemId)));
+ .listPublicVersions(eq(createZusammenContext(USER)), eq(new Id(itemId)));
List<Version> versions = versionDao.list(itemId);
Assert.assertEquals(versions.size(), 3);
: versionId2.getValue().equals(version.getId())
? 1
: 2;
- assetVersionEquals(version, zusammenVersions.get(zusammenVersionIndex));
+ assetVersionEquals(version, zusammenVersions.get(zusammenVersionIndex), null);
}
}
version.setDescription("version description");
version.setStatus(VersionStatus.Draft);
- doReturn(new Id("versionId")).when(zusammenAdaptorMock)
- .createVersion(eq(createZusammenContext()), eq(new Id(itemId)),
- baseId == null ? isNull(Id.class) : eq(new Id(baseId)), any(ItemVersionData.class));
-
ArgumentCaptor<ItemVersionData> capturedZusammenVersion =
ArgumentCaptor.forClass(ItemVersionData.class);
- versionDao.create(itemId, version);
-
- verify(zusammenAdaptorMock)
- .createVersion(eq(createZusammenContext()), eq(new Id(itemId)),
+ String versionId = "versionId";
+ doReturn(new Id(versionId)).when(zusammenAdaptorMock)
+ .createVersion(eq(createZusammenContext(USER)), eq(new Id(itemId)),
baseId == null ? isNull(Id.class) : eq(new Id(baseId)),
capturedZusammenVersion.capture());
+
+ versionDao.create(itemId, version);
+
+ Assert.assertEquals(version.getId(), versionId);
+
Info capturedInfo = capturedZusammenVersion.getValue().getInfo();
Assert.assertEquals(capturedInfo.getName(), version.getName());
Assert.assertEquals(capturedInfo.getDescription(), version.getDescription());
versionDao.update(itemId, version);
verify(zusammenAdaptorMock)
- .updateVersion(eq(createZusammenContext()), eq(new Id(itemId)), eq(new Id(version.getId())),
- capturedZusammenVersion.capture());
+ .updateVersion(eq(createZusammenContext(USER)), eq(new Id(itemId)),
+ eq(new Id(version.getId())), capturedZusammenVersion.capture());
Info capturedInfo = capturedZusammenVersion.getValue().getInfo();
Assert.assertEquals(capturedInfo.getName(), version.getName());
}
@Test
- public void testGet() throws Exception {
+ public void testGetSynced() throws Exception {
String itemId = "itemId";
String versionId = "versionId";
- SessionContext zusammenContext = createZusammenContext();
+ SessionContext zusammenContext = createZusammenContext(USER);
Id itemIdObj = new Id(itemId);
Id versionIdObj = new Id(versionId);
doReturn(zusammenPrivateVersion).when(zusammenAdaptorMock)
.getVersion(eq(zusammenContext), eq(itemIdObj), eq(versionIdObj));
- doReturn(new ItemVersionStatus(SynchronizationStatus.UP_TO_DATE, true))
- .when(zusammenAdaptorMock)
+ ItemVersionStatus zusammenVersionStatus =
+ new ItemVersionStatus(SynchronizationStatus.UP_TO_DATE, true);
+ doReturn(zusammenVersionStatus).when(zusammenAdaptorMock)
.getVersionStatus(eq(zusammenContext), eq(itemIdObj), eq(versionIdObj));
+ Optional<Version> version = versionDao.get(itemId, new Version(versionId));
+
+ Assert.assertTrue(version.isPresent());
+ assetVersionEquals(version.get(), zusammenPrivateVersion, zusammenVersionStatus);
+ }
+
+ @Test
+ public void testGetOutOfSync() throws Exception {
+ String itemId = "itemId";
+ String versionId = "versionId";
+
+ SessionContext zusammenContext = createZusammenContext(USER);
+ Id itemIdObj = new Id(itemId);
+ Id versionIdObj = new Id(versionId);
+
+ ItemVersion zusammenPrivateVersion =
+ createZusammenVersion(versionIdObj, new Id("baseId"), "version desc updated", "2.0",
+ VersionStatus.Draft);
+ doReturn(zusammenPrivateVersion).when(zusammenAdaptorMock)
+ .getVersion(eq(zusammenContext), eq(itemIdObj), eq(versionIdObj));
+
+ ItemVersionStatus zusammenVersionStatus =
+ new ItemVersionStatus(SynchronizationStatus.OUT_OF_SYNC, true);
+ doReturn(zusammenVersionStatus).when(zusammenAdaptorMock)
+ .getVersionStatus(eq(zusammenContext), eq(itemIdObj), eq(versionIdObj));
+
+ VersionStatus statusOnPublic = VersionStatus.Certified;
ItemVersion zusammenPublicVersion =
createZusammenVersion(versionIdObj, new Id("baseId"), "version desc", "2.0",
- VersionStatus.Certified);
+ statusOnPublic);
doReturn(zusammenPublicVersion).when(zusammenAdaptorMock)
.getPublicVersion(eq(zusammenContext), eq(itemIdObj), eq(versionIdObj));
Assert.assertTrue(version.isPresent());
zusammenPrivateVersion.getData().getInfo()
- .addProperty(VersionZusammenDaoImpl.ZusammenProperty.STATUS,
- VersionStatus.Certified.name());
- assetVersionEquals(version.get(), zusammenPrivateVersion);
+ .addProperty(VersionZusammenDaoImpl.ZusammenProperty.STATUS, statusOnPublic.name());
+ assetVersionEquals(version.get(), zusammenPrivateVersion, zusammenVersionStatus);
}
- // TODO: 12/20/2017 complete tests
- /* @Test
- public void testDelete() throws Exception {
+ @Test
+ public void testGetMerging() throws Exception {
+ String itemId = "itemId";
+ String versionId = "versionId";
+
+ SessionContext zusammenContext = createZusammenContext(USER);
+ Id itemIdObj = new Id(itemId);
+ Id versionIdObj = new Id(versionId);
+
+ ItemVersion zusammenPrivateVersion =
+ createZusammenVersion(versionIdObj, new Id("baseId"), "version desc", "2.0",
+ VersionStatus.Draft);
+ doReturn(zusammenPrivateVersion).when(zusammenAdaptorMock)
+ .getVersion(eq(zusammenContext), eq(itemIdObj), eq(versionIdObj));
+
+ ItemVersionStatus zusammenVersionStatus =
+ new ItemVersionStatus(SynchronizationStatus.MERGING, true);
+ doReturn(zusammenVersionStatus).when(zusammenAdaptorMock)
+ .getVersionStatus(eq(zusammenContext), eq(itemIdObj), eq(versionIdObj));
+ ItemVersion zusammenPublicVersion =
+ createZusammenVersion(versionIdObj, new Id("baseId"), "version desc", "2.0",
+ VersionStatus.Draft);
+ doReturn(zusammenPublicVersion).when(zusammenAdaptorMock)
+ .getPublicVersion(eq(zusammenContext), eq(itemIdObj), eq(versionIdObj));
+
+ Optional<Version> version = versionDao.get(itemId, new Version(versionId));
+
+ Assert.assertTrue(version.isPresent());
+ assetVersionEquals(version.get(), zusammenPrivateVersion, zusammenVersionStatus);
}
@Test
public void testPublish() throws Exception {
+ String itemId = "itemId";
+ String versionId = "versionId";
+ String message = "publish message";
+
+ versionDao.publish(itemId, new Version(versionId), message);
+ verify(zusammenAdaptorMock)
+ .publishVersion(eq(createZusammenContext(USER)), eq(new Id(itemId)), eq(new Id(versionId)),
+ eq(message));
}
@Test
public void testSync() throws Exception {
+ String itemId = "itemId";
+ String versionId = "versionId";
+
+ versionDao.sync(itemId, new Version(versionId));
+ verify(zusammenAdaptorMock)
+ .syncVersion(eq(createZusammenContext(USER)), eq(new Id(itemId)), eq(new Id(versionId)));
}
@Test
public void testForceSync() throws Exception {
+ String itemId = "itemId";
+ String versionId = "versionId";
+
+ versionDao.forceSync(itemId, new Version(versionId));
+ verify(zusammenAdaptorMock)
+ .forceSyncVersion(eq(createZusammenContext(USER)), eq(new Id(itemId)),
+ eq(new Id(versionId)));
}
@Test
public void testRevert() throws Exception {
+ String itemId = "itemId";
+ String versionId = "versionId";
+ String revisionId = "revisionId";
+
+ versionDao.revert(itemId, new Version(versionId), revisionId);
+ verify(zusammenAdaptorMock)
+ .revert(eq(createZusammenContext(USER)), eq(new Id(itemId)), eq(new Id(versionId)),
+ eq(new Id(revisionId)));
}
@Test
- public void testListRevisions() throws Exception {
+ public void testListRevisionsWhenNone() throws Exception {
+ String itemId = "itemId";
+ String versionId = "versionId";
- }*/
+ List<Revision> revisions = versionDao.listRevisions(itemId, new Version(versionId));
- private void assetVersionEquals(Version version, ItemVersion zusammenVersion) {
- Assert.assertEquals(version.getId(), zusammenVersion.getId().getValue());
- Assert.assertEquals(version.getBaseId(),
- zusammenVersion.getBaseId() == null ? null : zusammenVersion.getBaseId().getValue());
- Info info = zusammenVersion.getData().getInfo();
- Assert.assertEquals(version.getName(), info.getName());
- Assert.assertEquals(version.getDescription(), info.getDescription());
- Assert.assertEquals(version.getStatus(),
- VersionStatus.valueOf(info.getProperty(VersionZusammenDaoImpl.ZusammenProperty.STATUS)));
- String label = info.getProperty(VersionZusammenDaoImpl.ZusammenProperty.LABEL).toString();
- Assert
- .assertEquals(version.getMajor(), Integer.parseInt(label.substring(0, label.indexOf('.'))));
- Assert.assertEquals(version.getMinor(),
- Integer.parseInt(label.substring(label.indexOf('.') + 1, label.length())));
- Assert.assertEquals(version.getCreationTime(), zusammenVersion.getCreationTime());
- Assert.assertEquals(version.getModificationTime(), zusammenVersion.getModificationTime());
+ Assert.assertTrue(revisions.isEmpty());
+ }
+
+ @Test
+ public void testListRevisions() throws Exception {
+ String itemId = "itemId";
+ String versionId = "versionId";
+
+ long currentTime = System.currentTimeMillis();
+ Date rev4time = new Date(currentTime); // latest
+ Date rev3time = new Date(currentTime - 1);
+ Date rev2time = new Date(currentTime - 2);
+ Date rev1time = new Date(currentTime - 3); // oldest
+ List<com.amdocs.zusammen.datatypes.itemversion.Revision> zusammenRevisions = Stream.of(
+ createZusammenRevision("rev4", "forth rev", "user1", rev4time),
+ createZusammenRevision("rev1", "first rev", "user2", rev1time),
+ createZusammenRevision("rev3", "third rev", "user2", rev3time),
+ createZusammenRevision("rev2", "second rev", "user1", rev2time))
+ .collect(Collectors.toList());
+ ItemVersionRevisions toBeReturned = new ItemVersionRevisions();
+ toBeReturned.setItemVersionRevisions(zusammenRevisions);
+ doReturn(toBeReturned).when(zusammenAdaptorMock)
+ .listRevisions(eq(createZusammenContext(USER)), eq(new Id(itemId)), eq(new Id(versionId)));
+
+ List<Revision> revisions = versionDao.listRevisions(itemId, new Version(versionId));
+
+ Assert.assertEquals(revisions.size(), 4);
+ assertRevisionEquals(revisions.get(0), zusammenRevisions.get(0)); // rev4 - latest
+ assertRevisionEquals(revisions.get(1), zusammenRevisions.get(2)); // rev3
+ assertRevisionEquals(revisions.get(2), zusammenRevisions.get(3)); // rev2
+ assertRevisionEquals(revisions.get(3), zusammenRevisions.get(1)); // rev1 - oldest
}
private ItemVersion createZusammenVersion(Id id, Id baseId, String description, String label,
return version;
}
- private SessionContext createZusammenContext() {
- SessionContext sessionContext = new SessionContext();
- sessionContext.setUser(new UserInfo(USER));
- sessionContext.setTenant("dox");
- return sessionContext;
+ private void assetVersionEquals(Version version, ItemVersion zusammenVersion,
+ ItemVersionStatus zusammenVersionStatus) {
+ Assert.assertEquals(version.getId(), zusammenVersion.getId().getValue());
+ Assert.assertEquals(version.getBaseId(),
+ zusammenVersion.getBaseId() == null ? null : zusammenVersion.getBaseId().getValue());
+ Info info = zusammenVersion.getData().getInfo();
+ Assert.assertEquals(version.getName(), info.getName());
+ Assert.assertEquals(version.getDescription(), info.getDescription());
+ Assert.assertEquals(version.getStatus(),
+ VersionStatus.valueOf(info.getProperty(VersionZusammenDaoImpl.ZusammenProperty.STATUS)));
+ String label = info.getProperty(VersionZusammenDaoImpl.ZusammenProperty.LABEL).toString();
+ Assert
+ .assertEquals(version.getMajor(), Integer.parseInt(label.substring(0, label.indexOf('.'))));
+ Assert.assertEquals(version.getMinor(),
+ Integer.parseInt(label.substring(label.indexOf('.') + 1, label.length())));
+ Assert.assertEquals(version.getCreationTime(), zusammenVersion.getCreationTime());
+ Assert.assertEquals(version.getModificationTime(), zusammenVersion.getModificationTime());
+
+ if (zusammenVersionStatus != null) {
+ Assert.assertEquals(version.getState().isDirty(), zusammenVersionStatus.isDirty());
+ Assert.assertEquals(version.getState().getSynchronizationState().toString(),
+ zusammenVersionStatus.getSynchronizationStatus().toString());
+ }
+ }
+
+ private com.amdocs.zusammen.datatypes.itemversion.Revision createZusammenRevision(String id,
+ String message,
+ String user,
+ Date time) {
+ com.amdocs.zusammen.datatypes.itemversion.Revision revision = new com.amdocs.zusammen
+ .datatypes.itemversion.Revision();
+ revision.setRevisionId(new Id(id));
+ revision.setMessage(message);
+ revision.setUser(user);
+ revision.setTime(time);
+ return revision;
}
+ private void assertRevisionEquals(
+ Revision revision,
+ com.amdocs.zusammen.datatypes.itemversion.Revision zusammenRevision) {
+ Assert.assertEquals(revision.getId(), zusammenRevision.getRevisionId().getValue());
+ Assert.assertEquals(revision.getMessage(), zusammenRevision.getMessage());
+ Assert.assertEquals(revision.getUser(), zusammenRevision.getUser());
+ Assert.assertEquals(revision.getTime(), zusammenRevision.getTime());
+ }
}
\ No newline at end of file
Code Review / sdc.git / commitdiff