Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6fae655

Browse files
Fix tests, replace match with matches!
1 parentd9d283e commit6fae655

File tree

3 files changed

+7
-72
lines changed

3 files changed

+7
-72
lines changed

‎docker/sql_setup.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,5 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
9696
CREATE ROLE ssl_user LOGIN;
9797
CREATE EXTENSION hstore;
9898
CREATE EXTENSION citext;
99+
CREATE EXTENSION ltree;
99100
EOSQL

‎postgres-protocol/src/types/test.rs‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -174,25 +174,15 @@ fn ltree_str() {
174174
letmut query =vec![1u8];
175175
query.extend_from_slice("A.B.C".as_bytes());
176176

177-
let success =matchltree_from_sql(query.as_slice()){
178-
Ok(_) =>true,
179-
_ =>false,
180-
};
181-
182-
assert!(success)
177+
assert!(matches!(ltree_from_sql(query.as_slice()),Ok(_)))
183178
}
184179

185180
#[test]
186181
fnltree_wrong_version(){
187182
letmut query =vec![2u8];
188183
query.extend_from_slice("A.B.C".as_bytes());
189184

190-
let success =matchltree_from_sql(query.as_slice()){
191-
Err(_) =>true,
192-
_ =>false,
193-
};
194-
195-
assert!(success)
185+
assert!(matches!(ltree_from_sql(query.as_slice()),Err(_)))
196186
}
197187

198188
#[test]
@@ -212,25 +202,15 @@ fn lquery_str() {
212202
letmut query =vec![1u8];
213203
query.extend_from_slice("A.B.C".as_bytes());
214204

215-
let success =matchlquery_from_sql(query.as_slice()){
216-
Ok(_) =>true,
217-
_ =>false,
218-
};
219-
220-
assert!(success)
205+
assert!(matches!(lquery_from_sql(query.as_slice()),Ok(_)))
221206
}
222207

223208
#[test]
224209
fnlquery_wrong_version(){
225210
letmut query =vec![2u8];
226211
query.extend_from_slice("A.B.C".as_bytes());
227212

228-
let success =matchlquery_from_sql(query.as_slice()){
229-
Err(_) =>true,
230-
_ =>false,
231-
};
232-
233-
assert!(success)
213+
assert!(matches!(lquery_from_sql(query.as_slice()),Err(_)))
234214
}
235215

236216
#[test]
@@ -250,23 +230,13 @@ fn ltxtquery_str() {
250230
letmut query =vec![1u8];
251231
query.extend_from_slice("a & b*".as_bytes());
252232

253-
let success =matchltree_from_sql(query.as_slice()){
254-
Ok(_) =>true,
255-
_ =>false,
256-
};
257-
258-
assert!(success)
233+
assert!(matches!(ltree_from_sql(query.as_slice()),Ok(_)))
259234
}
260235

261236
#[test]
262237
fnltxtquery_wrong_version(){
263238
letmut query =vec![2u8];
264239
query.extend_from_slice("a & b*".as_bytes());
265240

266-
let success =matchltree_from_sql(query.as_slice()){
267-
Err(_) =>true,
268-
_ =>false,
269-
};
270-
271-
assert!(success)
241+
assert!(matches!(ltree_from_sql(query.as_slice()),Err(_)))
272242
}

‎tokio-postgres/tests/test/types/mod.rs‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -651,12 +651,6 @@ async fn inet() {
651651

652652
#[tokio::test]
653653
asyncfnltree(){
654-
let client =connect("user=postgres").await;
655-
client
656-
.execute("CREATE EXTENSION IF NOT EXISTS ltree;",&[])
657-
.await
658-
.unwrap();
659-
660654
test_type(
661655
"ltree",
662656
&[(Some("b.c.d".to_owned()),"'b.c.d'"),(None,"NULL")],
@@ -666,12 +660,6 @@ async fn ltree() {
666660

667661
#[tokio::test]
668662
asyncfnltree_any(){
669-
let client =connect("user=postgres").await;
670-
client
671-
.execute("CREATE EXTENSION IF NOT EXISTS ltree;",&[])
672-
.await
673-
.unwrap();
674-
675663
test_type(
676664
"ltree[]",
677665
&[
@@ -689,12 +677,6 @@ async fn ltree_any() {
689677

690678
#[tokio::test]
691679
asyncfnlquery(){
692-
let client =connect("user=postgres").await;
693-
client
694-
.execute("CREATE EXTENSION IF NOT EXISTS ltree;",&[])
695-
.await
696-
.unwrap();
697-
698680
test_type(
699681
"lquery",
700682
&[
@@ -709,12 +691,6 @@ async fn lquery() {
709691

710692
#[tokio::test]
711693
asyncfnlquery_any(){
712-
let client =connect("user=postgres").await;
713-
client
714-
.execute("CREATE EXTENSION IF NOT EXISTS ltree;",&[])
715-
.await
716-
.unwrap();
717-
718694
test_type(
719695
"lquery[]",
720696
&[
@@ -732,12 +708,6 @@ async fn lquery_any() {
732708

733709
#[tokio::test]
734710
asyncfnltxtquery(){
735-
let client =connect("user=postgres").await;
736-
client
737-
.execute("CREATE EXTENSION IF NOT EXISTS ltree;",&[])
738-
.await
739-
.unwrap();
740-
741711
test_type(
742712
"ltxtquery",
743713
&[
@@ -751,12 +721,6 @@ async fn ltxtquery() {
751721

752722
#[tokio::test]
753723
asyncfnltxtquery_any(){
754-
let client =connect("user=postgres").await;
755-
client
756-
.execute("CREATE EXTENSION IF NOT EXISTS ltree;",&[])
757-
.await
758-
.unwrap();
759-
760724
test_type(
761725
"ltxtquery[]",
762726
&[

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp