Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ before_script:
- if [[ "${TRAVIS_OS_NAME}" == linux ]]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; fi

script:
- gradle assemble
- gradle check --info --stacktrace
- ./gradlew assemble
- ./gradlew check --info --stacktrace

# See https://docs.travis-ci.com/user/languages/java/#Caching
before_cache:
Expand Down
23 changes: 23 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Adapted from TestFX
version: "{branch} {build}"

environment:
JAVA_HOME: C:\Program Files\Java\jdk1.8.0
matrix:
- JAVA_OPTS: ""
- JAVA_OPTS: "-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"

shallow_clone: true

build:
verbosity: detailed

build_script:
- cmd: java -version
- cmd: gradlew.bat --version --no-daemon

test_script:
- gradlew.bat check --info --stacktrace --no-daemon

cache:
- C:\Users\appveyor\.gradle
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 6 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
distributionSha256Sum=515dd63d32e55a9c05667809c5e40a947529de3054444ad274b3b75af5582eae
172 changes: 172 additions & 0 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

84 changes: 84 additions & 0 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions richtextfx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ dependencies {
compile (group: 'org.fxmisc.flowless', name: 'flowless', version: '0.6-SNAPSHOT')
compile group: 'org.fxmisc.wellbehaved', name: 'wellbehavedfx', version: '0.3'

testCompile group: 'junit', name: 'junit', version: '[4.0,5)'
testCompile group: 'junit', name: 'junit', version: '4.12'

integrationTestCompile group: 'junit', name: 'junit', version: '[4.0,)'
integrationTestCompile group: 'junit', name: 'junit', version: '4.12'
integrationTestCompile group: 'com.nitorcreations', name: 'junit-runners', version: '1.2'
integrationTestCompile "org.testfx:testfx-core:4.0.6-alpha"
integrationTestCompile ("org.testfx:testfx-junit:4.0.6-alpha") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,34 @@
public abstract class RichTextFXTestBase extends ApplicationTest {

static {
String robotProperty = System.getProperty("testfx.robot");
boolean usingGlass = robotProperty != null && robotProperty.equals("glass");

USING_GLASS_ADAPTER = usingGlass;
USING_AWT_ADAPTER = !usingGlass;

String osName = System.getProperty("os.name").toLowerCase();

IS_WINDOWS = osName.startsWith("win");
IS_MAC = osName.startsWith("mac");
IS_LINUX = osName.startsWith("linux");
}

/* *********************************************** *
* TestFX--Related
* *********************************************** */

public static final boolean USING_AWT_ADAPTER;
public static final boolean USING_GLASS_ADAPTER;

public final void skip_if_using_glass_robot() {
assumeTrue(USING_AWT_ADAPTER);
}

public final void skip_if_using_awt_robot() {
assumeTrue(USING_GLASS_ADAPTER);
}

/* *********************************************** *
* OS-RELATED
* *********************************************** */
Expand Down
Loading