chore: port tests to new system

Signed-off-by: Manfred Touron <[email protected]>

Makefile

@@ -1,6 +1,6 @@
 all: gnoland gnokey goscan logos
 
-.PHONY: logos goscan gnoland gnokey gnofaucet logos reset test test1 test2 testrealm testrealm1 testrealm2 testpackages testpkgs
+.PHONY: logos goscan gnoland gnokey gnofaucet logos reset
 
 reset:
 	rm -rf testdir
@@ -19,7 +19,7 @@ gnokey:
 	echo "Building gnokey"
 	go build -o build/gnokey ./cmd/gnokey
 
-install_gnokey: gnokey
+install_gnokey:
 	echo "Installing gnokey"
 	go install ./cmd/gnokey
 
@@ -42,45 +42,34 @@ logos:
 clean:
 	rm -rf build
 
-test:
-	echo "Running tests"
-	go test
-	go test tests/*.go -v -test.short --timeout 20m
-
-test1:
-	echo "Running tests"
-	go test
-	go test tests/*.go -v -test.short -run "TestFiles1"
-
-test2:
-	echo "Running tests"
-	go test
-	go test tests/*.go -v -test.short -run "TestFiles2"
-
-testrealm:
-	echo "Running tests"
-	go test
-	go test tests/*.go -v -run "TestFiles/^zrealm"
-
-testrealm1:
-	echo "Running tests"
-	go test
-	go test tests/*.go -v -run "TestFiles1/^zrealm"
-
-testrealm2:
-	echo "Running tests"
-	go test
-	go test tests/*.go -v -run "TestFiles2/^zrealm"
-
-testpackages:
-	echo "Running tests"
-	go test tests/*.go -v -run "TestPackages"
-
-testpkgs:
+# Test suite
+.PHONY: test test.go test.gno test.files1 test.files2 test.realm test.packages
+test: test.gno test.go
+	@echo "Full test suite finished."
+
+test.gno: test.files1 test.files2 test.realm test.packages
+	go test tests/*.go -v -run "TestFileStr"
+	go test tests/*.go -v -run "TestSelectors"
+
+test.go:
+	go test . -v
 	# -p 1 shows test failures as they come
 	# maybe another way to do this?
-	go test ./pkgs/... -p 1 -count 1
+	go test ./pkgs/... -v -p 1
+
+test.files1:
+	go test tests/*.go -v -test.short -run "TestFiles1/" --timeout 20m
+
+test.files2:
+	go test tests/*.go -v -test.short -run "TestFiles2/" --timeout 20m
+
+test.realm:
+	go test tests/*.go -v -run "TestFiles/^zrealm" --timeout 20m
+
+test.packages:
+	go test tests/*.go -v -run "TestPackages" --timeout 20m
 
+# Code gen
 stringer:
 	stringer -type=Op
 

pkgs/sdk/vm/keeper_test.go

@@ -25,7 +25,7 @@ func TestVMKeeperOrigSend1(t *testing.T) {
 
 	// Create test package.
 	files := []*std.MemFile{
-		{"init.go", `
+		{"init.gno", `
 package test
 
 import "std"
@@ -70,7 +70,7 @@ func TestVMKeeperOrigSend2(t *testing.T) {
 
 	// Create test package.
 	files := []*std.MemFile{
-		{"init.go", `
+		{"init.gno", `
 package test
 
 import "std"
@@ -116,7 +116,7 @@ func TestVMKeeperOrigSend3(t *testing.T) {
 
 	// Create test package.
 	files := []*std.MemFile{
-		{"init.go", `
+		{"init.gno", `
 package test
 
 import "std"
@@ -161,7 +161,7 @@ func TestVMKeeperRealmSend1(t *testing.T) {
 
 	// Create test package.
 	files := []*std.MemFile{
-		{"init.go", `
+		{"init.gno", `
 package test
 
 import "std"
@@ -205,7 +205,7 @@ func TestVMKeeperRealmSend2(t *testing.T) {
 
 	// Create test package.
 	files := []*std.MemFile{
-		{"init.go", `
+		{"init.gno", `
 package test
 
 import "std"

tests/backup/assign15.gno

@@ -8,4 +8,4 @@ func main() {
 }
 
 // Error:
-// _test/assign15.go:5:26: cannot use type chan<- struct{} as type <-chan struct{} in assignment
+// _test/assign15.gno:5:26: cannot use type chan<- struct{} as type <-chan struct{} in assignment

tests/backup/op9.gno

@@ -8,4 +8,4 @@ func main() {
 }
 
 // Error:
-// _test/op9.go:7:8: invalid operation: operator > not defined on complex128
+// _test/op9.gno:7:8: invalid operation: operator > not defined on complex128

tests/backup/range9.gno

@@ -8,4 +8,4 @@ func main() {
 }
 
 // Error:
-// _test/range9.go:6:16: invalid operation: range c receive from send-only channel
+// _test/range9.gno:6:16: invalid operation: range c receive from send-only channel

tests/backup/redeclaration-global2.gno

@@ -11,4 +11,4 @@ func main() {
 }
 
 // Error:
-// ../_test/redeclaration-global2.go:5:2: time/redeclaration-global2.go redeclared in this block
+// ../_test/redeclaration-global2.gno:5:2: time/redeclaration-global2.gno redeclared in this block

tests/backup/redeclaration-global3.gno

@@ -12,4 +12,4 @@ func main() {
 }
 
 // Error:
-// ../_test/redeclaration-global3.go:7:5: time redeclared in this block
+// ../_test/redeclaration-global3.gno:7:5: time redeclared in this block

tests/backup/redeclaration-global4.gno

@@ -12,4 +12,4 @@ func main() {
 }
 
 // Error:
-// ../_test/redeclaration-global4.go:7:6: time redeclared in this block
+// ../_test/redeclaration-global4.gno:7:6: time redeclared in this block

tests/backup/redeclaration-global6.gno

@@ -14,4 +14,4 @@ func main() {
 }
 
 // Error:
-// ../_test/redeclaration-global6.go:7:1: time redeclared in this block
+// ../_test/redeclaration-global6.gno:7:1: time redeclared in this block

tests/backup/redeclaration-global7.gno

@@ -10,4 +10,4 @@ func main() {
 }
 
 // Error:
-// ../_test/redeclaration-global7.go:5:2: quux/redeclaration-global7.go redeclared as imported package name
+// ../_test/redeclaration-global7.gno:5:2: quux/redeclaration-global7.gno redeclared as imported package name

tests/backup/restricted3.gno

@@ -20,4 +20,4 @@ func main() {
 }
 
 // Output:
-// recover: test log logger: restricted.go:39: test log
+// recover: test log logger: restricted.gno:39: test log

tests/files/composite0.gno

@@ -6,7 +6,7 @@ var a = &[]*T{}
 
 // NOTE:
 // lowercase fields don't work with native funcs.
-// see tests/files/composite0b.go for gno println.
+// see tests/files/composite0b.gno for gno println.
 type T struct{ Name string }
 
 func main() {

tests/files/composite1.gno

@@ -6,7 +6,7 @@ var a = &[]*T{{}}
 
 // NOTE:
 // lowercase fields don't work with native funcs.
-// see tests/files/composite1b.go for gno println.
+// see tests/files/composite1b.gno for gno println.
 type T struct{ Name string }
 
 func main() {

tests/files/extern/timtadh/data-structures/tree/utils.gno

@@ -1,4 +1,4 @@
-// from https://raw.githubusercontent.com/timtadh/data-structures/master/tree/util.go
+// from https://raw.githubusercontent.com/timtadh/data-structures/master/tree/util.gno
 
 package tree
 

tests/files/extern/timtadh/data-structures/types/types.gno

@@ -1,4 +1,4 @@
-// from https://raw.githubusercontent.com/timtadh/data-structures/master/types/types.go
+// from https://raw.githubusercontent.com/timtadh/data-structures/master/types/types.gno
 
 package types
 

tests/files/redeclaration-global0.gno

@@ -5,10 +5,10 @@ type time int
 var time string
 
 func main() {
-	time = "hello"
-	println(time)
+  time = "hello"
+  println(time)
 }
 
 // Error:
-// files/redeclaration-global0.go:5:5: time redeclared in this block
-//	previous declaration at files/redeclaration-global0.go:3:6
+// files/redeclaration-global0.gno:5:5: time redeclared in this block
+//	previous declaration at files/redeclaration-global0.gno:3:6

tests/files/redeclaration-global1.gno

@@ -5,10 +5,10 @@ var time int
 type time string
 
 func main() {
-	var t time = "hello"
-	println(t)
+  var t time = "hello"
+  println(t)
 }
 
 // Error:
-// files/redeclaration-global1.go:5:6: time redeclared in this block
-//	previous declaration at files/redeclaration-global1.go:3:5
+// files/redeclaration-global1.gno:5:6: time redeclared in this block
+//	previous declaration at files/redeclaration-global1.gno:3:5

tests/files/redeclaration-global5.gno

@@ -3,14 +3,14 @@ package main
 var time int
 
 func time() string {
-	return "hello"
+  return "hello"
 }
 
 func main() {
-	t := time()
-	println(t)
+  t := time()
+  println(t)
 }
 
 // Error:
-// files/redeclaration-global5.go:5:6: time redeclared in this block
-//	previous declaration at files/redeclaration-global5.go:3:5
+// files/redeclaration-global5.gno:5:6: time redeclared in this block
+//	previous declaration at files/redeclaration-global5.gno:3:5

tests/files/redeclaration0.gno

@@ -1,15 +1,15 @@
 package main
 
 func main() {
-	type foo struct {
-		yolo string
-	}
+  type foo struct {
+    yolo string
+  }
 
-	var foo int
-	foo = 2
-	println(foo)
+  var foo int
+  foo = 2
+  println(foo)
 }
 
 // Error:
-// files/redeclaration0.go:8:6: foo redeclared in this block
-//	previous declaration at files/redeclaration0.go:4:7
+// files/redeclaration0.gno:8:7: foo redeclared in this block
+//	previous declaration at files/redeclaration0.gno:4:8

tests/files/redeclaration1.gno

@@ -1,12 +1,12 @@
 package main
 
 func main() {
-	var foo string
+  var foo string
 
-	var foo int
-	foo = 2
-	println(foo)
+  var foo int
+  foo = 2
+  println(foo)
 }
 
 // Error:
-// files/redeclaration1.go:6:6: foo redeclared in this block
+// files/redeclaration1.gno:6:7: foo redeclared in this block

tests/files/redeclaration2.gno

@@ -1,15 +1,15 @@
 package main
 
 func main() {
-	var foo struct {
-		yolo string
-	}
+  var foo struct {
+    yolo string
+  }
 
-	var foo int
-	foo = 2
-	println(foo)
+  var foo int
+  foo = 2
+  println(foo)
 }
 
 // Error:
-// files/redeclaration2.go:8:6: foo redeclared in this block
-//	previous declaration at files/redeclaration2.go:4:6
+// files/redeclaration2.gno:8:7: foo redeclared in this block
+//	previous declaration at files/redeclaration2.gno:4:7

tests/files/redeclaration3.gno

@@ -1,13 +1,13 @@
 package main
 
 func main() {
-	var foo int
-	foo = 2
+  var foo int
+  foo = 2
 
-	type foo struct{}
-	var bar foo
-	println(bar)
+  type foo struct{}
+  var bar foo
+  println(bar)
 }
 
 // Error:
-// files/redeclaration3.go:7:7: foo redeclared in this block
+// files/redeclaration3.gno:7:8: foo redeclared in this block

tests/files/redeclaration4.gno

@@ -1,14 +1,14 @@
 package main
 
 func main() {
-	var foo struct {
-		yolo string
-	}
+  var foo struct {
+    yolo string
+  }
 
-	type foo struct{}
-	var bar foo
-	println(bar)
+  type foo struct{}
+  var bar foo
+  println(bar)
 }
 
 // Error:
-// files/redeclaration4.go:8:7: foo redeclared in this block
+// files/redeclaration4.gno:8:8: foo redeclared in this block

tests/files/redeclaration5.gno

@@ -1,14 +1,14 @@
 package main
 
 func main() {
-	type foo struct {
-		yolo string
-	}
+  type foo struct {
+    yolo string
+  }
 
-	type foo struct{}
-	var bar foo
-	println(bar)
+  type foo struct{}
+  var bar foo
+  println(bar)
 }
 
 // Error:
-// files/redeclaration5.go:8:7: foo redeclared in this block
+// files/redeclaration5.gno:8:8: foo redeclared in this block