From 51da32446513a0253cc062f1cad2d98e080b2d5e Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Fri, 1 May 2020 10:57:05 +0200 Subject: [PATCH] tests: fix eventbus_test.v --- cmd/tools/vtest-fixed.v | 1 - vlib/eventbus/eventbus.v | 6 ++++-- vlib/freetype/freetype.v | 6 ++++++ vlib/v/tests/interface_test.v | 3 +++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/cmd/tools/vtest-fixed.v b/cmd/tools/vtest-fixed.v index 1f9e09d773..5192a46e44 100644 --- a/cmd/tools/vtest-fixed.v +++ b/cmd/tools/vtest-fixed.v @@ -7,7 +7,6 @@ import v.pref const ( skip_test_files = [ 'vlib/arrays/arrays_test.v', - 'vlib/eventbus/eventbus_test.v', 'vlib/json/json_test.v', 'vlib/v/tests/enum_bitfield_test.v', 'vlib/v/tests/num_lit_call_method_test.v', diff --git a/vlib/eventbus/eventbus.v b/vlib/eventbus/eventbus.v index 6a5f45f915..500f60b802 100644 --- a/vlib/eventbus/eventbus.v +++ b/vlib/eventbus/eventbus.v @@ -65,8 +65,10 @@ fn (pb mut Publisher) publish(name string, sender voidptr, args voidptr) { if event.once { pb.registry.events.delete(i) } - if event.receiver != voidptr(0) { - event.handler(event.receiver, args, sender) + // + x := event.receiver + if x != 0 { + event.handler(x, args, sender) } else { event.handler(sender, args, voidptr(0)) } diff --git a/vlib/freetype/freetype.v b/vlib/freetype/freetype.v index 20c12d8149..eb40cfde70 100644 --- a/vlib/freetype/freetype.v +++ b/vlib/freetype/freetype.v @@ -9,6 +9,12 @@ import gx import gg import glm import gl +/* +TODO +!!!!!! +Use a font atlas +!!!!!! +*/ #flag windows -I @VROOT/thirdparty/freetype/include #flag windows -L @VROOT/thirdparty/freetype/win64 diff --git a/vlib/v/tests/interface_test.v b/vlib/v/tests/interface_test.v index 24b340d951..c9a3d5ff3f 100644 --- a/vlib/v/tests/interface_test.v +++ b/vlib/v/tests/interface_test.v @@ -35,6 +35,9 @@ fn perform_speak(s Speaker) { assert true name := s.name() assert name == 'Dog' || name == 'Cat' + //if s is Dog { + //assert name == 'Dog' + //} println(s.name()) }