Fix test library

RadicalZephyr · Jul 8, 2020 · 6fee0e7 · 6fee0e7
1 parent 5e01183
commit 6fee0e7
Show file tree

Hide file tree

Showing 25 changed files with 216 additions and 33 deletions.
diff --git a/relm-examples/examples/buttons-attribute.rs b/relm-examples/examples/buttons-attribute.rs
@@ -102,7 +102,8 @@ fn main() {
 mod tests {
     use gtk::{ButtonExt, LabelExt};
 
-    use gtk_test::{assert_label, assert_text, click};
+    use gtk_test::{assert_label, assert_text};
+    use relm_test::click;
 
     use crate::Win;
 

diff --git a/relm-examples/examples/buttons-attribute/src/main.rs b/relm-examples/examples/buttons-attribute/src/main.rs
@@ -103,7 +103,8 @@ fn main() {
 mod tests {
     use gtk::LabelExt;
 
-    use gtk_test::{assert_text, click};
+    use gtk_test::assert_text;
+    use relm_test::click;
 
     use crate::Win;
 

diff --git a/relm-examples/examples/buttons.rs b/relm-examples/examples/buttons.rs
@@ -152,7 +152,8 @@ fn main() {
 mod tests {
     use gtk::LabelExt;
 
-    use gtk_test::{assert_text, click};
+    use gtk_test::assert_text;
+    use relm_test::click;
 
     use crate::Win;
 

diff --git a/relm-examples/examples/text-fields-attribute.rs b/relm-examples/examples/text-fields-attribute.rs
@@ -93,7 +93,8 @@ mod tests {
     use gdk::keys::constants as key;
     use gtk::LabelExt;
 
-    use gtk_test::{assert_text, enter_key, enter_keys};
+    use gtk_test::assert_text;
+    use relm_test::{enter_key, enter_keys};
 
     use crate::Win;
 

diff --git a/relm-examples/examples/text-fields.rs b/relm-examples/examples/text-fields.rs
@@ -137,7 +137,8 @@ mod tests {
     use gdk::keys::constants as key;
     use gtk::LabelExt;
 
-    use gtk_test::{assert_text, enter_key, enter_keys};
+    use gtk_test::assert_text;
+    use relm_test::{enter_key, enter_keys};
 
     use crate::Win;
 

diff --git a/relm-examples/examples/widget-list.rs b/relm-examples/examples/widget-list.rs
@@ -145,7 +145,8 @@ fn main() {
 mod tests {
     use gtk::{Button, ContainerExt, Label, LabelExt};
 
-    use gtk_test::{assert_text, click, find_child_by_name};
+    use gtk_test::{assert_text, find_child_by_name};
+    use relm_test::click;
 
     use crate::Win;
 

diff --git a/relm-examples/tests/buttons-input.rs b/relm-examples/tests/buttons-input.rs
@@ -136,11 +136,11 @@ mod tests {
 
     use gtk_test::{
         assert_text,
-        enter_key,
-        enter_keys,
         focus,
     };
     use relm_test::{
+        enter_key,
+        enter_keys,
         relm_observer_new,
         relm_observer_wait,
     };

diff --git a/relm-examples/tests/buttons-test.rs b/relm-examples/tests/buttons-test.rs
@@ -68,6 +68,7 @@ impl Widget for ClickableLabel {
 
     view! {
         gtk::EventBox {
+            widget_name: "event_box",
             button_press_event(_, event) => ({
                 if event.get_event_type() == DoubleButtonPress {
                     DblClick
@@ -219,13 +220,12 @@ mod tests {
 
     use gtk_test::{
         assert_text,
-        click,
-        double_click,
-        find_widget_by_name,
         wait,
     };
     use relm_test::{
         Observer,
+        click,
+        double_click,
         relm_observer_new,
         relm_observer_wait,
     };
@@ -323,6 +323,7 @@ mod tests {
         assert_text!(widgets.label, 6);
 
         click(inc_tool_button);
+        assert_eq!(widgets.label.get_text(), 7.to_string());
         assert_text!(widgets.label, 7);
 
         let inc_label = inc_label.widget();
@@ -336,8 +337,7 @@ mod tests {
         wait(200);
         assert_text!(widgets.text, "Updated text");
 
-        let inc_label = find_widget_by_name(inc_label, "label").expect("find label");
-        double_click(&inc_label);
+        double_click(inc_label);
         relm_observer_wait!(let Text(text) = label_observer);
         assert_eq!(text, "Double click");
         assert_text!(widgets.label, 10);

diff --git a/relm-examples/tests/checkboxes.rs b/relm-examples/tests/checkboxes.rs
@@ -206,7 +206,7 @@ fn main() {
 mod tests {
     use gtk::ToggleButtonExt;
 
-    use gtk_test::click;
+    use relm_test::click;
 
     use crate::Win;
 

diff --git a/relm-examples/tests/communication-attribute.rs b/relm-examples/tests/communication-attribute.rs
@@ -195,7 +195,8 @@ fn main() {
 mod tests {
     use gtk::{Button, Entry, Label, LabelExt};
 
-    use gtk_test::{assert_text, click, enter_keys, find_child_by_name};
+    use gtk_test::{assert_text, find_child_by_name};
+    use relm_test::{click, enter_keys};
 
     use crate::Win;
 

diff --git a/relm-examples/tests/communication.rs b/relm-examples/tests/communication.rs
@@ -301,7 +301,8 @@ fn main() {
 mod tests {
     use gtk::{Button, Entry, Label, LabelExt};
 
-    use gtk_test::{assert_text, click, enter_keys, find_child_by_name};
+    use gtk_test::{assert_text, find_child_by_name};
+    use relm_test::{click, enter_keys};
 
     use crate::Win;
 

diff --git a/relm-examples/tests/generic-widget-attribute.rs b/relm-examples/tests/generic-widget-attribute.rs
@@ -139,7 +139,8 @@ fn main() {
 mod tests {
     use gtk::{Button, Label, LabelExt};
 
-    use gtk_test::{assert_text, click, find_child_by_name};
+    use gtk_test::{assert_text, find_child_by_name};
+    use relm_test::click;
 
     use crate::Win;
 

diff --git a/relm-examples/tests/generic-widget.rs b/relm-examples/tests/generic-widget.rs
@@ -215,7 +215,8 @@ fn main() {
 mod tests {
     use gtk::{Button, Label, LabelExt};
 
-    use gtk_test::{assert_text, click, find_child_by_name};
+    use gtk_test::{assert_text, find_child_by_name};
+    use relm_test::click;
 
     use crate::Win;
 

diff --git a/relm-examples/tests/include.rs b/relm-examples/tests/include.rs
@@ -75,7 +75,8 @@ fn main() {
 mod tests {
     use gtk::{ButtonExt, LabelExt};
 
-    use gtk_test::{assert_label, assert_text, click};
+    use gtk_test::{assert_label, assert_text};
+    use relm_test::click;
 
     use crate::Win;
 

diff --git a/relm-examples/tests/input-test.rs b/relm-examples/tests/input-test.rs
@@ -86,8 +86,8 @@ mod tests {
     use gdk::keys::constants as key;
     use gtk::{EntryExt, LabelExt};
 
-    use gtk_test::{
-        assert_text,
+    use gtk_test::assert_text;
+    use relm_test::{
         enter_key,
         enter_keys,
         key_press,
@@ -105,12 +105,12 @@ mod tests {
 
         // TODO: add test with uppercase letter (shift) when this issue (https://github.com/enigo-rs/enigo/issues/49) is fixed.
         //key_press(entry, key::Shift_L);
-        key_press(entry, key::A);
+        key_press(entry, key::a);
         assert_text!(label, "a");
-        key_release(entry, key::A);
+        key_release(entry, key::a);
         assert_text!(label, "a");
-        enter_key(entry, key::B);
-        enter_key(entry2, key::C);
+        enter_key(entry, key::b);
+        enter_key(entry2, key::c);
         assert_text!(label, "ba");
         assert_text!(entry2, "c");
         enter_keys(entry, "CD");

diff --git a/relm-examples/tests/key-events-attribute.rs b/relm-examples/tests/key-events-attribute.rs
@@ -95,7 +95,8 @@ fn main() {
 mod tests {
     use gtk::EntryExt;
 
-    use gtk_test::{assert_text, enter_keys};
+    use gtk_test::assert_text;
+    use relm_test::enter_keys;
 
     use crate::Win;
 

diff --git a/relm-examples/tests/key-events.rs b/relm-examples/tests/key-events.rs
@@ -136,7 +136,8 @@ fn main() {
 mod tests {
     use gtk::EntryExt;
 
-    use gtk_test::{assert_text, enter_keys};
+    use gtk_test::assert_text;
+    use relm_test::enter_keys;
 
     use crate::Win;
 

diff --git a/relm-examples/tests/model-param-attribute.rs b/relm-examples/tests/model-param-attribute.rs
@@ -118,7 +118,8 @@ fn main() {
 mod tests {
     use gtk::LabelExt;
 
-    use gtk_test::{assert_text, click};
+    use gtk_test::assert_text;
+    use relm_test::click;
 
     use crate::Win;
 

diff --git a/relm-examples/tests/model-param.rs b/relm-examples/tests/model-param.rs
@@ -150,7 +150,8 @@ fn main() {
 mod tests {
     use gtk::LabelExt;
 
-    use gtk_test::{assert_text, click};
+    use gtk_test::assert_text;
+    use relm_test::click;
 
     use crate::Win;
 

diff --git a/relm-examples/tests/model-params-attribute.rs b/relm-examples/tests/model-params-attribute.rs
@@ -99,7 +99,8 @@ fn main() {
 mod tests {
     use gtk::LabelExt;
 
-    use gtk_test::{assert_text, click};
+    use gtk_test::assert_text;
+    use relm_test::click;
 
     use crate::Win;
 

diff --git a/relm-examples/tests/multiple-widgets-attribute.rs b/relm-examples/tests/multiple-widgets-attribute.rs
@@ -159,7 +159,8 @@ fn main() {
 mod tests {
     use gtk::{Button, Entry, Label, LabelExt};
 
-    use gtk_test::{assert_text, click, enter_keys, find_child_by_name};
+    use gtk_test::{assert_text, enter_keys, find_child_by_name};
+    use relm_test::click;
 
     use crate::Win;
 

diff --git a/relm-examples/tests/multiple-widgets.rs b/relm-examples/tests/multiple-widgets.rs
@@ -265,7 +265,8 @@ fn main() {
 mod tests {
     use gtk::{Button, Entry, Label, LabelExt};
 
-    use gtk_test::{assert_text, click, enter_keys, find_child_by_name};
+    use gtk_test::{assert_text, find_child_by_name};
+    use relm_test::{click, enter_keys};
 
     use crate::Win;
 

diff --git a/relm-examples/tests/text-fields-prop-attribute.rs b/relm-examples/tests/text-fields-prop-attribute.rs
@@ -129,7 +129,8 @@ fn main() {
 mod tests {
     use gtk::{Entry, EntryExt};
 
-    use gtk_test::{assert_text, click, find_child_by_name, wait};
+    use gtk_test::{assert_text, find_child_by_name, wait};
+    use relm_test::click;
 
     use crate::Win;
 

diff --git a/relm-test/Cargo.toml b/relm-test/Cargo.toml
@@ -10,6 +10,10 @@ version = "0.20.0"
 edition = "2018"
 
 [dependencies]
+enigo = "^0.0.14"
+gdk = "^0.13.0"
+glib = "^0.10.0"
+gtk = "^0.9.0"
 gtk-test = "^0.6"
 
 [dependencies.relm]