From 4624ebad94e4ef34b13c3426f14c36de4b9352a2 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Mon, 1 Sep 2014 19:38:49 +0200 Subject: [PATCH] improve UITestRunner --- src/main/java/io/bitsquare/gui/bitsquare.css | 8 ++++++++ .../createoffer/uimock/CreateOfferControllerUIMock.java | 5 +++-- .../trade/createoffer/uimock/CreateOfferViewUIMock.fxml | 8 ++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/bitsquare.css b/src/main/java/io/bitsquare/gui/bitsquare.css index ae5d846f98..18637a3e0e 100644 --- a/src/main/java/io/bitsquare/gui/bitsquare.css +++ b/src/main/java/io/bitsquare/gui/bitsquare.css @@ -1,3 +1,11 @@ +/* +Theme colors: + +blue: 0096c9 +main bg grey: dddddd +content bg grey: f4f4f4 + +*/ /* Create offer screen */ #input-description-label { -fx-font-size: 11; diff --git a/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferControllerUIMock.java b/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferControllerUIMock.java index 359f93c939..ebdfa30f7c 100644 --- a/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferControllerUIMock.java +++ b/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferControllerUIMock.java @@ -26,6 +26,7 @@ import java.util.ResourceBundle; import javax.inject.Inject; import javafx.fxml.FXML; +import javafx.fxml.Initializable; import javafx.scene.control.*; import javafx.scene.image.*; import javafx.scene.layout.*; @@ -33,7 +34,7 @@ import javafx.scene.layout.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class CreateOfferControllerUIMock { +public class CreateOfferControllerUIMock implements Initializable { private static final Logger log = LoggerFactory.getLogger(CreateOfferControllerUIMock.class); public VBox priceAmountMinAmountBox; @@ -70,7 +71,7 @@ public class CreateOfferControllerUIMock { private CreateOfferControllerUIMock() { } - + @Override public void initialize(URL url, ResourceBundle rb) { paymentInfoPane.setVisible(false); diff --git a/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferViewUIMock.fxml b/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferViewUIMock.fxml index 76d0e10c23..e9a51874f6 100644 --- a/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferViewUIMock.fxml +++ b/src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferViewUIMock.fxml @@ -150,7 +150,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -291,7 +291,7 @@ - + @@ -373,7 +373,7 @@ - +