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
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
|
/**
* Copyright (c) 2004 - 2011 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:
* Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.tests;
import org.eclipse.emf.cdo.common.branch.CDOBranch;
import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.tests.model1.Company;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CommitException;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.net4j.util.WrappedException;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
/**
* @author Eike Stepper
*/
public class RevisionDeltaInBranchTest extends RevisionDeltaTest
{
@Override
protected void doSetUp() throws Exception
{
super.doSetUp();
skipUnlessBranching();
}
@Override
protected void testStoreDelta(ListManipulator manipulator)
{
BasicEList<Company> referenceSub = new BasicEList<Company>();
BasicEList<Company> referenceMain = new BasicEList<Company>();
long timestampBaseBranch = 0L;
int subBranchID = 0;
// main branch
{
CDOSession session = openSession();
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction();
CDOResource resource = transaction.createResource(getResourcePath("/test1"));
addCompaniesToList(resource.getContents(), 0, 10);
addCompaniesToList(referenceMain, 0, 10);
addCompaniesToList(referenceSub, 0, 10);
try
{
CDOCommitInfo info = transaction.commit();
assertEquals(mainBranch, info.getBranch());
timestampBaseBranch = info.getTimeStamp();
}
catch (CommitException ex)
{
throw WrappedException.wrap(ex);
}
transaction.close();
session.close();
}
clearCache(getRepository().getRevisionManager());
// main branch - second batch
{
CDOSession session = openSession();
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction();
CDOResource resource = transaction.getResource(getResourcePath("/test1"));
addCompaniesToList(resource.getContents(), 10, 15);
addCompaniesToList(referenceMain, 10, 15);
try
{
CDOCommitInfo info = transaction.commit();
assertEquals(mainBranch, info.getBranch());
}
catch (CommitException ex)
{
throw WrappedException.wrap(ex);
}
transaction.close();
session.close();
}
clearCache(getRepository().getRevisionManager());
// sub branch - second batch
{
CDOSession session = openSession();
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOBranch subBranch = mainBranch.createBranch("subBranch", timestampBaseBranch);
subBranchID = subBranch.getID();
CDOTransaction transaction = session.openTransaction(subBranch);
CDOResource resource = transaction.getResource(getResourcePath("/test1"));
addCompaniesToList(resource.getContents(), 10, 20);
addCompaniesToList(referenceSub, 10, 20);
try
{
CDOCommitInfo info = transaction.commit();
assertEquals(subBranch, info.getBranch());
}
catch (CommitException ex)
{
throw WrappedException.wrap(ex);
}
transaction.close();
session.close();
}
clearCache(getRepository().getRevisionManager());
// do manipulations in branch
{
CDOSession session = openSession();
CDOBranch subBranch = session.getBranchManager().getBranch(subBranchID);
CDOTransaction transaction = session.openTransaction(subBranch);
CDOResource resource = transaction.getResource(getResourcePath("/test1"));
manipulator.doManipulations(resource.getContents());
manipulator.doManipulations(referenceSub);
try
{
transaction.commit();
}
catch (CommitException ex)
{
throw WrappedException.wrap(ex);
}
transaction.close();
session.close();
}
clearCache(getRepository().getRevisionManager());
{
CDOSession session = openSession();
CDOBranch subBranch = session.getBranchManager().getBranch(subBranchID);
CDOView view = session.openView(subBranch);
CDOResource resource = view.getResource(getResourcePath("/test1"));
assertEquals(referenceSub.size(), resource.getContents().size());
for (int i = 0; i < referenceSub.size(); i++)
{
assertEquals(referenceSub.get(i).getName(), ((Company)resource.getContents().get(i)).getName());
}
view.close();
session.close();
}
clearCache(getRepository().getRevisionManager());
{
CDOSession session = openSession();
CDOView view = session.openView();
CDOResource resource = view.getResource(getResourcePath("/test1"));
assertEquals(referenceMain.size(), resource.getContents().size());
for (int i = 0; i < referenceMain.size(); i++)
{
assertEquals(referenceMain.get(i).getName(), ((Company)resource.getContents().get(i)).getName());
}
view.close();
session.close();
}
}
@SuppressWarnings("unchecked")
protected void addCompaniesToList(@SuppressWarnings("rawtypes") EList list, int from, int to)
{
for (int i = from; i < to; i++)
{
String name = "company " + i;
Company company = getModel1Factory().createCompany();
company.setName(name);
list.add(company);
}
}
}
|
