mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-11-22 12:02:05 +01:00
commit
7139a43291
1 changed files with 29 additions and 6 deletions
|
@ -88,6 +88,8 @@ public class SmackIntegrationTestFramework {
|
||||||
|
|
||||||
public static boolean SINTTEST_UNIT_TEST = false;
|
public static boolean SINTTEST_UNIT_TEST = false;
|
||||||
|
|
||||||
|
private static ConcreteTest TEST_UNDER_EXECUTION;
|
||||||
|
|
||||||
protected final Configuration config;
|
protected final Configuration config;
|
||||||
|
|
||||||
protected TestRunResult testRunResult;
|
protected TestRunResult testRunResult;
|
||||||
|
@ -241,6 +243,10 @@ public class SmackIntegrationTestFramework {
|
||||||
return testRunResult;
|
return testRunResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static ConcreteTest getTestUnderExecution() {
|
||||||
|
return TEST_UNDER_EXECUTION;
|
||||||
|
}
|
||||||
|
|
||||||
@SuppressWarnings({"Finally"})
|
@SuppressWarnings({"Finally"})
|
||||||
private void runTests(Set<Class<? extends AbstractSmackIntTest>> classes)
|
private void runTests(Set<Class<? extends AbstractSmackIntTest>> classes)
|
||||||
throws InterruptedException, InstantiationException, IllegalAccessException,
|
throws InterruptedException, InstantiationException, IllegalAccessException,
|
||||||
|
@ -677,7 +683,12 @@ public class SmackIntegrationTestFramework {
|
||||||
executeSinttestSpecialMethod(beforeClassMethod);
|
executeSinttestSpecialMethod(beforeClassMethod);
|
||||||
|
|
||||||
for (ConcreteTest concreteTest : concreteTests) {
|
for (ConcreteTest concreteTest : concreteTests) {
|
||||||
runConcreteTest(concreteTest);
|
TEST_UNDER_EXECUTION = concreteTest;
|
||||||
|
try {
|
||||||
|
runConcreteTest(concreteTest);
|
||||||
|
} finally {
|
||||||
|
TEST_UNDER_EXECUTION = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
finally {
|
finally {
|
||||||
|
@ -726,21 +737,33 @@ public class SmackIntegrationTestFramework {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
static final class ConcreteTest {
|
public static final class ConcreteTest {
|
||||||
private final TestType testType;
|
private final TestType testType;
|
||||||
private final Method method;
|
private final Method method;
|
||||||
private final Executor executor;
|
private final Executor executor;
|
||||||
private final String[] subdescriptons;
|
private final List<String> subdescriptons;
|
||||||
|
|
||||||
private ConcreteTest(TestType testType, Method method, Executor executor, String... subdescriptions) {
|
private ConcreteTest(TestType testType, Method method, Executor executor, String... subdescriptions) {
|
||||||
this.testType = testType;
|
this.testType = testType;
|
||||||
this.method = method;
|
this.method = method;
|
||||||
this.executor = executor;
|
this.executor = executor;
|
||||||
this.subdescriptons = subdescriptions;
|
this.subdescriptons = List.of(subdescriptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
private transient String stringCache;
|
private transient String stringCache;
|
||||||
|
|
||||||
|
public TestType getTestType() {
|
||||||
|
return testType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Method getMethod() {
|
||||||
|
return method;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getSubdescriptons() {
|
||||||
|
return subdescriptons;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
if (stringCache != null) {
|
if (stringCache != null) {
|
||||||
|
@ -753,9 +776,9 @@ public class SmackIntegrationTestFramework {
|
||||||
.append(method.getName())
|
.append(method.getName())
|
||||||
.append(" (")
|
.append(" (")
|
||||||
.append(testType.name());
|
.append(testType.name());
|
||||||
if (subdescriptons != null && subdescriptons.length > 0) {
|
if (!subdescriptons.isEmpty()) {
|
||||||
sb.append(", ");
|
sb.append(", ");
|
||||||
StringUtils.appendTo(Arrays.asList(subdescriptons), sb);
|
StringUtils.appendTo(subdescriptons, sb);
|
||||||
}
|
}
|
||||||
sb.append(')');
|
sb.append(')');
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue