oracle/testdata: avoid sort.Sort so that my $GOROOT doesn't appear in output

Sorry for the oversight.

Change-Id: Ibb686dbee996b5223bd223fdd3afaab243a7a3ee
Reviewed-on: https://go-review.googlesource.com/7501
Reviewed-by: Robert Griesemer <gri@golang.org>
This commit is contained in:
Alan Donovan 2015-03-12 13:23:14 -04:00
parent 8239116d59
commit bf80246757
8 changed files with 66 additions and 55 deletions

View File

@ -12,3 +12,9 @@ func Func() {
const Const = 3 const Const = 3
var Var = 0 var Var = 0
type Sorter interface {
Len() int
Less(i, j int) bool
Swap(i, j int)
}

View File

@ -5,7 +5,6 @@ package main
// See implements-methods.golden for expected query results. // See implements-methods.golden for expected query results.
import _ "lib" import _ "lib"
import _ "sort"
func main() { func main() {
} }

View File

@ -4,42 +4,42 @@
"implements": { "implements": {
"type": { "type": {
"name": "main.F", "name": "main.F",
"pos": "testdata/src/main/implements-methods-json.go:13:6", "pos": "testdata/src/main/implements-methods-json.go:12:6",
"kind": "interface" "kind": "interface"
}, },
"to": [ "to": [
{ {
"name": "*main.C", "name": "*main.C",
"pos": "testdata/src/main/implements-methods-json.go:22:6", "pos": "testdata/src/main/implements-methods-json.go:21:6",
"kind": "pointer" "kind": "pointer"
}, },
{ {
"name": "main.D", "name": "main.D",
"pos": "testdata/src/main/implements-methods-json.go:23:6", "pos": "testdata/src/main/implements-methods-json.go:22:6",
"kind": "struct" "kind": "struct"
}, },
{ {
"name": "main.FG", "name": "main.FG",
"pos": "testdata/src/main/implements-methods-json.go:17:6", "pos": "testdata/src/main/implements-methods-json.go:16:6",
"kind": "interface" "kind": "interface"
} }
], ],
"method": { "method": {
"name": "func (F).f()", "name": "func (F).f()",
"pos": "testdata/src/main/implements-methods-json.go:14:2" "pos": "testdata/src/main/implements-methods-json.go:13:2"
}, },
"to_method": [ "to_method": [
{ {
"name": "method (*C) f()", "name": "method (*C) f()",
"pos": "testdata/src/main/implements-methods-json.go:25:13" "pos": "testdata/src/main/implements-methods-json.go:24:13"
}, },
{ {
"name": "method (D) f()", "name": "method (D) f()",
"pos": "testdata/src/main/implements-methods-json.go:26:12" "pos": "testdata/src/main/implements-methods-json.go:25:12"
}, },
{ {
"name": "method (FG) f()", "name": "method (FG) f()",
"pos": "testdata/src/main/implements-methods-json.go:18:2" "pos": "testdata/src/main/implements-methods-json.go:17:2"
} }
] ]
} }
@ -49,37 +49,37 @@
"implements": { "implements": {
"type": { "type": {
"name": "main.FG", "name": "main.FG",
"pos": "testdata/src/main/implements-methods-json.go:17:6", "pos": "testdata/src/main/implements-methods-json.go:16:6",
"kind": "interface" "kind": "interface"
}, },
"to": [ "to": [
{ {
"name": "*main.D", "name": "*main.D",
"pos": "testdata/src/main/implements-methods-json.go:23:6", "pos": "testdata/src/main/implements-methods-json.go:22:6",
"kind": "pointer" "kind": "pointer"
} }
], ],
"from": [ "from": [
{ {
"name": "main.F", "name": "main.F",
"pos": "testdata/src/main/implements-methods-json.go:13:6", "pos": "testdata/src/main/implements-methods-json.go:12:6",
"kind": "interface" "kind": "interface"
} }
], ],
"method": { "method": {
"name": "func (FG).f()", "name": "func (FG).f()",
"pos": "testdata/src/main/implements-methods-json.go:18:2" "pos": "testdata/src/main/implements-methods-json.go:17:2"
}, },
"to_method": [ "to_method": [
{ {
"name": "method (*D) f()", "name": "method (*D) f()",
"pos": "testdata/src/main/implements-methods-json.go:26:12" "pos": "testdata/src/main/implements-methods-json.go:25:12"
} }
], ],
"from_method": [ "from_method": [
{ {
"name": "method (F) f()", "name": "method (F) f()",
"pos": "testdata/src/main/implements-methods-json.go:14:2" "pos": "testdata/src/main/implements-methods-json.go:13:2"
} }
] ]
} }
@ -89,31 +89,31 @@
"implements": { "implements": {
"type": { "type": {
"name": "main.FG", "name": "main.FG",
"pos": "testdata/src/main/implements-methods-json.go:17:6", "pos": "testdata/src/main/implements-methods-json.go:16:6",
"kind": "interface" "kind": "interface"
}, },
"to": [ "to": [
{ {
"name": "*main.D", "name": "*main.D",
"pos": "testdata/src/main/implements-methods-json.go:23:6", "pos": "testdata/src/main/implements-methods-json.go:22:6",
"kind": "pointer" "kind": "pointer"
} }
], ],
"from": [ "from": [
{ {
"name": "main.F", "name": "main.F",
"pos": "testdata/src/main/implements-methods-json.go:13:6", "pos": "testdata/src/main/implements-methods-json.go:12:6",
"kind": "interface" "kind": "interface"
} }
], ],
"method": { "method": {
"name": "func (FG).g() []int", "name": "func (FG).g() []int",
"pos": "testdata/src/main/implements-methods-json.go:19:2" "pos": "testdata/src/main/implements-methods-json.go:18:2"
}, },
"to_method": [ "to_method": [
{ {
"name": "method (*D) g() []int", "name": "method (*D) g() []int",
"pos": "testdata/src/main/implements-methods-json.go:28:13" "pos": "testdata/src/main/implements-methods-json.go:27:13"
} }
], ],
"from_method": [ "from_method": [
@ -129,24 +129,24 @@
"implements": { "implements": {
"type": { "type": {
"name": "*main.C", "name": "*main.C",
"pos": "testdata/src/main/implements-methods-json.go:22:6", "pos": "testdata/src/main/implements-methods-json.go:21:6",
"kind": "pointer" "kind": "pointer"
}, },
"from": [ "from": [
{ {
"name": "main.F", "name": "main.F",
"pos": "testdata/src/main/implements-methods-json.go:13:6", "pos": "testdata/src/main/implements-methods-json.go:12:6",
"kind": "interface" "kind": "interface"
} }
], ],
"method": { "method": {
"name": "func (*C).f()", "name": "func (*C).f()",
"pos": "testdata/src/main/implements-methods-json.go:25:13" "pos": "testdata/src/main/implements-methods-json.go:24:13"
}, },
"from_method": [ "from_method": [
{ {
"name": "method (F) f()", "name": "method (F) f()",
"pos": "testdata/src/main/implements-methods-json.go:14:2" "pos": "testdata/src/main/implements-methods-json.go:13:2"
} }
] ]
} }
@ -156,37 +156,37 @@
"implements": { "implements": {
"type": { "type": {
"name": "main.D", "name": "main.D",
"pos": "testdata/src/main/implements-methods-json.go:23:6", "pos": "testdata/src/main/implements-methods-json.go:22:6",
"kind": "struct" "kind": "struct"
}, },
"from": [ "from": [
{ {
"name": "main.F", "name": "main.F",
"pos": "testdata/src/main/implements-methods-json.go:13:6", "pos": "testdata/src/main/implements-methods-json.go:12:6",
"kind": "interface" "kind": "interface"
} }
], ],
"fromptr": [ "fromptr": [
{ {
"name": "main.FG", "name": "main.FG",
"pos": "testdata/src/main/implements-methods-json.go:17:6", "pos": "testdata/src/main/implements-methods-json.go:16:6",
"kind": "interface" "kind": "interface"
} }
], ],
"method": { "method": {
"name": "func (D).f()", "name": "func (D).f()",
"pos": "testdata/src/main/implements-methods-json.go:26:12" "pos": "testdata/src/main/implements-methods-json.go:25:12"
}, },
"from_method": [ "from_method": [
{ {
"name": "method (F) f()", "name": "method (F) f()",
"pos": "testdata/src/main/implements-methods-json.go:14:2" "pos": "testdata/src/main/implements-methods-json.go:13:2"
} }
], ],
"fromptr_method": [ "fromptr_method": [
{ {
"name": "method (FG) f()", "name": "method (FG) f()",
"pos": "testdata/src/main/implements-methods-json.go:18:2" "pos": "testdata/src/main/implements-methods-json.go:17:2"
} }
] ]
} }
@ -196,24 +196,24 @@
"implements": { "implements": {
"type": { "type": {
"name": "*main.D", "name": "*main.D",
"pos": "testdata/src/main/implements-methods-json.go:23:6", "pos": "testdata/src/main/implements-methods-json.go:22:6",
"kind": "pointer" "kind": "pointer"
}, },
"from": [ "from": [
{ {
"name": "main.F", "name": "main.F",
"pos": "testdata/src/main/implements-methods-json.go:13:6", "pos": "testdata/src/main/implements-methods-json.go:12:6",
"kind": "interface" "kind": "interface"
}, },
{ {
"name": "main.FG", "name": "main.FG",
"pos": "testdata/src/main/implements-methods-json.go:17:6", "pos": "testdata/src/main/implements-methods-json.go:16:6",
"kind": "interface" "kind": "interface"
} }
], ],
"method": { "method": {
"name": "func (*D).g() []int", "name": "func (*D).g() []int",
"pos": "testdata/src/main/implements-methods-json.go:28:13" "pos": "testdata/src/main/implements-methods-json.go:27:13"
}, },
"from_method": [ "from_method": [
{ {
@ -222,7 +222,7 @@
}, },
{ {
"name": "method (FG) g() []int", "name": "method (FG) g() []int",
"pos": "testdata/src/main/implements-methods-json.go:19:2" "pos": "testdata/src/main/implements-methods-json.go:18:2"
} }
] ]
} }
@ -232,24 +232,24 @@
"implements": { "implements": {
"type": { "type": {
"name": "main.sorter", "name": "main.sorter",
"pos": "testdata/src/main/implements-methods-json.go:30:6", "pos": "testdata/src/main/implements-methods-json.go:29:6",
"kind": "slice" "kind": "slice"
}, },
"from": [ "from": [
{ {
"name": "sort.Interface", "name": "lib.Sorter",
"pos": "/usr/local/google/home/adonovan/go/src/sort/sort.go:12:6", "pos": "testdata/src/lib/lib.go:16:6",
"kind": "interface" "kind": "interface"
} }
], ],
"method": { "method": {
"name": "func (sorter).Len() int", "name": "func (sorter).Len() int",
"pos": "testdata/src/main/implements-methods-json.go:32:15" "pos": "testdata/src/main/implements-methods-json.go:31:15"
}, },
"from_method": [ "from_method": [
{ {
"name": "method (sort.Interface) Len() int", "name": "method (lib.Sorter) Len() int",
"pos": "/usr/local/google/home/adonovan/go/src/sort/sort.go:14:2" "pos": "testdata/src/lib/lib.go:17:2"
} }
] ]
} }
@ -259,7 +259,7 @@
"implements": { "implements": {
"type": { "type": {
"name": "main.I", "name": "main.I",
"pos": "testdata/src/main/implements-methods-json.go:36:6", "pos": "testdata/src/main/implements-methods-json.go:35:6",
"kind": "interface" "kind": "interface"
}, },
"to": [ "to": [
@ -271,7 +271,7 @@
], ],
"method": { "method": {
"name": "func (I).Method(*int) *int", "name": "func (I).Method(*int) *int",
"pos": "testdata/src/main/implements-methods-json.go:37:2" "pos": "testdata/src/main/implements-methods-json.go:36:2"
}, },
"to_method": [ "to_method": [
{ {

View File

@ -5,7 +5,6 @@ package main
// See implements-methods.golden for expected query results. // See implements-methods.golden for expected query results.
import _ "lib" import _ "lib"
import _ "sort"
func main() { func main() {
} }

View File

@ -29,7 +29,7 @@ concrete method func (*D).g() []int
-------- @implements Len -------- -------- @implements Len --------
concrete method func (sorter).Len() int concrete method func (sorter).Len() int
implements method (sort.Interface).Len implements method (lib.Sorter).Len
-------- @implements I.Method -------- -------- @implements I.Method --------
abstract method func (I).Method(*int) *int abstract method func (I).Method(*int) *int

View File

@ -5,7 +5,6 @@ package main
// See implements.golden for expected query results. // See implements.golden for expected query results.
import _ "lib" import _ "lib"
import _ "sort"
func main() { func main() {
} }

View File

@ -36,7 +36,7 @@ pointer type *main.D
-------- @implements sorter -------- -------- @implements sorter --------
slice type main.sorter slice type main.sorter
implements sort.Interface implements lib.Sorter
-------- @implements I -------- -------- @implements I --------
interface type main.I interface type main.I

View File

@ -9,6 +9,10 @@ import of package "hash/fnv"
import of package "lib" import of package "lib"
const Const untyped int = 3 const Const untyped int = 3
func Func func() func Func func()
type Sorter interface{...}
method (Sorter) Len() int
method (Sorter) Less(i int, j int) bool
method (Sorter) Swap(i int, j int)
type Type int type Type int
method (Type) Method(x *int) *int method (Type) Method(x *int) *int
var Var int var Var int
@ -43,6 +47,10 @@ this *int may point to these objects:
reference to package "lib" reference to package "lib"
const Const untyped int = 3 const Const untyped int = 3
func Func func() func Func func()
type Sorter interface{...}
method (Sorter) Len() int
method (Sorter) Less(i int, j int) bool
method (Sorter) Swap(i int, j int)
type Type int type Type int
method (Type) Method(x *int) *int method (Type) Method(x *int) *int
var Var int var Var int