@@ -66,28 +66,19 @@ public async Task TestInsertEvent()
6666 cmd . CommandText = "INSERT INTO pet (name, owner, species, sex, birth, death, timeUpdated) values ('Rokie', 'Kerry', 'abc', 'F', '1992-05-20', '3000-01-01', now()); SELECT LAST_INSERT_ID();" ;
6767 var id = ( UInt64 ) ( await cmd . ExecuteScalarAsync ( ) ) ;
6868
69- while ( true )
70- {
71- var eventLog = await _mysqlFixture . Client . ReceiveAsync ( ) ;
72-
73- if ( eventLog . EventType == LogEventType . WRITE_ROWS_EVENT )
74- {
75- var log = eventLog as WriteRowsEvent ;
76- Assert . NotNull ( log ) ;
69+ var eventLog = await _mysqlFixture . ReceiveAsync < WriteRowsEvent > ( ) ;
7770
78- var rows = log . RowSet . ToReadableRows ( ) ;
79- Assert . Equal ( 1 , rows . Count ) ;
71+ Assert . NotNull ( eventLog ) ;
8072
81- var row = rows [ 0 ] ;
73+ var rows = eventLog . RowSet . ToReadableRows ( ) ;
74+ Assert . Equal ( 1 , rows . Count ) ;
8275
83- Assert . Equal ( "Rokie" , row [ "name" ] ) ;
84- Assert . Equal ( "Kerry" , row [ "owner" ] ) ;
85- Assert . Equal ( "abc" , row [ "species" ] ) ;
86- Assert . Equal ( "F" , row [ "sex" ] ) ;
76+ var row = rows [ 0 ] ;
8777
88- break ;
89- }
90- }
78+ Assert . Equal ( "Rokie" , row [ "name" ] ) ;
79+ Assert . Equal ( "Kerry" , row [ "owner" ] ) ;
80+ Assert . Equal ( "abc" , row [ "species" ] ) ;
81+ Assert . Equal ( "F" , row [ "sex" ] ) ;
9182 }
9283
9384 [ Fact ]
@@ -123,35 +114,29 @@ public async Task TestUpdateEvent()
123114 cmd . CommandText = "update pet set owner='Linda', timeUpdated=now() where `id`=" + id ;
124115 await cmd . ExecuteNonQueryAsync ( ) ;
125116
126- while ( true )
127- {
128- var eventLog = await _mysqlFixture . Client . ReceiveAsync ( ) ;
129-
130- _outputHelper . WriteLine ( eventLog . ToString ( ) + "\r \n " ) ;
131-
132- if ( eventLog . EventType == LogEventType . UPDATE_ROWS_EVENT )
133- {
134- var log = eventLog as UpdateRowsEvent ;
135- Assert . NotNull ( log ) ;
117+ var eventLog = await _mysqlFixture . ReceiveAsync < UpdateRowsEvent > ( ) ;
136118
137- var rows = log . RowSet . ToReadableRows ( ) ;
138- Assert . Equal ( 1 , rows . Count ) ;
119+ _outputHelper . WriteLine ( eventLog . ToString ( ) + "\r \n " ) ;
120+
121+ if ( eventLog . EventType == LogEventType . UPDATE_ROWS_EVENT )
122+ {
123+ Assert . NotNull ( eventLog ) ;
139124
140- var row = rows [ 0 ] ;
125+ var rows = eventLog . RowSet . ToReadableRows ( ) ;
126+ Assert . Equal ( 1 , rows . Count ) ;
141127
142- var cellValue = row [ "id" ] as CellValue ;
128+ var row = rows [ 0 ] ;
143129
144- Assert . Equal ( id , cellValue . OldValue ) ;
145- Assert . Equal ( id , cellValue . NewValue ) ;
130+ var cellValue = row [ "id" ] as CellValue ;
146131
147- cellValue = row [ "owner" ] as CellValue ;
132+ Assert . Equal ( id , cellValue . OldValue ) ;
133+ Assert . Equal ( id , cellValue . NewValue ) ;
148134
149- Assert . Equal ( "Kerry" , oldValues [ "owner" ] ) ;
150- Assert . Equal ( "Kerry" , cellValue . OldValue ) ;
151- Assert . Equal ( "Linda" , cellValue . NewValue ) ;
135+ cellValue = row [ "owner" ] as CellValue ;
152136
153- break ;
154- }
137+ Assert . Equal ( "Kerry" , oldValues [ "owner" ] ) ;
138+ Assert . Equal ( "Kerry" , cellValue . OldValue ) ;
139+ Assert . Equal ( "Linda" , cellValue . NewValue ) ;
155140 }
156141 }
157142 }
0 commit comments