add dm alias to datamodel, update test cases for structural

hofstadter-io · Sep 9, 2020 · 014f411 · 014f411
1 parent 57d6d6f
commit 014f411
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/.hof/shadow/Cli/cmd/hof/cmd/datamodel.go b/.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",

diff --git a/cmd/hof/cmd/datamodel.go b/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",

diff --git a/design/cli/cmds/datamodel.cue b/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
 

diff --git a/lib/structural/testdata/000_shared_examples.cue b/lib/structural/testdata/000_shared_examples.cue
@@ -1,3 +1,5 @@
+package testdata
+
 @examples(shared)
 #SharedExamples: {
 

diff --git a/lib/structural/testdata/merge_cases.cue b/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"}}
+		//}
+	//}
 }