Merge branch 'master' into wip-traversal-oriented-layout-master-patriknw

This commit is contained in:
Patrik Nordwall 2017-03-10 18:16:44 +01:00
commit 3554ad7243
25 changed files with 313 additions and 64 deletions

View file

@ -20,6 +20,7 @@ import java.util.concurrent.CompletionStage;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import docs.AbstractJavaTest;
import scala.concurrent.duration.Duration;
//#other-imports
@ -29,7 +30,7 @@ import org.junit.*;
* This class is not meant to be run as a test in the test suite, but it
* is set up such that it can be run interactively from within an IDE.
*/
public class QuickStartDocTest {
public class QuickStartDocTest extends AbstractJavaTest {
static
//#create-materializer