MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

tests: prefer suite proxy if available both test and suite and suite was started

Browse Source
This commit is contained in:
Anna.Kozlova
2017-04-19 15:32:46 +02:00
parent 4330866849
commit cf5351bed2
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java
+20 -10
View File
@@ -199,8 +199,8 @@ public class GeneralToSMTRunnerEventsConvertor extends GeneralTestEventsProcesso
}
SMTestProxy parentSuite = getCurrentSuite();
SMTestProxy testProxy = locationUrl != null ? findChildByLocation(parentSuite, locationUrl)
: findChildByName(parentSuite, fullName);
SMTestProxy testProxy = locationUrl != null ? findChildByLocation(parentSuite, locationUrl, false)
: findChildByName(parentSuite, fullName, false);
if (testProxy == null) {
// creates test
testProxy = new SMTestProxy(testName, false, locationUrl);
@@ -240,8 +240,8 @@ public class GeneralToSMTRunnerEventsConvertor extends GeneralTestEventsProcesso
final String locationUrl = suiteStartedEvent.getLocationUrl();
SMTestProxy parentSuite = getCurrentSuite();
SMTestProxy newSuite = locationUrl != null ? findChildByLocation(parentSuite, locationUrl)
: findChildByName(parentSuite, suiteName);
SMTestProxy newSuite = locationUrl != null ? findChildByLocation(parentSuite, locationUrl, true)
: findChildByName(parentSuite, suiteName, true);
if (newSuite == null) {
//new suite
newSuite = new SMTestProxy(suiteName, true, locationUrl, parentSuite.isPreservePresentableName());
@@ -265,22 +265,32 @@ public class GeneralToSMTRunnerEventsConvertor extends GeneralTestEventsProcesso
});
}
private SMTestProxy findChildByName(SMTestProxy parentSuite, String fullName) {
return findChild(parentSuite, fullName, SMTestProxy::getName);
private SMTestProxy findChildByName(SMTestProxy parentSuite, String fullName, boolean preferSuite) {
return findChild(parentSuite, fullName, SMTestProxy::getName, preferSuite);
}
private SMTestProxy findChildByLocation(SMTestProxy parentSuite, String fullName) {
return findChild(parentSuite, fullName, SMTestProxy::getLocationUrl);
private SMTestProxy findChildByLocation(SMTestProxy parentSuite, String fullName, boolean preferSuite) {
return findChild(parentSuite, fullName, SMTestProxy::getLocationUrl, preferSuite);
}
private SMTestProxy findChild(SMTestProxy parentSuite, String fullName, final Function<SMTestProxy, String> nameFunction) {
private SMTestProxy findChild(SMTestProxy parentSuite,
String fullName,
final Function<SMTestProxy, String> nameFunction,
boolean preferSuite) {
if (myTreeBuildBeforeStart) {
Set<SMTestProxy> acceptedProxies = new HashSet<>();
final Collection<? extends SMTestProxy> children = myGetChildren ? parentSuite.getChildren() : myCurrentChildren;
for (SMTestProxy proxy : children) {
if (fullName.equals(nameFunction.fun(proxy)) && !proxy.isFinal()) {
return proxy;
acceptedProxies.add(proxy);
}
}
if (!acceptedProxies.isEmpty()) {
return acceptedProxies.stream()
.filter(proxy -> proxy.isSuite() == preferSuite)
.findFirst()
.orElse(acceptedProxies.iterator().next());
}
}
return null;
}