blob: 9467a1d0ad2a264146a4c5e94c035b73edeb8aed (
plain) (
blame)
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
|
/***************************************************************************
* Copyright (c) 2004 - 2009 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.Address;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.spi.cdo.CDOObjectConflictResolver.MergeLocalChangesPerFeature;
/**
* @author Simon McDuff
*/
public class ConflictResolverTest extends AbstractCDOTest
{
public void testMergeLocalChangesPerFeature_Basic() throws Exception
{
msg("Opening session");
CDOSession session = openModel1Session();
CDOTransaction transaction = session.openTransaction();
Address address = getModel1Factory().createAddress();
transaction.getOrCreateResource("/res1").getContents().add(address);
transaction.commit();
CDOTransaction transaction2 = session.openTransaction();
transaction2.options().addConflictResolver(new MergeLocalChangesPerFeature());
Address address2 = (Address)transaction2.getOrCreateResource("/res1").getContents().get(0);
address2.setCity("OTTAWA");
address.setName("NAME1");
transaction.commit();
// Resolver should be triggered. Should we always used a timer ?
Thread.sleep(1000);
assertFalse(CDOUtil.getCDOObject(address2).cdoConflict());
assertFalse(transaction2.hasConflict());
assertEquals("NAME1", address2.getName());
assertEquals("OTTAWA", address2.getCity());
transaction2.commit();
}
public void testMergeLocalChangesPerFeature_BasicException() throws Exception
{
msg("Opening session");
CDOSession session = openModel1Session();
CDOTransaction transaction = session.openTransaction();
Address address = getModel1Factory().createAddress();
transaction.getOrCreateResource("/res1").getContents().add(address);
transaction.commit();
CDOTransaction transaction2 = session.openTransaction();
transaction2.options().addConflictResolver(new MergeLocalChangesPerFeature());
Address address2 = (Address)transaction2.getOrCreateResource("/res1").getContents().get(0);
address2.setCity("OTTAWA");
address.setCity("NAME1");
transaction.commit();
// Resolver should be triggered. Should we always used a timer ?
Thread.sleep(1000);
assertTrue(CDOUtil.getCDOObject(address2).cdoConflict());
assertTrue(transaction2.hasConflict());
assertEquals("OTTAWA", address2.getCity());
}
}
|
