@temporalio/core-bridge 1.15.0 → 1.16.1

package/sdk-core/crates/sdk-core/tests/integ_tests/workflow_tests/modify_wf_properties.rs

@@ -1,5 +1,7 @@
 use crate::common::{CoreWfStarter, build_fake_sdk};
-use temporalio_client::WorkflowClientTrait;
+use temporalio_client::{
+    NamespacedClient, WorkflowDescribeOptions, WorkflowExecutionInfo, WorkflowStartOptions,
+};
 use temporalio_common::{
     protos::{
         DEFAULT_WORKFLOW_TYPE, TestHistoryBuilder,
@@ -12,19 +14,28 @@ use temporalio_common::{
     },
     worker::WorkerTaskTypes,
 };
-use temporalio_sdk::{WfContext, WorkflowResult};
+use temporalio_macros::{workflow, workflow_methods};
+use temporalio_sdk::{WorkflowContext, WorkflowResult};
 use temporalio_sdk_core::test_help::MockPollCfg;
 use uuid::Uuid;
 
 static FIELD_A: &str = "cat_name";
 static FIELD_B: &str = "cute_level";
 
-async fn memo_upserter(ctx: WfContext) -> WorkflowResult<()> {
-    ctx.upsert_memo([
-        (FIELD_A.to_string(), "enchi".as_json_payload().unwrap()),
-        (FIELD_B.to_string(), 9001.as_json_payload().unwrap()),
-    ]);
-    Ok(().into())
+#[workflow]
+#[derive(Default)]
+struct MemoUpserter;
+
+#[workflow_methods]
+impl MemoUpserter {
+    #[run(name = "can_upsert_memo")]
+    async fn run(ctx: &mut WorkflowContext<Self>) -> WorkflowResult<()> {
+        ctx.upsert_memo([
+            (FIELD_A.to_string(), "enchi".as_json_payload().unwrap()),
+            (FIELD_B.to_string(), 9001.as_json_payload().unwrap()),
+        ]);
+        Ok(())
+    }
 }
 
 #[tokio::test]
@@ -32,27 +43,38 @@ async fn sends_modify_wf_props() {
     let wf_name = "can_upsert_memo";
     let wf_id = Uuid::new_v4();
     let mut starter = CoreWfStarter::new(wf_name);
-    starter.worker_config.task_types = WorkerTaskTypes::workflow_only();
+    starter.sdk_config.task_types = WorkerTaskTypes::workflow_only();
     let mut worker = starter.worker().await;
 
-    worker.register_wf(wf_name, memo_upserter);
+    worker.register_workflow::<MemoUpserter>();
+    let task_queue = starter.get_task_queue().to_owned();
     let run_id = worker
-        .submit_wf(wf_id.to_string(), wf_name, vec![], Default::default())
+        .submit_wf(
+            wf_name,
+            vec![],
+            WorkflowStartOptions::new(task_queue, wf_id.to_string()).build(),
+        )
         .await
         .unwrap();
     worker.run_until_done().await.unwrap();
 
-    let memo = starter
-        .get_client()
-        .await
-        .describe_workflow_execution(wf_id.to_string(), Some(run_id))
-        .await
-        .unwrap()
-        .workflow_execution_info
-        .unwrap()
-        .memo
-        .unwrap()
-        .fields;
+    let client = starter.get_client().await;
+    let memo = WorkflowExecutionInfo {
+        namespace: client.namespace(),
+        workflow_id: wf_id.to_string(),
+        run_id: Some(run_id),
+        first_execution_run_id: None,
+    }
+    .bind_untyped(client.clone())
+    .describe(WorkflowDescribeOptions::default())
+    .await
+    .unwrap()
+    .raw_description
+    .workflow_execution_info
+    .unwrap()
+    .memo
+    .unwrap()
+    .fields;
     let catname = memo.get(FIELD_A).unwrap();
     let cuteness = memo.get(FIELD_B).unwrap();
     for payload in [catname, cuteness] {
@@ -62,6 +84,34 @@ async fn sends_modify_wf_props() {
     assert_eq!(9001, usize::from_json_payload(cuteness).unwrap());
 }
 
+#[workflow]
+#[derive(Default)]
+struct ModifyPropsWf;
+
+#[workflow_methods]
+impl ModifyPropsWf {
+    #[run(name = DEFAULT_WORKFLOW_TYPE)]
+    async fn run(ctx: &mut WorkflowContext<Self>) -> WorkflowResult<()> {
+        ctx.upsert_memo([
+            (
+                String::from("foo"),
+                Payload {
+                    data: vec![0x01],
+                    ..Default::default()
+                },
+            ),
+            (
+                String::from("bar"),
+                Payload {
+                    data: vec![0x02],
+                    ..Default::default()
+                },
+            ),
+        ]);
+        Ok(())
+    }
+}
+
 #[tokio::test]
 async fn workflow_modify_props() {
     let mut t = TestHistoryBuilder::default();
@@ -94,24 +144,6 @@ async fn workflow_modify_props() {
     });
 
     let mut worker = build_fake_sdk(mock_cfg);
-    worker.register_wf(DEFAULT_WORKFLOW_TYPE, move |ctx: WfContext| async move {
-        ctx.upsert_memo([
-            (
-                String::from(k1),
-                Payload {
-                    data: vec![0x01],
-                    ..Default::default()
-                },
-            ),
-            (
-                String::from(k2),
-                Payload {
-                    data: vec![0x02],
-                    ..Default::default()
-                },
-            ),
-        ]);
-        Ok(().into())
-    });
+    worker.register_workflow::<ModifyPropsWf>();
     worker.run().await.unwrap();
 }