Skip to content

Commit 408a360

Browse files
committed
Merge branch 'release/2.8'
2 parents d0e2e53 + 6e104b8 commit 408a360

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

rcpttTests/mockups/tests/ui_block/ReportContextSnapshotOnUiBlock.test

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ Element-Type: testcase
66
Element-Version: 3.0
77
External-Reference:
88
Id: _FIOWIPLREfCHIefTd4RlqA
9-
Runtime-Version: 2.8.0.202601231339
10-
Save-Time: 1/24/26, 4:17 PM
9+
Runtime-Version: 2.9.0.qualifier
10+
Save-Time: 3/11/26, 10:00 AM
1111
Testcase-Type: ecl
1212

1313
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
1414
Content-Type: text/ecl
1515
Entry-Name: .content
1616

17-
set-q7-option -key "context.runnable.timeout" -value 1000
1817
set-q7-option -key jobTreatAsSleepingTimeout -value 500
1918

2019
get-view "Test Explorer" | get-tree | select "Project/hangui" | get-menu -path "Run As/.*Test Cases" | click
@@ -24,8 +23,7 @@ take-screenshot
2423
get-view "Execution View" | get-editbox -after [get-label "Message:"] | get-property text
2524
| equals "Execution .*timed out after .* seconds[\\s\\S]*" | verify-true
2625

27-
get-view "Execution View" | get-editbox -after [get-label "Message:"] | get-property text
28-
| equals "Execution .*timed out after .* seconds[\\s\\S]*" | verify-true
26+
set-q7-option -key "context.runnable.timeout" -value 1000
2927
get-view "Test Explorer" | get-tree | select "Project/TestWithABrokenContext" | get-menu -path "Run As/1 Test Cases"
3028
| click
3129
wait 5000

runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/internal/ui/player/UIJobCollector.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import static java.util.Arrays.asList;
1414

1515
import java.io.Closeable;
16-
import java.io.IOException;
1716
import java.io.PrintWriter;
1817
import java.util.ArrayList;
1918
import java.util.Collection;

runtime/verifications/org.eclipse.rcptt.verifications.log.impl/src/org/eclipse/rcptt/verifications/log/impl/ErrorLogVerificationProcessor.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import java.util.ArrayList;
1818
import java.util.Collection;
19+
import java.util.Collections;
1920
import java.util.List;
2021

2122
import org.eclipse.core.runtime.CoreException;
@@ -57,7 +58,7 @@ private static class LogEntry {
5758
}
5859
}
5960

60-
private final List<LogEntry> testLog = new ArrayList<LogEntry>();
61+
private final List<LogEntry> testLog = Collections.synchronizedList(new ArrayList<LogEntry>());
6162

6263
public ErrorLogVerificationProcessor() {
6364
Platform.addLogListener(this);
@@ -76,12 +77,16 @@ synchronized public Object run(Verification verification, Object data, IProcess
7677

7778
@Override
7879
public void finish(Verification verification, Object data, IProcess process) throws CoreException {
79-
ErrorList errors = findErrors((ErrorLogVerification) verification);
80+
ArrayList<LogEntry> copy;
81+
synchronized (testLog) {
82+
copy = new ArrayList<>(testLog);
83+
}
84+
ErrorList errors = findErrors((ErrorLogVerification) verification, copy);
8085
errors.throwIfAny(String.format("Error log verification '%s' failed:", verification.getName()), this.getClass()
8186
.getPackage().getName(), verification.getId());
8287
}
8388

84-
private ErrorList findErrors(ErrorLogVerification logVerification) {
89+
private ErrorList findErrors(ErrorLogVerification logVerification, List<LogEntry> testLog) {
8590
List<LogEntryPredicate> whiteList = new ArrayList<>();
8691
whiteList.addAll(logVerification.getAllowed());
8792
whiteList.addAll(logVerification.getRequired());

0 commit comments

Comments
 (0)