1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
/*
* Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Simon McDuff - initial API and implementation
* Eike Stepper - maintenance
*/
package org.eclipse.emf.cdo.tests;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.tests.model1.OrderDetail;
import org.eclipse.emf.cdo.tests.model1.SalesOrder;
import org.eclipse.emf.cdo.transaction.CDOConflictResolver;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.spi.cdo.CDOMergingConflictResolver;
/**
* @author Simon McDuff
*/
public class ConflictResolverMergingTest extends ConflictResolverTest
{
public void testMergeLocalChangesPerFeature_Bug1() throws Exception
{
msg("Opening session");
CDOSession session = openSession();
CDOTransaction transaction1 = session.openTransaction();
EList<EObject> contents1 = transaction1.getOrCreateResource(getResourcePath("/res1")).getContents();
contents1.add(getModel1Factory().createAddress());
transaction1.commit();
CDOTransaction transaction2 = session.openTransaction();
transaction2.options().addConflictResolver(createConflictResolver());
EList<EObject> contents2 = transaction2.getOrCreateResource(getResourcePath("/res1")).getContents();
// ----------------------------
contents1.add(getModel1Factory().createAddress());
contents2.add(getModel1Factory().createAddress());
// Resolver should be triggered.
commitAndSync(transaction1, transaction2);
commitAndSync(transaction2, transaction1);
// ----------------------------
contents1.add(getModel1Factory().createAddress());
contents2.add(getModel1Factory().createAddress());
// Resolver should be triggered.
commitAndSync(transaction1, transaction2);
commitAndSync(transaction2, transaction1);
// ----------------------------
contents1.add(getModel1Factory().createAddress());
contents2.add(getModel1Factory().createAddress());
// Resolver should be triggered.
commitAndSync(transaction1, transaction2);
commitAndSync(transaction2, transaction1);
}
public void testMergeLocalChangesPerFeature_Bug2() throws Exception
{
msg("Opening session");
CDOSession session = openSession();
CDOTransaction transaction1 = session.openTransaction();
transaction1.options().addConflictResolver(createConflictResolver());
EList<EObject> contents1 = transaction1.getOrCreateResource(getResourcePath("/res1")).getContents();
contents1.add(getModel1Factory().createAddress());
transaction1.commit();
CDOTransaction transaction2 = session.openTransaction();
transaction2.options().addConflictResolver(createConflictResolver());
EList<EObject> contents2 = transaction2.getOrCreateResource(getResourcePath("/res1")).getContents();
contents1.add(getModel1Factory().createAddress());
contents2.add(getModel1Factory().createAddress());
// Resolver should be triggered.
commitAndSync(transaction1, transaction2);
commitAndSync(transaction2, transaction1);
contents1.add(getModel1Factory().createAddress());
contents2.add(getModel1Factory().createAddress());
// Resolver should be triggered.
commitAndSync(transaction2, transaction1);
commitAndSync(transaction1, transaction2);
}
public void testMerge_ManyValue() throws Exception
{
msg("Opening session");
CDOSession session = openSession();
// CLIENT-1 creates sales order
CDOTransaction transaction1 = session.openTransaction();
transaction1.options().addConflictResolver(createConflictResolver());
EList<EObject> contents1 = transaction1.getOrCreateResource(getResourcePath("/res1")).getContents();
SalesOrder salesOrder1 = getModel1Factory().createSalesOrder();
EList<OrderDetail> orderDetails1 = salesOrder1.getOrderDetails();
contents1.add(salesOrder1);
transaction1.commit();
// CLIENT-2 loads sales order
CDOTransaction transaction2 = session.openTransaction();
transaction2.options().addConflictResolver(createConflictResolver());
EList<EObject> contents2 = transaction2.getOrCreateResource(getResourcePath("/res1")).getContents();
SalesOrder salesOrder2 = (SalesOrder)contents2.get(0);
EList<OrderDetail> orderDetails2 = salesOrder2.getOrderDetails();
// CLIENT-1 adds order detail
OrderDetail orderDetail1 = getModel1Factory().createOrderDetail();
orderDetails1.add(orderDetail1);
// CLIENT-2 adds order detail
OrderDetail orderDetail2 = getModel1Factory().createOrderDetail();
orderDetails2.add(orderDetail2);
// CLIENT-1 commits and waits for CLIENT-2's conflict resolver
commitAndSync(transaction1, transaction2);
// CLIENT-2 commits and waits for CLIENT-1's conflict resolver (nothing to do there)
commitAndSync(transaction2, transaction1);
assertEquals(2, orderDetails1.size());
assertEquals(CDOUtil.getCDOObject(orderDetail2).cdoID(), CDOUtil.getCDOObject(orderDetails1.get(0)).cdoID());
assertEquals(CDOUtil.getCDOObject(orderDetail1).cdoID(), CDOUtil.getCDOObject(orderDetails1.get(1)).cdoID());
}
@Override
protected CDOConflictResolver createConflictResolver()
{
return new CDOMergingConflictResolver();
}
}
|
