[WIP] js: tighten up internalize and externalize #618
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -467,7 +467,7 @@ func TestCallWithNull(t *testing.T) { | |
| func TestReflection(t *testing.T) { | ||
| o := js.Global.Call("eval", "({ answer: 42 })") | ||
| if reflect.ValueOf(o).Interface().(*js.Object) != o { | ||
| t.Fatal() | ||
|
There was a problem hiding this comment. AFAIK, There was a problem hiding this comment. Is it not possible to include a helpful error message in the There was a problem hiding this comment. To be honest I was being a little lazy here in just flipping the existing I'm sure we could add helpful messages to the There was a problem hiding this comment. It's usually easier to do these minor things as you're working in a relevant context than later. But this is completely up to you, and not critical for getting the PR into a mergeable state. |
||
| } | ||
|
|
||
| type S struct { | ||
|
|
@@ -477,18 +477,19 @@ func TestReflection(t *testing.T) { | |
|
|
||
| v := reflect.ValueOf(&s).Elem() | ||
| if v.Field(0).Interface().(*js.Object).Get("answer").Int() != 42 { | ||
| t.Fatal() | ||
| } | ||
| if v.Field(0).MethodByName("Get").Call([]reflect.Value{reflect.ValueOf("answer")})[0].Interface().(*js.Object).Int() != 42 { | ||
| t.Fatal() | ||
| } | ||
| v.Field(0).Set(reflect.ValueOf(js.Global.Call("eval", "({ answer: 100 })"))) | ||
| if s.Field.Get("answer").Int() != 100 { | ||
| t.Fatal() | ||
| } | ||
|
|
||
| expFmt := "{Field:[object Object]}" | ||
| if v := fmt.Sprintf("%+v", s); v != expFmt { | ||
| t.Fatalf("fmt out was: %q; expected %q", v, expFmt) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -620,3 +621,207 @@ func TestStructWithNonIdentifierJSTag(t *testing.T) { | |
| t.Errorf("value via js.Object.Get gave %q, want %q", got, want) | ||
| } | ||
| } | ||
|
|
||
| // Internalize is used as a helper type to test $internalize. A struct is used | ||
| // in order that all of the Go types can be verified (otherwise we are limited | ||
| // to the methods on *Object). Where methods on *Object exist they too will be | ||
| // tested | ||
| type Internalize struct { | ||
| *js.Object | ||
|
|
||
| string string `js:"string"` | ||
| bool bool `js:"bool"` | ||
| } | ||
|
|
||
| func TestInternalizeString(t *testing.T) { | ||
| fieldName := "string" | ||
| zero := "" | ||
|
|
||
| s := &Internalize{Object: js.Global.Get("Object").New()} | ||
|
There was a problem hiding this comment. Stylistic note: I wonder if a table-based test would make sense here? It may make the tests more readable, reduce the need for the There was a problem hiding this comment. You raise a good point. I half considered this myself, but postponed giving it much thought until we've confirmed we're actually testing the right stuff... at which point extracting to table tests should be relatively easy. The little thought I did give it however amount to the following: I'm not convinced we can actually use table tests. We need to address specific fields of the Therefore the one approach I have considered fairly seriously is code generating the tests. Because they do follow a formula that's for sure. But as I said, I haven't given this much time/though so would very much welcome any suggestions. There was a problem hiding this comment. @flimzy just pushed up a code-generated version of the tests which seems to work well. Let me know what you think. |
||
|
|
||
| // ************* | ||
| // undefined | ||
| // ************* | ||
| s.Object.Set(fieldName, jsundefined()) | ||
|
|
||
| // via struct field | ||
| if v := s.string; v != zero { | ||
| t.Fatalf("expected string field to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // via *js.Object.String() | ||
| if v := s.Object.Get(fieldName).String(); v != zero { | ||
| t.Fatalf("expected string field via *js.Object.String() to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // ************* | ||
| // null | ||
| // ************* | ||
| s.Object.Set(fieldName, jsnull()) | ||
|
|
||
| // via struct field | ||
| if v := s.string; v != zero { | ||
| t.Fatalf("expected string field to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // via *js.Object.String() | ||
| if v := s.Object.Get(fieldName).String(); v != zero { | ||
| t.Fatalf("expected string field via *js.Object.String() to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // ************* | ||
| // valid primitive string | ||
| // ************* | ||
| exp := "ok" | ||
| s.Object.Set(fieldName, jsval(`"`+exp+`"`)) | ||
|
|
||
| // via struct field | ||
| if v := s.string; v != exp { | ||
| t.Fatalf("expected string field to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // via *js.Object.String() | ||
| if v := s.Object.Get(fieldName).String(); v != exp { | ||
| t.Fatalf("expected string field via *js.Object.String() to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // ************* | ||
| // valid String object | ||
| // ************* | ||
| s.Object.Set(fieldName, jsval(`new String("`+exp+`")`)) | ||
|
|
||
| // via struct field | ||
| if v := s.string; v != exp { | ||
| t.Fatalf("expected string field to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // via *js.Object.String() | ||
| if v := s.Object.Get(fieldName).String(); v != exp { | ||
| t.Fatalf("expected string field via *js.Object.String() to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // ************* | ||
| // invalid | ||
| // ************* | ||
| s.Object.Set(fieldName, jsval("5")) | ||
|
|
||
| shouldRuntimePanic(t, "runtime error: tried to internalize non-string value of type number/Number", func() { | ||
| _ = s.string | ||
| }) | ||
|
|
||
| shouldRuntimePanic(t, "runtime error: tried to internalize non-string value of type number/Number", func() { | ||
| _ = s.Object.Get(fieldName).String() | ||
| }) | ||
| } | ||
|
|
||
| func TestInternalizeBool(t *testing.T) { | ||
| fieldName := "bool" | ||
| zero := false | ||
|
|
||
| s := &Internalize{Object: js.Global.Get("Object").New()} | ||
|
|
||
| // ************* | ||
| // undefined | ||
| // ************* | ||
| s.Object.Set(fieldName, jsundefined()) | ||
|
|
||
| // via struct field | ||
| if v := s.bool; v != zero { | ||
| t.Fatalf("expected bool field to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // via *js.Object.Bool() | ||
| if v := s.Object.Get(fieldName).Bool(); v != zero { | ||
| t.Fatalf("expected bool field via *js.Object.Bool() to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // ************* | ||
| // null | ||
| // ************* | ||
| s.Object.Set(fieldName, jsnull()) | ||
|
|
||
| // via struct field | ||
| if v := s.bool; v != zero { | ||
| t.Fatalf("expected bool field to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // via *js.Object.Bool() | ||
| if v := s.Object.Get(fieldName).Bool(); v != zero { | ||
| t.Fatalf("expected bool field via *js.Object.Bool() to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // ************* | ||
| // valid primitive bool | ||
| // ************* | ||
| exp := true | ||
| s.Object.Set(fieldName, jsval(`true`)) | ||
|
|
||
| // via struct field | ||
| if v := s.bool; v != exp { | ||
| t.Fatalf("expected bool field to be %v, got %v", exp, v) | ||
| } | ||
|
|
||
| // via *js.Object.Bool() | ||
| if v := s.Object.Get(fieldName).Bool(); v != exp { | ||
| t.Fatalf("expected bool field via *js.Object.Bool() to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // ************* | ||
| // valid Bool object | ||
| // ************* | ||
| s.Object.Set(fieldName, jsval(`new Boolean(true)`)) | ||
|
|
||
| // via struct field | ||
| if v := s.bool; v != exp { | ||
| t.Fatalf("expected bool field to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // via *js.Object.Bool() | ||
| if v := s.Object.Get(fieldName).Bool(); v != exp { | ||
| t.Fatalf("expected bool field via *js.Object.Bool() to be %q, got %q", zero, v) | ||
| } | ||
|
|
||
| // ************* | ||
| // invalid | ||
| // ************* | ||
| s.Object.Set(fieldName, jsval("5")) | ||
|
|
||
| shouldRuntimePanic(t, "runtime error: tried to internalize non-bool value of type number/Number", func() { | ||
| _ = s.bool | ||
| }) | ||
|
|
||
| shouldRuntimePanic(t, "runtime error: tried to internalize non-bool value of type number/Number", func() { | ||
| _ = s.Object.Get(fieldName).Bool() | ||
| }) | ||
| } | ||
|
|
||
| func jsval(v string) *js.Object { | ||
| return js.Global.Call("eval", v) | ||
| } | ||
|
|
||
| func jsnull() *js.Object { | ||
| return js.Global.Call("eval", "null") | ||
| } | ||
|
|
||
| func jsundefined() *js.Object { | ||
| return js.Global.Call("eval", "undefined") | ||
| } | ||
|
|
||
| func consolelog(args ...interface{}) { | ||
| js.Global.Get("console").Call("log", args...) | ||
| } | ||
|
|
||
| func shouldRuntimePanic(t *testing.T, msg string, f func()) { | ||
| defer func() { | ||
| err, ok := recover().(error) | ||
| if !ok { | ||
| t.Fatalf("expected to have had to handle panic; we didn't see a panic") | ||
| } | ||
|
|
||
| if err.Error() != msg { | ||
| t.Fatalf("expected error %q, got %q", msg, err) | ||
| } | ||
| }() | ||
|
|
||
| f() | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it worth including
trueexamples here, for the sake of completeness, similar to the non-zero value examples for strings?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We would end up adding two lines:
trueandnew Boolean(true)- hence why I opted for the † callout.