Merge pull request #7 from Ivy-Interactive/tendril/00239-MigrateTestsFromDeprecatedBuildCtxToAssignIds

[00239] Migrate tests from deprecated .build(ctx) to assign_ids pattern

Author: rorychatt

rusty/src/core/runtime.rs

@@ -311,14 +311,13 @@ mod tests {
         }
 
         impl View for ClickView {
-            fn build(&self, ctx: &mut BuildContext) -> Element {
+            fn build(&self, _ctx: &mut BuildContext) -> Element {
                 let clicked = self.clicked.clone();
-                let btn = Button::new("Click me")
+                Button::new("Click me")
                     .on_click(move || {
                         clicked.store(true, Ordering::SeqCst);
                     })
-                    .build(ctx);
-                Element::Widget(Box::new(btn))
+                    .into()
             }
         }
 
@@ -355,15 +354,14 @@ mod tests {
         }
 
         impl View for InputView {
-            fn build(&self, ctx: &mut BuildContext) -> Element {
+            fn build(&self, _ctx: &mut BuildContext) -> Element {
                 let received = self.received.clone();
-                let input = crate::widgets::input::TextInput::new()
+                crate::widgets::input::TextInput::new()
                     .on_change(move |val| {
                         let mut r = received.lock().unwrap();
                         *r = val;
                     })
-                    .build(ctx);
-                Element::Widget(Box::new(input))
+                    .into()
             }
         }
 

rusty/src/widgets/button.rs

@@ -193,20 +193,30 @@ mod tests {
     fn test_button_json_includes_id() {
         let mut store = HookStore::default();
         let mut ctx = BuildContext::new(&mut store, None);
-        let btn = Button::new("Test").build(&mut ctx);
-        let json = btn.to_json();
-        assert_eq!(json["id"], "w-0");
-        assert_eq!(json["type"], "button");
+        let mut element: Element = Button::new("Test").into();
+        element.assign_ids(&mut ctx);
+        if let Element::Widget(ref w) = element {
+            let json = w.to_json();
+            assert_eq!(json["id"], "w-0");
+            assert_eq!(json["type"], "button");
+        } else {
+            panic!("Expected Element::Widget");
+        }
     }
 
     #[test]
     fn test_button_build_registers_handler() {
         let mut store = HookStore::default();
         let mut ctx = BuildContext::new(&mut store, None);
-        let btn = Button::new("Click").on_click(|| {}).build(&mut ctx);
-        assert_eq!(btn.id, Some("w-0".to_string()));
-        assert!(json!({"hasOnClick": true})["hasOnClick"].as_bool().unwrap());
-        let json = btn.to_json();
-        assert_eq!(json["hasOnClick"], true);
+        let mut element: Element = Button::new("Click").on_click(|| {}).into();
+        element.assign_ids(&mut ctx);
+        if let Element::Widget(ref w) = element {
+            assert_eq!(w.get_id(), Some("w-0"));
+            assert!(json!({"hasOnClick": true})["hasOnClick"].as_bool().unwrap());
+            let json = w.to_json();
+            assert_eq!(json["hasOnClick"], true);
+        } else {
+            panic!("Expected Element::Widget");
+        }
     }
 }

rusty/src/widgets/input.rs

@@ -621,46 +621,72 @@ mod tests {
     fn test_text_input_json_includes_id() {
         let mut store = HookStore::default();
         let mut ctx = BuildContext::new(&mut store, None);
-        let input = TextInput::new().build(&mut ctx);
-        let json = input.to_json();
-        assert_eq!(json["id"], "w-0");
-        assert_eq!(json["type"], "text_input");
+        let mut element: Element = TextInput::new().into();
+        element.assign_ids(&mut ctx);
+        if let Element::Widget(ref w) = element {
+            let json = w.to_json();
+            assert_eq!(json["id"], "w-0");
+            assert_eq!(json["type"], "text_input");
+        } else {
+            panic!("Expected Element::Widget");
+        }
     }
 
     #[test]
     fn test_number_input_json_includes_id() {
         let mut store = HookStore::default();
         let mut ctx = BuildContext::new(&mut store, None);
-        let input = NumberInput::new().build(&mut ctx);
-        let json = input.to_json();
-        assert_eq!(json["id"], "w-0");
+        let mut element: Element = NumberInput::new().into();
+        element.assign_ids(&mut ctx);
+        if let Element::Widget(ref w) = element {
+            let json = w.to_json();
+            assert_eq!(json["id"], "w-0");
+        } else {
+            panic!("Expected Element::Widget");
+        }
     }
 
     #[test]
     fn test_select_json_includes_id() {
         let mut store = HookStore::default();
         let mut ctx = BuildContext::new(&mut store, None);
-        let select = Select::new(vec![]).build(&mut ctx);
-        let json = select.to_json();
-        assert_eq!(json["id"], "w-0");
+        let mut element: Element = Select::new(vec![]).into();
+        element.assign_ids(&mut ctx);
+        if let Element::Widget(ref w) = element {
+            let json = w.to_json();
+            assert_eq!(json["id"], "w-0");
+        } else {
+            panic!("Expected Element::Widget");
+        }
     }
 
     #[test]
     fn test_checkbox_json_includes_id() {
         let mut store = HookStore::default();
         let mut ctx = BuildContext::new(&mut store, None);
-        let cb = Checkbox::new(false).build(&mut ctx);
-        let json = cb.to_json();
-        assert_eq!(json["id"], "w-0");
+        let mut element: Element = Checkbox::new(false).into();
+        element.assign_ids(&mut ctx);
+        if let Element::Widget(ref w) = element {
+            let json = w.to_json();
+            assert_eq!(json["id"], "w-0");
+        } else {
+            panic!("Expected Element::Widget");
+        }
     }
 
     #[test]
     fn test_widget_ids_are_sequential() {
         let mut store = HookStore::default();
         let mut ctx = BuildContext::new(&mut store, None);
-        let input1 = TextInput::new().build(&mut ctx);
-        let input2 = TextInput::new().build(&mut ctx);
-        assert_eq!(input1.id, Some("w-0".to_string()));
-        assert_eq!(input2.id, Some("w-1".to_string()));
+        let mut el1: Element = TextInput::new().into();
+        let mut el2: Element = TextInput::new().into();
+        el1.assign_ids(&mut ctx);
+        el2.assign_ids(&mut ctx);
+        if let (Element::Widget(ref w1), Element::Widget(ref w2)) = (&el1, &el2) {
+            assert_eq!(w1.get_id(), Some("w-0"));
+            assert_eq!(w2.get_id(), Some("w-1"));
+        } else {
+            panic!("Expected Element::Widget");
+        }
     }
 }