Restructure project, rename orchestrator to runner, and embed json test data

Author: stringintech

README.md

@@ -15,25 +15,25 @@ The framework ensures that all language bindings (Go, Python, Rust, etc.) behave
 
 ```
 ┌─────────────┐         ┌──────────────────┐
-│ Orchestrator│────────▶│  Handler Binary  │
-│  (Go Test   │ stdin   │  (Go/Rust/etc)   │
-│   Runner)   │◀────────│                  │
+│ Test Runner │────────▶│  Handler Binary  │
+│  (Go CLI)   │ stdin   │  (Go/Rust/etc)   │
+│             │◀────────│                  │
 └─────────────┘ stdout  └──────────────────┘
        │                         │
        │                         │
        ▼                         ▼
   ┌─────────┐            ┌────────────────┐
   │ Test    │            │ Binding API    │
   │ Cases   │            └────────────────┘
-  │ (JSON)  │            
+  │ (JSON)  │
   └─────────┘
 ```
 
 **This repository contains:**
-1. [**Orchestrator**](./orchestrator): Spawns handler binary, sends test requests via stdin, validates responses from stdout
+1. [**Test Runner**](./cmd/runner/main.go): Spawns handler binary, sends test requests via stdin, validates responses from stdout
 2. [**Test Cases**](./testdata): JSON files defining requests and expected responses
 
 **Handler binaries** are not hosted in this repository. They must be implemented separately and should:
-- Implement the JSON protocol for communication with the orchestrator
+- Implement the JSON protocol for communication with the test runner
 - Call the binding API to execute operations
 - Pin to a specific version/tag of this test repository

orchestrator/main.go cmd/runner/main.goorchestrator/main.go renamed to cmd/runner/main.go

@@ -3,15 +3,16 @@ package main
 import (
 	"flag"
 	"fmt"
+	"io/fs"
 	"os"
-	"path/filepath"
 	"strings"
+
+	"github.com/stringintech/kernel-bindings-tests/runner"
+	"github.com/stringintech/kernel-bindings-tests/testdata"
 )
 
 func main() {
 	handlerPath := flag.String("handler", "", "Path to handler binary")
-	testDir := flag.String("testdir", "", "Directory containing test JSON files")
-	testFile := flag.String("testfile", "", "Single test file to run")
 	flag.Parse()
 
 	if *handlerPath == "" {
@@ -20,25 +21,13 @@ func main() {
 		os.Exit(1)
 	}
 
-	if *testDir == "" && *testFile == "" {
-		fmt.Fprintf(os.Stderr, "Error: either -testdir or -testfile must be specified\n")
-		flag.Usage()
+	// Collect embedded test files
+	testFiles, err := fs.Glob(testdata.FS, "*.json")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error finding test files: %v\n", err)
 		os.Exit(1)
 	}
 
-	// Collect test files
-	var testFiles []string
-	if *testFile != "" {
-		testFiles = []string{*testFile}
-	} else {
-		files, err := filepath.Glob(filepath.Join(*testDir, "*.json"))
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error finding test files: %v\n", err)
-			os.Exit(1)
-		}
-		testFiles = files
-	}
-
 	if len(testFiles) == 0 {
 		fmt.Fprintf(os.Stderr, "No test files found\n")
 		os.Exit(1)
@@ -50,25 +39,25 @@ func main() {
 	totalTests := 0
 
 	for _, testFile := range testFiles {
-		fmt.Printf("\n=== Running test suite: %s ===\n", filepath.Base(testFile))
+		fmt.Printf("\n=== Running test suite: %s ===\n", testFile)
 
-		// Load test suite
-		suite, err := LoadTestSuite(testFile)
+		// Load test suite from embedded FS
+		suite, err := runner.LoadTestSuiteFromFS(testdata.FS, testFile)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error loading test suite: %v\n", err)
 			continue
 		}
 
 		// Create test runner
-		runner, err := NewTestRunner(*handlerPath)
+		testRunner, err := runner.NewTestRunner(*handlerPath)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error creating test runner: %v\n", err)
 			continue
 		}
 
 		// Run suite
-		result := runner.RunTestSuite(*suite)
-		runner.Close()
+		result := testRunner.RunTestSuite(*suite)
+		testRunner.Close()
 
 		printResults(result)
 
@@ -90,7 +79,7 @@ func main() {
 	}
 }
 
-func printResults(result TestResult) {
+func printResults(result runner.TestResult) {
 	fmt.Printf("\nTest Suite: %s\n", result.SuiteName)
 	fmt.Printf("Total: %d, Passed: %d, Failed: %d\n\n", result.TotalTests, result.PassedTests, result.FailedTests)
 

go.mod

@@ -0,0 +1,3 @@
+module github.com/stringintech/kernel-bindings-tests
+
+go 1.23

orchestrator/.gitignore

@@ -1,11 +1,13 @@
-package main
+package runner
 
 import (
 	"bufio"
 	"bytes"
+	"embed"
 	"encoding/json"
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -261,3 +263,23 @@ func LoadTestSuite(filePath string) (*TestSuite, error) {
 
 	return &suite, nil
 }
+
+// LoadTestSuiteFromFS loads a test suite from an embedded filesystem
+func LoadTestSuiteFromFS(fsys embed.FS, filePath string) (*TestSuite, error) {
+	data, err := fs.ReadFile(fsys, filePath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read file: %w", err)
+	}
+
+	var suite TestSuite
+	if err := json.Unmarshal(data, &suite); err != nil {
+		return nil, fmt.Errorf("failed to parse JSON: %w", err)
+	}
+
+	// Set suite name from filename if not specified
+	if suite.Name == "" {
+		suite.Name = filepath.Base(filePath)
+	}
+
+	return &suite, nil
+}

orchestrator/go.mod

@@ -1,4 +1,4 @@
-package main
+package runner
 
 import (
 	"encoding/json"

orchestrator/runner.go runner/runner.goorchestrator/runner.go renamed to runner/runner.go

@@ -0,0 +1,6 @@
+package testdata
+
+import "embed"
+
+//go:embed *.json
+var FS embed.FS