Skip to content

Commit 4fdbb22

Browse files
authored
Merge pull request #302 from jwharm/variant-test-to-string-override
Add VariantType.toString() calling dupString()
2 parents 3365cf2 + af1cf1a commit 4fdbb22

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

generator/src/main/resources/metadata/GLib-2.0.metadata

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,11 @@ SList java-gi-custom
5959
*/
6060
{List,SList}.free_full java-gi-skip
6161

62-
// Implement GType.toString() with g_type_name()
62+
// Use g_type_name for GType.toString()
6363
Type java-gi-to-string="org.gnome.gobject.GObjects.typeName(this)"
6464

65-
// Use g_variant_print as the Variant.toString() method in Java.
65+
// Use g_variant_print for Variant.toString()
6666
Variant java-gi-to-string="print(true)"
67+
68+
// Use g_variant_type_dup_string for VariantType.toString()
69+
VariantType java-gi-to-string="dupString()"

modules/glib/src/test/java/org/javagi/glib/VariantTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package org.javagi.glib;
2121

2222
import org.gnome.glib.Variant;
23+
import org.gnome.glib.VariantType;
2324
import org.junit.jupiter.api.Test;
2425

2526
import java.util.*;
@@ -168,4 +169,10 @@ void tuple() {
168169
expected.add("44");
169170
assertEquals(expected, unpacked);
170171
}
172+
173+
@Test
174+
void toStringOverride() {
175+
assertEquals("'abc'", Variant.string("abc").toString());
176+
assertEquals("ms", new VariantType("ms").toString());
177+
}
171178
}

0 commit comments

Comments
 (0)