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
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
|
/*******************************************************************************
* Copyright (c) 2004, 2007 Boeing.
* 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:
* Boeing - initial API and implementation
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.revision;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.Collection;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.ConflictStatus;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict;
import org.eclipse.osee.framework.skynet.core.conflict.Conflict;
import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal;
import org.eclipse.osee.framework.skynet.core.conflict.RelationConflict;
import org.eclipse.osee.support.test.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
/**
* @author Jeff C. Phillips
* @author Theron Virgin
*/
public class ConflictTest {
private static final boolean DEBUG =
"TRUE".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.osee.framework.skynet.core.test/debug/Junit"));
@BeforeClass
public static void setUp() throws Exception {
ConflictTestManager.initializeConflictTest();
}
@AfterClass
public static void tearDown() throws Exception {
ConflictTestManager.cleanUpConflictTest();
}
/**
* Test method for
* {@link org.eclipse.osee.framework.skynet.core.artifact.BranchManager#getMergeBranch(Branch, Branch)} .
*/
@org.junit.Test
public void testGetMergeBranchNotCreated() throws Exception {
TestUtil.sleep(5000);
SevereLoggingMonitor monitorLog = new SevereLoggingMonitor();
OseeLog.registerLoggerListener(monitorLog);
try {
Branch mergeBranch =
BranchManager.getMergeBranch(ConflictTestManager.getSourceBranch(), ConflictTestManager.getDestBranch());
assertTrue("The merge branch should be null as it hasn't been created yet", mergeBranch == null);
} catch (Exception ex) {
fail(ex.getMessage());
}
assertTrue(String.format("%d SevereLogs during test.", monitorLog.getSevereLogs().size()),
monitorLog.getSevereLogs().isEmpty());
}
/**
* Test method for
* {@link org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal#getConflictsPerBranch(org.eclipse.osee.framework.core.model.Branch, org.eclipse.osee.framework.core.model.Branch, org.eclipse.osee.framework.skynet.core.transaction.TransactionId)}
* .
*/
@org.junit.Test
public void testGetConflictsPerBranch() {
SevereLoggingMonitor monitorLog = new SevereLoggingMonitor();
OseeLog.registerLoggerListener(monitorLog);
Collection<Conflict> conflicts = null;
try {
conflicts =
ConflictManagerInternal.getConflictsPerBranch(ConflictTestManager.getSourceBranch(),
ConflictTestManager.getDestBranch(), ConflictTestManager.getSourceBranch().getBaseTransaction(),
new NullProgressMonitor());
} catch (Exception ex) {
fail(Lib.exceptionToString(ex));
}
int expectedNumber = ConflictTestManager.numberOfConflicts();
int actualNumber = conflicts.size();
assertTrue(
"(Intermittent failures - needs re-write) - Number of conflicts found is not equal to the number of conflicts expected",
(expectedNumber <= actualNumber) && (actualNumber <= (expectedNumber + 1)));
assertTrue(String.format("%d SevereLogs during test.", monitorLog.getSevereLogs().size()),
monitorLog.getSevereLogs().isEmpty());
}
/**
* Test method for
* {@link org.eclipse.osee.framework.skynet.core.artifact.BranchManager#getMergeBranch(Branch, Branch)} .
*/
@org.junit.Test
public void testGetMergeBranchCreated() throws Exception {
TestUtil.sleep(5000);
SevereLoggingMonitor monitorLog = new SevereLoggingMonitor();
OseeLog.registerLoggerListener(monitorLog);
try {
Branch mergeBranch =
BranchManager.getMergeBranch(ConflictTestManager.getSourceBranch(), ConflictTestManager.getDestBranch());
assertFalse(mergeBranch == null);
Collection<Artifact> artifacts = ArtifactQuery.getArtifactListFromBranch(mergeBranch, INCLUDE_DELETED);
if (DEBUG) {
System.out.println("Found the following Artifacts on the branch ");
System.out.print(" ");
for (Artifact artifact : artifacts) {
System.out.print(artifact.getArtId() + ", ");
}
System.out.println("\n");
}
int expectedNumber = ConflictTestManager.numberOfArtifactsOnMergeBranch();
int actualNumber = artifacts.size();
assertTrue(
"(Intermittent failures - needs re-write) - The merge Branch does not contain the expected number of artifacts: ",
(expectedNumber <= actualNumber) && (actualNumber <= (expectedNumber + 1)));
} catch (Exception ex) {
fail(ex.getMessage());
}
assertTrue(String.format("%d SevereLogs during test.", monitorLog.getAllLogs().size()),
monitorLog.getAllLogs().isEmpty());
}
@org.junit.Test
public void testResolveConflicts() {
SevereLoggingMonitor monitorLog = new SevereLoggingMonitor();
OseeLog.registerLoggerListener(monitorLog);
try {
Collection<Conflict> conflicts =
ConflictManagerInternal.getConflictsPerBranch(ConflictTestManager.getSourceBranch(),
ConflictTestManager.getDestBranch(), ConflictTestManager.getSourceBranch().getBaseTransaction(),
new NullProgressMonitor());
int whichChange = 1;
for (Conflict conflict : conflicts) {
if (conflict instanceof AttributeConflict) {
ConflictTestManager.resolveAttributeConflict((AttributeConflict) conflict);
conflict.setStatus(ConflictStatus.RESOLVED);
} else if (conflict instanceof RelationConflict) {
fail("Relation Conflicts are not supported yet");
}
whichChange++;
}
conflicts =
ConflictManagerInternal.getConflictsPerBranch(ConflictTestManager.getSourceBranch(),
ConflictTestManager.getDestBranch(), ConflictTestManager.getSourceBranch().getBaseTransaction(),
new NullProgressMonitor());
for (Conflict conflict : conflicts) {
ConflictStatus status = conflict.getStatus();
assertTrue(
"This conflict was not found to be resolved ArtId = " + conflict.getArtId() + " " + conflict.getSourceDisplayData(),
status.isResolved() || status.isInformational());
}
} catch (Exception ex) {
fail(Lib.exceptionToString(ex));
}
assertTrue(String.format("%d SevereLogs during test.", monitorLog.getAllLogs().size()),
monitorLog.getAllLogs().isEmpty());
}
@Ignore
public void testCommitWithoutResolutionErrors() {
SevereLoggingMonitor monitorLog = new SevereLoggingMonitor();
OseeLog.registerLoggerListener(monitorLog);
try {
ConflictManagerExternal conflictManager =
new ConflictManagerExternal(ConflictTestManager.getDestBranch(), ConflictTestManager.getSourceBranch());
BranchManager.commitBranch(null, conflictManager, false, false);
assertTrue("Commit did not complete as expected", ConflictTestManager.validateCommit());
assertEquals("Source Branch state incorrect", BranchState.COMMITTED,
ConflictTestManager.getSourceBranch().getBranchState());
} catch (Exception ex) {
fail("No Exceptions should have been thrown. Not even the " + ex.getLocalizedMessage() + "Exception");
}
assertTrue(String.format("%d SevereLogs during test.", monitorLog.getSevereLogs().size()),
monitorLog.getSevereLogs().isEmpty());
}
@org.junit.Test
public void testCommitFiltering() throws OseeCoreException {
checkNoTxCurrent("art_id", "osee_artifact");
checkNoTxCurrent("attr_id", "osee_attribute");
checkNoTxCurrent("rel_link_id", "osee_relation_link");
checkMultipleTxCurrent("art_id", "osee_artifact");
checkMultipleTxCurrent("rel_link_id", "osee_relation_link");
//TODO: Causes intermittent failures
// checkMultipleTxCurrent("attr_id", "osee_attribute");
}
private static final String NO_TX_CURRENT_SET =
"SELECT distinct t1.%s, txs1.branch_id FROM osee_txs txs1, %s t1 WHERE txs1.gamma_id = t1.gamma_id AND txs1.tx_current = 0 %s SELECT distinct t2.%s, txs2.branch_id FROM osee_txs txs2, %s t2 WHERE txs2.gamma_id = t2.gamma_id AND txs2.tx_current != 0";
private static final String MULTIPLE_TX_CURRENT_SET =
"SELECT resulttable.branch_id, resulttable.%s, COUNT(resulttable.branch_id) AS numoccurrences FROM (SELECT txs1.branch_id, t1.%s FROM osee_txs txs1, %s t1 WHERE txs1.gamma_id = t1.gamma_id AND txs1.tx_current != 0) resulttable GROUP BY resulttable.branch_id, resulttable.%s HAVING(COUNT(resulttable.branch_id) > 1) order by branch_id";
private static void checkNoTxCurrent(String dataId, String dataTable) throws OseeCoreException {
IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
String query =
String.format(NO_TX_CURRENT_SET, dataId, dataTable, chStmt.getComplementSql(), dataId, dataTable);
chStmt.runPreparedQuery(query);
if (chStmt.next()) {
fail(String.format("No TX Current Set Failed for dataId = %s and dataTable = %s", dataId, dataTable));
}
} finally {
chStmt.close();
}
}
private static void checkMultipleTxCurrent(String dataId, String dataTable) throws OseeCoreException {
IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
String query = String.format(MULTIPLE_TX_CURRENT_SET, dataId, dataId, dataTable, dataId);
chStmt.runPreparedQuery(query);
if (chStmt.next()) {
fail(String.format("Multiple TX Current Set Failed for dataId = %s and dataTable = %s", dataId, dataTable));
}
} finally {
chStmt.close();
}
}
}
|
