Merge pull request #66 from hofstadter-io/structural-work

Prepare for Data Model work

.hof/shadow/Cli/cmd/hof/cmd/datamodel.go

@@ -16,6 +16,7 @@ var DatamodelCmd = &cobra.Command{
 
 	Aliases: []string{
 		"dmod",
+		"dm",
 	},
 
 	Short: "create, view, diff, calculate / migrate, and manage your data models",

cmd/hof/cmd/datamodel.go

@@ -16,6 +16,7 @@ var DatamodelCmd = &cobra.Command{
 
 	Aliases: []string{
 		"dmod",
+		"dm",
 	},
 
 	Short: "create, view, diff, calculate / migrate, and manage your data models",

design/cli/cmds/datamodel.cue

@@ -8,7 +8,7 @@ import (
 	TBD:   "α"
 	Name:  "datamodel"
 	Usage: "datamodel"
-	Aliases: ["dmod"]
+	Aliases: ["dmod", "dm"]
 	Short: "create, view, diff, calculate / migrate, and manage your data models"
 	Long:  Short
 

lib/cuetils/get.go

@@ -50,7 +50,8 @@ func GetByAttrKeys(val cue.Value, attr string, all, any []string) ([]KeyVal, err
 		hasattr := false
 		for _, A := range attrs {
 			// does it have an "@<attr>(...)"
-			if A.Name() ==  attr {
+			if A.Name() == attr {
+
 				vals := A.Vals()
 
 				// must match all

lib/structural/testdata/000_shared_examples.cue

@@ -1,3 +1,5 @@
+package testdata
+
 @examples(shared)
 #SharedExamples: {
 

lib/structural/testdata/merge_cases.cue

@@ -3,13 +3,30 @@ package testdata
 @cases(merge)
 #MergeCases: {
 	@group(simple)
-	simple: {
+	edge: {
 		t_0001: {
 			args: {
-				orig: #SharedExamples.A
-				merge: {a: "a", N: {x: "x"}}
+				orig: {a: "a"}
+				merge: {}
 			}
-			ex: {a: "a", b: "b", N: {x: "x", y: "y"}}
+			ex: {a: "a"}
+		}
+		t_0002: {
+			args: {
+				orig: {}
+				merge: {a: "a"}
+			}
+			ex: {a: "a"}
 		}
 	}
+	//@group(simple)
+	//simple: {
+		//t_0002: {
+			//args: {
+				//orig: #SharedExamples.A
+				//merge: {a: "a", N: {x: "x"}}
+			//}
+			//ex: {a: "a", b: "b", N: {x: "x", y: "y"}}
+		//}
+	//}
 }

lib/test/from.go

@@ -20,14 +20,14 @@ func RunTestFromArgsFlags(args []string, cmdflags flags.TestFlagpole) (error) {
 	}
 
 	// Get test suites from top level
-	suites, err := getValueTestSuites(crt.CueValue, "suites", cmdflags.Suite)
+	suites, err := getValueTestSuites(crt.CueValue, cmdflags.Suite)
 	if err != nil {
 		return err
 	}
 
 	// find tests in suites
 	for s, suite := range suites {
-		ts, err := getValueTestSuiteTesters(suite.Value, suite.Name, cmdflags.Tester)
+		ts, err := getValueTestSuiteTesters(suite.Value, cmdflags.Tester)
 		if err != nil {
 			return err
 		}

lib/test/run.go

@@ -14,6 +14,11 @@ func RunSuites(suites []Suite, verbose int) (TS Stats, err error) {
 
 	// loop over tests
 	for s, S := range suites {
+		// Short circuit for empty suites
+		if len(S.Tests) == 0 {
+			continue
+		}
+
 		// set start time
 		S.Stats.Start = time.Now()
 
@@ -25,8 +30,10 @@ func RunSuites(suites []Suite, verbose int) (TS Stats, err error) {
 				S.Errors = append(S.Errors, err)
 			}
 
-			// set the element again because of Go copy
+			// update total time
 			S.Stats.Time += T.Stats.Time
+
+			// set the element because of Go value copy in the loop header
 			S.Tests[t] = T
 		}
 
@@ -48,7 +55,7 @@ func RunTest(T *Tester, verbose int) (err error) {
 	// stats work
 	T.Stats.Start = time.Now()
 
-	// TODO< find and possibly skip
+	// TODO find and possibly skip
 	skip := T.Value.Lookup("skip")
 	if skip.Exists() {
 		doskip, err := skip.Bool()

lib/test/test.go

@@ -29,8 +29,8 @@ type Suite struct {
 	Errors []error
 }
 
-func getValueTestSuites(val cue.Value, name string, labels []string) ([]Suite, error) {
-	vals, err := cuetils.GetByAttrKeys(val, "test", []string{"suite"}, labels)
+func getValueTestSuites(val cue.Value, labels []string) ([]Suite, error) {
+	vals, err := cuetils.GetByAttrKeys(val, "test", append(labels, "suite"), nil)
 	suites := []Suite{}
 	for _, v := range vals {
 		suites = append(suites, Suite{Name: v.Key, Value: v.Val})
@@ -59,7 +59,7 @@ type Tester struct {
 	Errors []error
 }
 
-func getValueTestSuiteTesters(val cue.Value, name string, labels []string) ([]Tester, error) {
+func getValueTestSuiteTesters(val cue.Value, labels []string) ([]Tester, error) {
 	vals, err := cuetils.GetByAttrKeys(val, "test", labels, []string{})
 	testers := []Tester{}
 	for _, v := range vals {

test.cue

@@ -35,11 +35,6 @@ import "strings"
 	...
 }
 
-#GoExecTest: #GoBaseTest & {
-	command: string | *"go test -cover ./"
-	...
-}
-
 //
 ////// Actual test configuration
 //
@@ -81,12 +76,10 @@ hls: {
 
 	script: #GoBashTest @test(bash,test,script)
 	script: {
-		skip: true
 		dir: "script"
 	}
 	scriptC: #GoBashCover @test(bash,cover,script)
 	scriptC: {
-		skip: true
 		dir: "script"
 	}
 }
@@ -105,12 +98,10 @@ lib: {
 
 	st: #GoBashTest @test(bash,test,st)
 	st: {
-		skip: true
 		dir: "lib/structural"
 	}
 	stC: #GoBashCover @test(bash,cover,st)
 	stC: {
-		skip: true
 		dir: "lib/structural"
 	}