From bdd8fd7e0d3b285acd019a1b591446b686860abe Mon Sep 17 00:00:00 2001 From: Stuart Axelbrooke Date: Sun, 29 Jun 2025 20:24:44 -0700 Subject: [PATCH] Fix tests --- .../basic_graph/UnifiedGenerateNumber.java | 14 ++++++------ examples/basic_graph/UnifiedSum.java | 3 +-- examples/basic_job/BUILD.bazel | 22 ++----------------- examples/basic_job/test/test.sh | 2 +- examples/basic_job/unified_job.sh | 2 +- examples/podcast_reviews/unified_job.py | 14 +++++------- 6 files changed, 18 insertions(+), 39 deletions(-) diff --git a/examples/basic_graph/UnifiedGenerateNumber.java b/examples/basic_graph/UnifiedGenerateNumber.java index 7b7cb13..c48af9c 100644 --- a/examples/basic_graph/UnifiedGenerateNumber.java +++ b/examples/basic_graph/UnifiedGenerateNumber.java @@ -60,8 +60,7 @@ public class UnifiedGenerateNumber { config.set("args", mapper.createArrayNode().add("will").add("generate").add(partitionRef)); config.set("env", mapper.createObjectNode().put("PARTITION_REF", partitionRef)); - var response = mapper.createObjectNode(); - response.set("configs", mapper.createArrayNode().add(config)); + var response = mapper.createArrayNode().add(config); System.out.println(mapper.writeValueAsString(response)); } catch (Exception e) { @@ -90,11 +89,12 @@ public class UnifiedGenerateNumber { Random random = new Random(seed); int randomNumber = random.nextInt(100) + 1; - // Write to file - File outputDir = new File(BASE_PATH); - outputDir.mkdirs(); - - File outputFile = new File(outputDir, partitionRef + ".txt"); + // Write to file - partitionRef is the full path + File outputFile = new File(partitionRef + ".txt"); + File outputDir = outputFile.getParentFile(); + if (outputDir != null) { + outputDir.mkdirs(); + } try (FileWriter writer = new FileWriter(outputFile)) { writer.write(String.valueOf(randomNumber)); } diff --git a/examples/basic_graph/UnifiedSum.java b/examples/basic_graph/UnifiedSum.java index b950edc..3e4ccb3 100644 --- a/examples/basic_graph/UnifiedSum.java +++ b/examples/basic_graph/UnifiedSum.java @@ -76,8 +76,7 @@ public class UnifiedSum { config.set("args", argsArray); config.set("env", mapper.createObjectNode().put("OUTPUT_REF", partitionRef)); - var response = mapper.createObjectNode(); - response.set("configs", mapper.createArrayNode().add(config)); + var response = mapper.createArrayNode().add(config); System.out.println(mapper.writeValueAsString(response)); } catch (Exception e) { diff --git a/examples/basic_job/BUILD.bazel b/examples/basic_job/BUILD.bazel index 68798f4..430b632 100644 --- a/examples/basic_job/BUILD.bazel +++ b/examples/basic_job/BUILD.bazel @@ -2,29 +2,11 @@ load("@databuild//databuild:rules.bzl", "databuild_job") databuild_job( name = "test_job", - configure = ":test_job_configure", - execute = ":test_job_execute", + binary = ":test_job_binary", visibility = ["//visibility:public"], ) sh_binary( - name = "test_job_configure", - srcs = ["configure.sh"], -) - -sh_binary( - name = "test_job_execute", - srcs = ["execute.sh"], -) - -# New unified approach -databuild_job( - name = "unified_test_job", - binary = ":unified_job_binary", - visibility = ["//visibility:public"], -) - -sh_binary( - name = "unified_job_binary", + name = "test_job_binary", srcs = ["unified_job.sh"], ) diff --git a/examples/basic_job/test/test.sh b/examples/basic_job/test/test.sh index c90726f..7b98166 100755 --- a/examples/basic_job/test/test.sh +++ b/examples/basic_job/test/test.sh @@ -2,4 +2,4 @@ test_job.cfg nice -test_job.cfg cool | jq -c ".configs[0]" | test_job.exec +test_job.cfg cool | jq -c ".[0]" | test_job.exec diff --git a/examples/basic_job/unified_job.sh b/examples/basic_job/unified_job.sh index 8726246..234760e 100755 --- a/examples/basic_job/unified_job.sh +++ b/examples/basic_job/unified_job.sh @@ -6,7 +6,7 @@ case "${1:-}" in "config") # Configuration mode - output job config JSON partition_ref="${2:-}" - echo "{\"configs\":[{\"outputs\":[\"${partition_ref}\"],\"inputs\":[],\"args\":[\"will\", \"build\", \"${partition_ref}\"],\"env\":{\"foo\":\"bar\"}}]}" + echo "[{\"outputs\":[\"${partition_ref}\"],\"inputs\":[],\"args\":[\"will\", \"build\", \"${partition_ref}\"],\"env\":{\"foo\":\"bar\"}}]" ;; "exec") # Execution mode - run the job diff --git a/examples/podcast_reviews/unified_job.py b/examples/podcast_reviews/unified_job.py index db82e35..86272ae 100644 --- a/examples/podcast_reviews/unified_job.py +++ b/examples/podcast_reviews/unified_job.py @@ -26,14 +26,12 @@ def handle_config(args): partition_ref = args[0] - config = { - "configs": [{ - "outputs": [partition_ref], - "inputs": [], - "args": ["Hello", "gorgeous", partition_ref], - "env": {"PARTITION_REF": partition_ref} - }] - } + config = [{ + "outputs": [partition_ref], + "inputs": [], + "args": ["Hello", "gorgeous", partition_ref], + "env": {"PARTITION_REF": partition_ref} + }] print(json.dumps(config))