Tests: Convert Swift tests to use Testing module where possible

The AK tests can't seem to use it because it crashes the frontend :)
This commit is contained in:
Andrew Kaster 2024-08-27 01:57:13 -06:00 committed by Andrew Kaster
commit 782926601d
Notes: github-actions[bot] 2024-08-29 03:28:30 +00:00
5 changed files with 44 additions and 70 deletions

View file

@ -93,6 +93,8 @@ endforeach()
target_link_libraries(TestString PRIVATE LibUnicode) target_link_libraries(TestString PRIVATE LibUnicode)
if (ENABLE_SWIFT) if (ENABLE_SWIFT)
# FIXME: Convert to use swift-testing after resolving https://github.com/LadybirdBrowser/ladybird/issues/1201
add_executable(TestAKBindings TestAKBindings.swift) add_executable(TestAKBindings TestAKBindings.swift)
target_link_libraries(TestAKBindings PRIVATE AK) target_link_libraries(TestAKBindings PRIVATE AK)
target_compile_options(TestAKBindings PRIVATE -parse-as-library) target_compile_options(TestAKBindings PRIVATE -parse-as-library)

View file

@ -16,13 +16,17 @@ endforeach()
target_link_libraries(TestFetchURL PRIVATE LibURL) target_link_libraries(TestFetchURL PRIVATE LibURL)
if (ENABLE_SWIFT) if (ENABLE_SWIFT)
add_executable(TestLibWebSwiftBindings TestLibWebSwiftBindings.swift) find_package(SwiftTesting REQUIRED)
target_link_libraries(TestLibWebSwiftBindings PRIVATE AK LibWeb)
target_compile_options(TestLibWebSwiftBindings PRIVATE -parse-as-library)
add_test(NAME TestLibWebSwiftBindings COMMAND TestLibWebSwiftBindings)
add_executable(TestHTMLTokenizerSwift TestHTMLTokenizerSwift.swift) add_executable(TestLibWebSwift
target_link_libraries(TestHTMLTokenizerSwift PRIVATE AK LibWeb) TestLibWebSwiftBindings.swift
target_compile_options(TestHTMLTokenizerSwift PRIVATE -parse-as-library) TestHTMLTokenizerSwift.swift
add_test(NAME TestHTMLTokenizerSwift COMMAND TestHTMLTokenizerSwift) )
# FIXME: Swift doesn't seem to like object libraries for @main
target_sources(TestLibWebSwift PRIVATE ../Resources/SwiftTestMain.swift)
set_target_properties(TestLibWebSwift PROPERTIES SUFFIX .swift-testing)
target_link_libraries(TestLibWebSwift PRIVATE AK LibWeb SwiftTesting::SwiftTesting)
add_test(NAME TestLibWebSwift COMMAND TestLibWebSwift)
endif() endif()

View file

@ -6,54 +6,28 @@
import AK import AK
import Web import Web
import Foundation import Testing
class StandardError: TextOutputStream { @Suite
func write(_ string: Swift.String) {
try! FileHandle.standardError.write(contentsOf: Data(string.utf8))
}
}
@main
struct TestHTMLTokenizerSwift { struct TestHTMLTokenizerSwift {
static func testTokenTypes() { @Test func tokenTypes() {
var standardError = StandardError()
print("Testing HTMLToken types...", to: &standardError)
let default_token = HTMLToken() let default_token = HTMLToken()
default_token.type = .Character(codePoint: "a") default_token.type = .Character(codePoint: "a")
precondition(default_token.isCharacter()) #expect(default_token.isCharacter())
print("\(default_token)", to: &standardError) #expect("\(default_token)" == "HTMLToken(type: Character(codePoint: a))")
print("HTMLToken types pass", to: &standardError)
} }
static func testParserWhitespace() { @Test func parserWhitespace() {
var standardError = StandardError()
print("Testing HTMLToken parser whitespace...", to: &standardError)
for codePoint: Character in ["\t", "\n", "\r", "\u{000C}", " "] { for codePoint: Character in ["\t", "\n", "\r", "\u{000C}", " "] {
let token = HTMLToken(type: .Character(codePoint: codePoint)) let token = HTMLToken(type: .Character(codePoint: codePoint))
precondition(token.isParserWhitespace()) #expect(token.isParserWhitespace())
} }
for codePoint: Character in ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"] { for codePoint: Character in ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"] {
let token = HTMLToken(type: .Character(codePoint: codePoint)) let token = HTMLToken(type: .Character(codePoint: codePoint))
precondition(!token.isParserWhitespace()) #expect(!token.isParserWhitespace())
} }
print("HTMLToken parser whitespace pass", to: &standardError)
}
static func main() {
var standardError = StandardError()
print("Starting test suite...", to: &standardError)
testTokenTypes()
testParserWhitespace()
print("All tests pass", to: &standardError)
} }
} }

View file

@ -6,42 +6,20 @@
import AK import AK
import Web import Web
import Foundation import Testing
class StandardError: TextOutputStream { @Suite
func write(_ string: Swift.String) {
try! FileHandle.standardError.write(contentsOf: Data(string.utf8))
}
}
@main
struct TestLibWebSwiftBindings { struct TestLibWebSwiftBindings {
static func testEnumsAreBound() { @Test func enumsAreBound() {
var standardError = StandardError() #expect(Web.DOM.NodeType.ELEMENT_NODE.rawValue == 1)
print("Testing LibWeb enum types...", to: &standardError)
print("Web.DOM.NodeType.ELEMENT_NODE == \(Web.DOM.NodeType.ELEMENT_NODE)", to: &standardError) #expect(Web.Bindings.NavigationType.Push.rawValue == 0)
precondition(Web.DOM.NodeType.ELEMENT_NODE.rawValue == 1)
print("Web.Bindings.NavigationType.Push == \(Web.Bindings.NavigationType.Push)", to: &standardError)
precondition(Web.Bindings.NavigationType.Push.rawValue == 0)
let end = Web.Bindings.idl_enum_to_string(Web.Bindings.ScrollLogicalPosition.End) let end = Web.Bindings.idl_enum_to_string(Web.Bindings.ScrollLogicalPosition.End)
let end_view = end.__bytes_as_string_viewUnsafe().bytes(); let end_view = end.__bytes_as_string_viewUnsafe().bytes();
let end_string = Swift.String(bytes: end_view, encoding: .utf8)! let end_string = Swift.String(bytes: end_view, encoding: .utf8)!
print("Web.Bindings.idl_enum_to_string(Web.Bindings.ScrollLogicalPosition.End) == \(end_string)", to: &standardError) #expect(end_string == "end")
precondition(end_string == "end")
print("LibWeb enum types pass", to: &standardError)
}
static func main() {
var standardError = StandardError()
print("Starting test suite...", to: &standardError)
testEnumsAreBound()
print("All tests pass", to: &standardError)
} }
} }

View file

@ -0,0 +1,16 @@
/*
* Copyright (c) 2024, Andrew Kaster <andrew@ladybird.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
// FIXME: This file is intended to become redundant as swift-testing stabilizes
// See https://github.com/swiftlang/swift-testing/blob/133e30231c4583b02ab3ea2a7f678f3d7f4f8a3d/Documentation/CMake.md#add-an-entry-point
import Testing
@main struct Runner {
static func main() async {
await Testing.__swiftPMEntryPoint() as Never
}
}