Commit 1c31598d authored by Eric Bruneton's avatar Eric Bruneton

Move AsmTest.assertThat() to a separate class, and use Java 8 streams in classesAndApis().

parent 809bf6db
......@@ -28,6 +28,7 @@
package org.objectweb.asm.commons;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.objectweb.asm.test.Assertions.assertThat;
import java.util.ArrayList;
import java.util.List;
......
......@@ -28,6 +28,7 @@
package org.objectweb.asm.commons;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.objectweb.asm.test.Assertions.assertThat;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
......
......@@ -27,6 +27,8 @@
// THE POSSIBILITY OF SUCH DAMAGE.
package org.objectweb.asm.commons;
import static org.objectweb.asm.test.Assertions.assertThat;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.objectweb.asm.ClassReader;
......
......@@ -28,6 +28,7 @@
package org.objectweb.asm.commons;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.objectweb.asm.test.Assertions.assertThat;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
......
......@@ -30,11 +30,8 @@ package org.objectweb.asm.test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assumptions.assumingThat;
import org.junit.jupiter.api.function.Executable;
import org.junit.jupiter.params.provider.Arguments;
import java.io.InputStream;
......@@ -45,6 +42,7 @@ import java.lang.reflect.Modifier;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.stream.Stream;
/**
......@@ -264,48 +262,10 @@ public abstract class AsmTest {
}
private static Stream<Arguments> classesAndApis(Api... apis) {
ArrayList<Arguments> result = new ArrayList<>();
for (PrecompiledClass precompiledClass : PrecompiledClass.values()) {
for (Api api : apis) {
result.add(Arguments.of(precompiledClass, api));
}
}
return result.stream();
}
public static ExecutableSubject assertThat(Executable executable) {
return new ExecutableSubject(executable);
}
public static class ExecutableSubject {
private final Executable executable;
ExecutableSubject(final Executable executable) {
this.executable = executable;
}
public <T extends Throwable> ExecutableOutcomeSubject<T> succeedsOrThrows(
Class<T> expectedType) {
return new ExecutableOutcomeSubject<T>(executable, expectedType);
}
}
public static class ExecutableOutcomeSubject<T extends Throwable> {
private final Executable executable;
private final Class<T> expectedType;
ExecutableOutcomeSubject(final Executable executable, final Class<T> expectedType) {
this.executable = executable;
this.expectedType = expectedType;
}
public void when(boolean condition) {
if (condition) {
assertThrows(expectedType, executable);
} else {
assumingThat(true, executable);
}
}
return Arrays.stream(PrecompiledClass.values())
.flatMap(
precompiledClass ->
Arrays.stream(apis).map(api -> Arguments.of(precompiledClass, api)));
}
/**
......
// ASM: a very small and fast Java bytecode manipulation framework
// Copyright (c) 2000-2011 INRIA, France Telecom
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
// 1. Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
// 3. Neither the name of the copyright holders nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
// THE POSSIBILITY OF SUCH DAMAGE.
package org.objectweb.asm.test;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assumptions.assumingThat;
import org.junit.jupiter.api.function.Executable;
/**
* Provides convenient assertions to check that an executable succeeds or throws an exception,
* depending on some condition.
*
* @author Eric Bruneton
*/
public final class Assertions {
private Assertions() {}
public static ExecutableSubject assertThat(Executable executable) {
return new ExecutableSubject(executable);
}
public static class ExecutableSubject {
private final Executable executable;
ExecutableSubject(final Executable executable) {
this.executable = executable;
}
public <T extends Throwable> ExecutableOutcomeSubject<T> succeedsOrThrows(
Class<T> expectedType) {
return new ExecutableOutcomeSubject<T>(executable, expectedType);
}
}
public static class ExecutableOutcomeSubject<T extends Throwable> {
private final Executable executable;
private final Class<T> expectedType;
ExecutableOutcomeSubject(final Executable executable, final Class<T> expectedType) {
this.executable = executable;
this.expectedType = expectedType;
}
public void when(boolean condition) {
if (condition) {
assertThrows(expectedType, executable);
} else {
assumingThat(true, executable);
}
}
}
}
......@@ -30,6 +30,7 @@ package org.objectweb.asm.test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.fail;
import static org.objectweb.asm.test.Assertions.assertThat;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
......
......@@ -27,6 +27,8 @@
// THE POSSIBILITY OF SUCH DAMAGE.
package org.objectweb.asm.tree;
import static org.objectweb.asm.test.Assertions.assertThat;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
......
......@@ -31,6 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.objectweb.asm.test.Assertions.assertThat;
import java.io.IOException;
import org.junit.jupiter.params.ParameterizedTest;
......
......@@ -28,6 +28,7 @@
package org.objectweb.asm;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.objectweb.asm.test.Assertions.assertThat;
import java.util.HashSet;
import java.util.Random;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment