Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFCompareTest.java')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFCompareTest.java71
1 files changed, 69 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFCompareTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFCompareTest.java
index 3edee66546..ae5303508d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFCompareTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFCompareTest.java
@@ -34,15 +34,45 @@ import org.eclipse.emf.ecore.EObject;
public class EMFCompareTest extends AbstractCDOTest
{
@SuppressWarnings("unused")
- public void testNewAudit() throws Exception
+ public void testAllContentsOfRoot() throws Exception
{
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
CDOResource resource = transaction.createResource(getResourcePath("/res1"));
- Company company = getModel1Factory().createCompany();
+ Company company = createCompany();
company.setName("ESC");
+
resource.getContents().add(company);
+ resource.getContents().add(createCompany());
+ resource.getContents().add(createCompany());
+ CDOCommitInfo commit1 = transaction.commit();
+
+ company.setName("Sympedia");
+ CDOCommitInfo commit2 = transaction.commit();
+
+ company.setName("Eclipse");
+ CDOCommitInfo commit3 = transaction.commit();
+
+ // CloseableComparison comparison = CDOCompareUtil.compare(session.openView(commit2).getObject(company), commit3);
+ CDOComparison comparison = CDOCompareUtil.compare(transaction.getRootResource(), commit2);
+ dump(comparison.getMatches(), "");
+ comparison.close();
+ }
+
+ @SuppressWarnings("unused")
+ public void testAllContentsOfCompany() throws Exception
+ {
+ CDOSession session = openSession();
+ CDOTransaction transaction = session.openTransaction();
+ CDOResource resource = transaction.createResource(getResourcePath("/res1"));
+
+ Company company = createCompany();
+ company.setName("ESC");
+
+ resource.getContents().add(company);
+ resource.getContents().add(createCompany());
+ resource.getContents().add(createCompany());
CDOCommitInfo commit1 = transaction.commit();
company.setName("Sympedia");
@@ -57,6 +87,43 @@ public class EMFCompareTest extends AbstractCDOTest
comparison.close();
}
+ @SuppressWarnings("unused")
+ public void testMinimal() throws Exception
+ {
+ CDOSession session = openSession();
+ CDOTransaction transaction = session.openTransaction();
+ CDOResource resource = transaction.createResource(getResourcePath("/res1"));
+
+ Company company = createCompany();
+
+ resource.getContents().add(company);
+ resource.getContents().add(createCompany());
+ resource.getContents().add(createCompany());
+ CDOCommitInfo commit1 = transaction.commit();
+
+ company.setName("Sympedia");
+ CDOCommitInfo commit2 = transaction.commit();
+
+ company.setName("Eclipse");
+ CDOCommitInfo commit3 = transaction.commit();
+
+ // CloseableComparison comparison = CDOCompareUtil.compare(session.openView(commit2).getObject(company), commit3);
+ CDOComparison comparison = CDOCompareUtil.compare(transaction, commit2);
+ dump(comparison.getMatches(), "");
+ comparison.close();
+ }
+
+ private Company createCompany()
+ {
+ Company company = getModel1Factory().createCompany();
+ company.getCategories().add(getModel1Factory().createCategory());
+ company.getCategories().add(getModel1Factory().createCategory());
+ company.getCategories().add(getModel1Factory().createCategory());
+ company.getCategories().add(getModel1Factory().createCategory());
+ company.getCategories().add(getModel1Factory().createCategory());
+ return company;
+ }
+
private static void dump(EList<Match> matches, String indent)
{
for (Match match : matches)

Back to the top