nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vala-unit: Minor test fixups

Browse source
This commit is contained in:
Michael Gratton 2020-07-03 18:08:39 +10:00 • committed by Michael James Gratton
parent 41de9e537b
commit 6ea5e43168
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
subprojects/vala-unit/src/test-assertions.vala
View file

@ -194,7 +194,7 @@ namespace ValaUnit {
private void assert_equal_enum<T>(T actual, private void assert_equal_enum<T>(T actual,
T expected, T expected,
string? context) string? context)
throws TestError { throws TestError {
int actual_val = (int) ((int?) actual); int actual_val = (int) ((int?) actual);
int expected_val = (int) ((int?) expected); int expected_val = (int) ((int?) expected);
if (actual_val != expected_val) { if (actual_val != expected_val) {
@ -203,8 +203,8 @@ namespace ValaUnit {
} }
private void assert_equal_string(string? actual, private void assert_equal_string(string? actual,
string? expected, string? expected,
string? context) string? context)
throws TestError { throws TestError {
string actual_val = (string) actual; string actual_val = (string) actual;
string expected_val = (string) expected; string expected_val = (string) expected;
@ -353,7 +353,7 @@ public interface ValaUnit.TestAssertions : GLib.Object {
} }
/** Asserts a value is null */ /** Asserts a value is null */
public void assert_null<T>(T actual, string? context = null) public void assert_is_null<T>(T actual, string? context = null)
throws TestError { throws TestError {
if (actual != null) { if (actual != null) {
ValaUnit.assert( ValaUnit.assert(
@ -419,6 +419,17 @@ public interface ValaUnit.TestAssertions : GLib.Object {
return new ArrayCollectionAssertion<E>((E[]) actual, context); return new ArrayCollectionAssertion<E>((E[]) actual, context);
} }
/** Asserts an array is null */
public void assert_array_is_null<T>(T[]? actual, string? context = null)
throws TestError {
if (actual != null) {
ValaUnit.assert(
"%s is non-null, expected null".printf(typeof(T).name()),
context
);
}
}
/** Asserts a collection is non-null and empty. */ /** Asserts a collection is non-null and empty. */
public CollectionAssertions<E> assert_collection<E>( public CollectionAssertions<E> assert_collection<E>(
Gee.Collection<E>? actual, Gee.Collection<E>? actual,
@ -522,6 +533,12 @@ public interface ValaUnit.TestAssertions : GLib.Object {
assert_true(actual, context); assert_true(actual, context);
} }
/** Asserts a value is null. */
public void assert_null<T>(T actual, string? context = null)
throws TestError {
assert_is_null(actual, context);
}
/** /**
* Asserts this call is never made. * Asserts this call is never made.
*/ */