From b909a1a8ff5996b8aa1ed4410a0bead215aa080a Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 11 Jul 2020 19:19:14 +0100 Subject: [PATCH] Fix tests for Windows OS --- internal/driver/glfw/canvas_test.go | 6 +++--- internal/driver/glfw/file_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/driver/glfw/canvas_test.go b/internal/driver/glfw/canvas_test.go index 54e3f81b11..cdc58d8614 100644 --- a/internal/driver/glfw/canvas_test.go +++ b/internal/driver/glfw/canvas_test.go @@ -365,7 +365,7 @@ func Test_glCanvas_ContentChangeWithoutMinSizeChangeDoesNotLayout(t *testing.T) func Test_glCanvas_InsufficientSizeDoesntTriggerResizeIfSizeIsAlreadyMaxedOut(t *testing.T) { w := createWindow("Test").(*window) c := w.Canvas().(*glCanvas) - w.Resize(fyne.NewSize(100, 100)) + w.Resize(fyne.NewSize(200, 100)) popUpContent := canvas.NewRectangle(color.Black) popUpContent.SetMinSize(fyne.NewSize(1000, 10)) popUp := widget.NewPopUp(popUpContent, c) @@ -376,12 +376,12 @@ func Test_glCanvas_InsufficientSizeDoesntTriggerResizeIfSizeIsAlreadyMaxedOut(t assert.Equal(t, fyne.NewSize(1000, 10), popUpContent.Size()) assert.Equal(t, fyne.NewSize(1000, 10).Add(fyne.NewSize(theme.Padding()*2, theme.Padding()*2)), popUp.MinSize()) - assert.Equal(t, fyne.NewSize(100, 100), popUp.Size()) + assert.Equal(t, fyne.NewSize(200, 100), popUp.Size()) repaintWindow(w) assert.Equal(t, fyne.NewSize(1000, 10), popUpContent.Size()) - assert.Equal(t, fyne.NewSize(100, 100), popUp.Size()) + assert.Equal(t, fyne.NewSize(200, 100), popUp.Size()) } func Test_glCanvas_walkTree(t *testing.T) { diff --git a/internal/driver/glfw/file_test.go b/internal/driver/glfw/file_test.go index b9eff9d581..5fe19128c6 100644 --- a/internal/driver/glfw/file_test.go +++ b/internal/driver/glfw/file_test.go @@ -31,9 +31,9 @@ func TestGLDriver_FileReaderForURI_Again(t *testing.T) { // a bug blanked files func TestGLDriver_FileWriterForURI(t *testing.T) { uri, path := testURI("text2.txt") + defer os.Remove(path) write, err := NewGLDriver().FileWriterForURI(uri) defer write.Close() - defer os.Remove(path) assert.Nil(t, err) assert.Equal(t, uri, write.URI())