Wire up main test properly

Signed-off-by: James Hamlin <jfhamlin@gmail.com>

Author: jfhamlin

pkg/codegen/codegen_test.go

@@ -1,4 +1,4 @@
-package codegen
+package codegen_test
 
 import (
 	"bytes"
@@ -12,6 +12,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/glojurelang/glojure/pkg/codegen"
 	"github.com/glojurelang/glojure/pkg/glj"
 	"github.com/glojurelang/glojure/pkg/lang"
 	"github.com/glojurelang/glojure/pkg/reader"
@@ -20,97 +21,6 @@ import (
 
 var updateGolden = flag.Bool("update", false, "update golden files")
 
-const testHarnessCode = `package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	
-	_ "github.com/glojurelang/glojure/pkg/codegen/testdata/codegen/test"
-	"github.com/glojurelang/glojure/pkg/lang"
-)
-
-func main() {
-	// Find all .glj files in testdata directory
-	// Get the testdata path relative to GOPATH or module root
-	testdataDir := os.Args[1]
-	var namespaces []string
-	
-	err := filepath.Walk(testdataDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if strings.HasSuffix(path, ".glj") {
-			// Read first line to get namespace
-			content, err := ioutil.ReadFile(path)
-			if err != nil {
-				return err
-			}
-			lines := strings.Split(string(content), "\n")
-			if len(lines) > 0 && strings.HasPrefix(lines[0], "(ns ") {
-				// Extract namespace name
-				nsLine := lines[0]
-				nsLine = strings.TrimPrefix(nsLine, "(ns ")
-				nsLine = strings.TrimSuffix(nsLine, ")")
-				parts := strings.Fields(nsLine)
-				if len(parts) > 0 {
-					namespaces = append(namespaces, parts[0])
-				}
-			}
-		}
-		return nil
-	})
-	if err != nil {
-		fmt.Printf("Error walking testdata: %v\n", err)
-		os.Exit(1)
-	}
-
-	failed := false
-	for _, nsName := range namespaces {
-		ns := lang.FindNamespace(lang.NewSymbol(nsName))
-		if ns == nil {
-			fmt.Printf("SKIP: namespace %s not found\n", nsName)
-			continue
-		}
-
-		mainVar := ns.FindInternedVar(lang.NewSymbol("-main"))
-		if mainVar == nil {
-			fmt.Printf("SKIP: %s/-main not found\n", nsName)
-			continue
-		}
-
-		// Check if -main has :expected-output metadata
-		meta := mainVar.Meta()
-		if meta == nil {
-			fmt.Printf("SKIP: %s/-main has no metadata\n", nsName)
-			continue
-		}
-
-		expected := meta.ValAt(lang.NewKeyword("expected-output"))
-		if expected == nil {
-			fmt.Printf("SKIP: %s/-main has no :expected-output\n", nsName)
-			continue
-		}
-
-		// Run -main and check the result
-		result := mainVar.Invoke()
-		if !lang.Equals(result, expected) {
-			fmt.Printf("FAIL: %s/-main returned %v, expected %v\n", nsName, result, expected)
-			failed = true
-		} else {
-			fmt.Printf("PASS: %s/-main\n", nsName)
-		}
-	}
-
-	if failed {
-		os.Exit(1)
-	}
-}
-`
-
 func TestCodegen(t *testing.T) {
 	var testFiles []string
 	err := filepath.Walk("testdata", func(path string, info os.FileInfo, err error) error {
@@ -151,7 +61,7 @@ func TestCodegen(t *testing.T) {
 
 			// Generate code for the namespace
 			var buf bytes.Buffer
-			gen := New(&buf)
+			gen := codegen.New(&buf)
 			if err := gen.Generate(ns); err != nil {
 				t.Fatalf("failed to generate code: %v", err)
 			}
@@ -248,35 +158,3 @@ func testMainFunction(t *testing.T, ns *lang.Namespace) {
 		t.Errorf("-main returned %v, expected %v", result, expectedOutput)
 	}
 }
-
-// TestGeneratedCode compiles and runs the generated code to verify behavior
-func TestGeneratedCode(t *testing.T) {
-	// Write the test harness in a temporary directory
-	tmpDir, err := ioutil.TempDir("", "glojure_test_harness")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	harnessPath := filepath.Join(tmpDir, "harness_main.go")
-	if err := ioutil.WriteFile(harnessPath, []byte(testHarnessCode), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	// Get absolute path to testdata directory
-	testdataPath, err := filepath.Abs("testdata")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Compile and run the test harness
-	cmd := exec.Command("go", "run", harnessPath, testdataPath)
-	cmd.Dir = "."
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("Test harness failed: %v\nOutput:\n%s", err, output)
-	}
-
-	// Print the output for visibility
-	t.Logf("Test harness output:\n%s", output)
-}

pkg/codegen/codegengotest/codegengo_test.go

@@ -0,0 +1,84 @@
+package codegentest
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	_ "github.com/glojurelang/glojure/pkg/codegen/testdata/codegen/test"
+	"github.com/glojurelang/glojure/pkg/lang"
+)
+
+// TestMain is the entry point for running tests. We use it to ensure
+// that this test runs in a separate process.
+func TestMain(m *testing.M) {
+	os.Exit(m.Run())
+}
+
+func TestGeneratedGo(t *testing.T) {
+	// Find all .glj files in testdata directory
+	testdataDir := "../testdata"
+	var namespaces []string
+
+	err := filepath.Walk(testdataDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if strings.HasSuffix(path, ".glj") {
+			// Read first line to get namespace
+			content, err := ioutil.ReadFile(path)
+			if err != nil {
+				return err
+			}
+			lines := strings.Split(string(content), "\n")
+			if len(lines) > 0 && strings.HasPrefix(lines[0], "(ns ") {
+				// Extract namespace name
+				nsLine := lines[0]
+				nsLine = strings.TrimPrefix(nsLine, "(ns ")
+				nsLine = strings.TrimSuffix(nsLine, ")")
+				parts := strings.Fields(nsLine)
+				if len(parts) > 0 {
+					namespaces = append(namespaces, parts[0])
+				}
+			}
+		}
+		return nil
+	})
+	if err != nil {
+		t.Fatalf("Error walking testdata: %v", err)
+	}
+
+	for _, nsName := range namespaces {
+		nsName := nsName // Capture range variable
+		t.Run(nsName, func(t *testing.T) {
+			ns := lang.FindNamespace(lang.NewSymbol(nsName))
+			if ns == nil {
+				t.Fatalf("namespace %s not found", nsName)
+			}
+
+			mainVar := ns.FindInternedVar(lang.NewSymbol("-main"))
+			if mainVar == nil {
+				t.Skip()
+			}
+
+			// Check if -main has :expected-output metadata
+			meta := mainVar.Meta()
+			if meta == nil {
+				t.Fatalf("metadata for %s/-main is nil", nsName)
+			}
+
+			expected := meta.ValAt(lang.NewKeyword("expected-output"))
+			if expected == nil {
+				t.Fatalf("no :expected-output metadata for %s/-main", nsName)
+			}
+
+			// Run -main and check the result
+			result := mainVar.Invoke()
+			if !lang.Equals(result, expected) {
+				t.Errorf("%s/-main returned %v, expected %v", nsName, result, expected)
+			}
+		})
+	}
+}