sdl: events: Fix tests #274

veandco · Nov 8, 2017 · e798fe3 · e798fe3
1 parent 9059810
commit e798fe3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/sdl/audio_test.go b/sdl/audio_test.go
@@ -30,7 +30,7 @@ func TestAudioDevices(t *testing.T) {
 }
 
 func TestAudioInitQuit(t *testing.T) {
-	Do(func(){
+	Do(func() {
 		// figure out what driver will work
 		if err := InitSubSystem(INIT_AUDIO); err != nil {
 			t.Fatalf("InitSubSystem(INIT_AUDIO): %v", err)
@@ -66,28 +66,28 @@ func TestAudioInitQuit(t *testing.T) {
 	})
 }
 
-func TestLoadWAV_RW(t *testing.T) {
+func TestLoadWAVRW(t *testing.T) {
 	// load WAV from *RWOps pointing to WAV data
 	sliceHeader := (*reflect.SliceHeader)(unsafe.Pointer(&squareWave))
 	src := RWFromMem(unsafe.Pointer(sliceHeader.Data), len(squareWave))
-	buf, spec := LoadWAV_RW(src, false, &AudioSpec{})
+	buf, spec := LoadWAVRW(src, false, &AudioSpec{})
 
 	// test returned []byte
 	want := []byte{0, 0, 0, 0, 255, 255, 255, 255}
 	if buf == nil {
-		t.Errorf("LoadWAV_RW() returned nil []byte")
+		t.Errorf("LoadWAVRW() returned nil []byte")
 	} else {
 		if bytes.Compare(buf, want) != 0 {
-			t.Errorf("LoadWAV_RW() returned %v; want %v", buf, want)
+			t.Errorf("LoadWAVRW() returned %v; want %v", buf, want)
 		}
 		FreeWAV(buf) // make sure we can free without error
 	}
 
 	// test returned *AudioSpec
 	if spec == nil {
-		t.Errorf("LoadWAV_RW() returned nil *AudioSpec")
+		t.Errorf("LoadWAVRW() returned nil *AudioSpec")
 	} else if spec.Freq != 8363 { // no need to test all the spec fields
-		t.Errorf("LoadWAV_RW() returned *AudioSpec with Freq %d; want %d",
+		t.Errorf("LoadWAVRW() returned *AudioSpec with Freq %d; want %d",
 			spec.Freq, 8363)
 	}
 }
diff --git a/sdl/events.go b/sdl/events.go
@@ -391,13 +391,13 @@ type DropEvent struct {
 	File      string // the file name
 	WindowID  uint32 // the window that was dropped on, if any
 }
-
-type cDropEvent struct {
+type tDropEvent struct {
 	Type      uint32
 	Timestamp uint32
 	File      unsafe.Pointer
 	WindowID  uint32
 }
+type cDropEvent C.SDL_DropEvent
 
 // RenderEvent contains render event information.
 // (https://wiki.libsdl.org/SDL_EventType)
@@ -582,7 +582,7 @@ func goEvent(cevent *CEvent) Event {
 	case MULTIGESTURE:
 		return (*MultiGestureEvent)(unsafe.Pointer(cevent))
 	case DROPFILE:
-		e := (*cDropEvent)(unsafe.Pointer(cevent))
+		e := (*tDropEvent)(unsafe.Pointer(cevent))
 		event := DropEvent{Type: e.Type, Timestamp: e.Timestamp, File: string(C.GoString((*C.char)(e.File))), WindowID: e.WindowID}
 		C.SDL_free(e.File)
 		return &event

diff --git a/sdl/struct_test.go b/sdl/struct_test.go
@@ -87,7 +87,7 @@ func TestStructABI(t *testing.T) {
 		{TouchFingerEvent{}, cTouchFingerEvent{}, nil},
 		{MultiGestureEvent{}, cMultiGestureEvent{}, nil},
 		{DollarGestureEvent{}, cDollarGestureEvent{}, nil},
-		{DropEvent{}, cDropEvent{}, dropEventEdgeCase},
+		{tDropEvent{}, cDropEvent{}, dropEventEdgeCase},
 		{UserEvent{}, cUserEvent{}, nil},
 		{SysWMEvent{}, cSysWMEvent{}, nil},
 	}