RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 22:27:35 +00:00
Code Issues Activity Actions

LibSQL: Clean up TestSqlDatabase

Browse source 
Missing imports, make methods static. No functional changes.
This commit is contained in:
Jelle Raaijmakers 2023-05-24 12:29:21 +02:00 • committed by Tim Flynn
parent b4c6cddd96
commit d5df832318
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Tests/LibSQL/TestSqlDatabase.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2021, Jan de Visser <jan@de-visser.net> * Copyright (c) 2021, Jan de Visser <jan@de-visser.net>
* Copyright (c) 2023, Jelle Raaijmakers <jelle@gmta.nl>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -7,6 +8,8 @@
#include <unistd.h> #include <unistd.h>
#include <AK/ScopeGuard.h> #include <AK/ScopeGuard.h>
#include <AK/StringBuilder.h>
#include <LibCore/System.h>
#include <LibSQL/BTree.h> #include <LibSQL/BTree.h>
#include <LibSQL/Database.h> #include <LibSQL/Database.h>
#include <LibSQL/Heap.h> #include <LibSQL/Heap.h>
@ -15,21 +18,15 @@
#include <LibSQL/Value.h> #include <LibSQL/Value.h>
#include <LibTest/TestCase.h> #include <LibTest/TestCase.h>
NonnullRefPtr<SQL::SchemaDef> setup_schema(SQL::Database&); static NonnullRefPtr<SQL::SchemaDef> setup_schema(SQL::Database& db)
NonnullRefPtr<SQL::TableDef> setup_table(SQL::Database&);
void insert_into_table(SQL::Database&, int);
void verify_table_contents(SQL::Database&, int);
void insert_and_verify(int);
void commit(SQL::Database&);
NonnullRefPtr<SQL::SchemaDef> setup_schema(SQL::Database& db)
{ {
auto schema = SQL::SchemaDef::construct("TestSchema"); auto schema = SQL::SchemaDef::construct("TestSchema");
MUST(db.add_schema(schema)); MUST(db.add_schema(schema));
return schema; return schema;
} }
NonnullRefPtr<SQL::TableDef> setup_table(SQL::Database& db) // FIXME: using the return value for SQL::TableDef to insert a row results in a segfault
static NonnullRefPtr<SQL::TableDef> setup_table(SQL::Database& db)
{ {
auto schema = setup_schema(db); auto schema = setup_schema(db);
auto table = SQL::TableDef::construct(schema, "TestTable"); auto table = SQL::TableDef::construct(schema, "TestTable");
@ -40,7 +37,7 @@ NonnullRefPtr<SQL::TableDef> setup_table(SQL::Database& db)
return table; return table;
} }
void insert_into_table(SQL::Database& db, int count) static void insert_into_table(SQL::Database& db, int count)
{ {
auto table = MUST(db.get_table("TestSchema", "TestTable")); auto table = MUST(db.get_table("TestSchema", "TestTable"));
@ -55,7 +52,7 @@ void insert_into_table(SQL::Database& db, int count)
} }
} }
void verify_table_contents(SQL::Database& db, int expected_count) static void verify_table_contents(SQL::Database& db, int expected_count)
{ {
auto table = MUST(db.get_table("TestSchema", "TestTable")); auto table = MUST(db.get_table("TestSchema", "TestTable"));
@ -73,12 +70,12 @@ void verify_table_contents(SQL::Database& db, int expected_count)
EXPECT_EQ(sum, (expected_count * (expected_count - 1)) / 2); EXPECT_EQ(sum, (expected_count * (expected_count - 1)) / 2);
} }
void commit(SQL::Database& db) static void commit(SQL::Database& db)
{ {
TRY_OR_FAIL(db.commit()); TRY_OR_FAIL(db.commit());
} }
void insert_and_verify(int count) static void insert_and_verify(int count)
{ {
ScopeGuard guard([]() { unlink("/tmp/test.db"); }); ScopeGuard guard([]() { unlink("/tmp/test.db"); });
{ {