[gjs/depend-on-gi-1.71: 1/2] meson: Depend on g-i 1.78 and enable newly supported tests
- From: Marco Trevisan <marcotrevi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/depend-on-gi-1.71: 1/2] meson: Depend on g-i 1.78 and enable newly supported tests
- Date: Wed, 29 Jun 2022 05:34:16 +0000 (UTC)
commit 5c61c194633898237a1754c93ba74ac3b9d3a7af
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date: Wed Jun 29 03:20:27 2022 +0200
meson: Depend on g-i 1.78 and enable newly supported tests
With a newer g-i we can enable more tests that were not running so far,
so bump the dependency and enable the tests that were depending on MR's
that landed already.
installed-tests/js/testFundamental.js | 14 +++++++-------
installed-tests/js/testGIMarshalling.js | 13 ++++++-------
installed-tests/js/testGObjectValue.js | 7 +++----
meson.build | 2 +-
4 files changed, 17 insertions(+), 19 deletions(-)
---
diff --git a/installed-tests/js/testFundamental.js b/installed-tests/js/testFundamental.js
index 7fd111b99..4359ed6e3 100644
--- a/installed-tests/js/testFundamental.js
+++ b/installed-tests/js/testFundamental.js
@@ -51,7 +51,7 @@ describe('Fundamental type support', function () {
expect(f.get_data()).toBe('foo'));
obj.emit('test-fundamental-no-funcs', fund);
expect(signalSpy).toHaveBeenCalledWith(obj, fund);
- }).pend('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/268');
+ });
it('can marshal a subtype of a custom fundamental type into a GValue if contains a pointer and does not
provide setter and getters', function () {
const fund = new Regress.TestFundamentalSubObjectNoGetSetFunc('foo');
@@ -63,7 +63,7 @@ describe('Fundamental type support', function () {
expect(f.get_data()).toBe('foo'));
obj.emit('test-fundamental-no-funcs-subtype', fund);
expect(signalSpy).toHaveBeenCalledWith(obj, fund);
- }).pend('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/268');
+ });
it('cannot marshal a custom fundamental type into a GValue of different gtype', function () {
const fund = new Regress.TestFundamentalObjectNoGetSetFunc('foo');
@@ -73,7 +73,7 @@ describe('Fundamental type support', function () {
obj.connect('test-fundamental-value-funcs', signalSpy);
expect(() => obj.emit('test-fundamental-value-funcs', fund)).toThrowError(
/ RegressTestFundamentalObjectNoGetSetFunc .* conversion to a GValue.*
RegressTestFundamentalObject/);
- }).pend('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/268');
+ });
it('can marshal a custom fundamental type into a GValue of super gtype', function () {
const fund = new Regress.TestFundamentalSubObjectNoGetSetFunc('foo');
@@ -85,7 +85,7 @@ describe('Fundamental type support', function () {
expect(f.get_data()).toBe('foo'));
obj.emit('test-fundamental-no-funcs', fund);
expect(signalSpy).toHaveBeenCalledWith(obj, fund);
- }).pend('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/268');
+ });
it('cannot marshal a custom fundamental type into a GValue of sub gtype', function () {
const fund = new Regress.TestFundamentalObjectNoGetSetFunc('foo');
@@ -95,7 +95,7 @@ describe('Fundamental type support', function () {
obj.connect('test-fundamental-no-funcs-subtype', signalSpy);
expect(() => obj.emit('test-fundamental-no-funcs-subtype', fund)).toThrowError(
/ RegressTestFundamentalObjectNoGetSetFunc .* conversion to a GValue.*
RegressTestFundamentalSubObjectNoGetSetFunc/);
- }).pend('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/268');
+ });
it('can marshal a custom fundamental type into a transformable type', function () {
Regress.TestFundamentalObjectNoGetSetFunc.make_compatible_with_fundamental_sub_object();
@@ -107,7 +107,7 @@ describe('Fundamental type support', function () {
expect(f instanceof Regress.TestFundamentalSubObject).toBeTrue());
obj.emit('test-fundamental-value-funcs-subtype', fund);
expect(signalSpy).toHaveBeenCalled();
- }).pend('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/268');
+ });
it('can marshal to a null value', function () {
const v = new GObject.Value();
@@ -117,5 +117,5 @@ describe('Fundamental type support', function () {
it('can marshal to a null value if has no getter function', function () {
const v = new GObject.Value();
expect(v.init(Regress.TestFundamentalObjectNoGetSetFunc.$gtype)).toBeNull();
- }).pend('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/268');
+ });
});
diff --git a/installed-tests/js/testGIMarshalling.js b/installed-tests/js/testGIMarshalling.js
index 797c05a0c..cd07d7299 100644
--- a/installed-tests/js/testGIMarshalling.js
+++ b/installed-tests/js/testGIMarshalling.js
@@ -1410,17 +1410,17 @@ describe('Virtual function', function () {
expect(tester.method_int8_out()).toEqual(40);
});
- xit('marshals a POD out argument', function () {
+ it('marshals a POD out argument', function () {
expect(tester.method_int8_arg_and_out_caller(39)).toEqual(42);
- }).pend('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/263');
+ });
it('marshals a callee-allocated pointer out argument', function () {
expect(tester.method_int8_arg_and_out_callee(38)).toEqual(42);
});
- xit('marshals a string out argument and return value', function () {
+ it('marshals a string out argument and return value', function () {
expect(tester.method_str_arg_out_ret('a string')).toEqual(['Called with a string', 41]);
- }).pend('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/263');
+ });
it('can override a default implementation in JS', function () {
tester.method_with_default_implementation(40);
@@ -1987,8 +1987,7 @@ describe('GObject properties', function () {
testPropertyGetSetBigInt('int64', BigIntLimits.int64.min, BigIntLimits.int64.max);
testPropertyGetSet('uint64', 42, 64);
testPropertyGetSetBigInt('uint64', BigIntLimits.int64.max, BigIntLimits.int64.umax);
- testPropertyGetSet('string', 'Gjs', 'is cool!',
- 'https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/268');
+ testPropertyGetSet('string', 'Gjs', 'is cool!');
it('get and sets out-of-range values throws', function () {
expect(() => {
@@ -2078,7 +2077,7 @@ xdescribe('GObject signals', function () {
const signalId = obj.connect(signalName, signalCallback);
obj[funcName]();
obj.disconnect(signalId);
- }).pend('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/259');
+ });
}
testSignalEmission('boxed-gptrarray-utf8', ['0', '1', '2']);
diff --git a/installed-tests/js/testGObjectValue.js b/installed-tests/js/testGObjectValue.js
index 461c1ba2d..2763668d5 100644
--- a/installed-tests/js/testGObjectValue.js
+++ b/installed-tests/js/testGObjectValue.js
@@ -96,7 +96,6 @@ describe('GObject value (GValue)', function () {
type = 'boxed';
if (type === 'instance') {
- pending('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/268');
return GIMarshallingTests.gvalue_round_trip(gvalue);
}
@@ -153,7 +152,7 @@ describe('GObject value (GValue)', function () {
setContent(v, type, randomContent);
expect(GIMarshallingTests.gvalue_round_trip(v)).toEqual(randomContent);
expect(GIMarshallingTests.gvalue_copy(v)).toEqual(randomContent);
- }).pend('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/268');
+ });
it(`copies ${type}`, function () {
skipUnsupported(type);
@@ -171,14 +170,14 @@ describe('GObject value (GValue)', function () {
pending('Not supported - always implicitly converted');
const content = getDefaultContentByType(type);
expect(GIMarshallingTests.gvalue_round_trip(content)).toEqual(content);
- }).pend('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/268');
+ });
});
['int', 'uint', 'boolean', 'gtype', ...FLOATING_TYPES].forEach(type => {
it(`can be marshalled and un-marshalled from JS gtype of ${type}`, function () {
const gtype = getGType(type);
expect(GIMarshallingTests.gvalue_round_trip(gtype).constructor.$gtype).toEqual(gtype);
- }).pend('https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/268');
+ });
});
INSTANCED_TYPES.forEach(type => {
diff --git a/meson.build b/meson.build
index 9f8cdacc9..6ef234887 100644
--- a/meson.build
+++ b/meson.build
@@ -125,7 +125,7 @@ gobject = dependency('gobject-2.0', version: glib_required_version,
gio = dependency('gio-2.0', version: glib_required_version,
fallback: ['glib', 'libgio_dep'])
ffi = dependency('libffi', fallback: ['libffi', 'ffi_dep'])
-gi = dependency('gobject-introspection-1.0', version: '>= 1.66.0',
+gi = dependency('gobject-introspection-1.0', version: '>= 1.71.0',
fallback: ['gobject-introspection', 'girepo_dep'])
spidermonkey = dependency('mozjs-91', version: '>= 91.3.0')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]