@@ -45,27 +45,27 @@ FOSSIL_TEARDOWN(c_input_suite) {
4545
4646FOSSIL_TEST_CASE (c_test_io_gets_from_stream ) {
4747 const char * input_data = "test input\n" ;
48- FILE * input_stream = tmpfile ();
49- fwrite (input_data , 1 , strlen (input_data ), input_stream );
50- rewind (input_stream );
48+ fossil_fstream_t input_stream = { tmpfile (), "tempfile" } ;
49+ fwrite (input_data , 1 , strlen (input_data ), input_stream . file );
50+ rewind (input_stream . file );
5151
5252 char buf [20 ];
53- char * result = fossil_io_gets_from_stream (buf , sizeof (buf ), input_stream );
53+ char * result = fossil_io_gets_from_stream (buf , sizeof (buf ), & input_stream );
5454 ASSUME_ITS_EQUAL_CSTR ("test input" , buf );
5555 ASSUME_NOT_CNULL (result );
56- fclose (input_stream );
56+ fclose (input_stream . file );
5757}
5858
5959FOSSIL_TEST_CASE (c_test_io_gets_from_stream_no_offensive ) {
6060 char input [] = "This is a clean sentence.\n" ;
6161 char expected [] = "This is a clean sentence." ;
6262 char buffer [256 ];
6363
64- FILE * stream = tmpfile ();
65- fwrite (input , 1 , strlen (input ), stream );
66- rewind (stream );
67- char * result = fossil_io_gets_from_stream (buffer , sizeof (buffer ), stream );
68- fclose (stream );
64+ fossil_fstream_t stream = { tmpfile (), "tempfile" } ;
65+ fwrite (input , 1 , strlen (input ), stream . file );
66+ rewind (stream . file );
67+ char * result = fossil_io_gets_from_stream (buffer , sizeof (buffer ), & stream );
68+ fclose (stream . file );
6969
7070 ASSUME_ITS_EQUAL_CSTR (expected , result );
7171}
@@ -75,79 +75,79 @@ FOSSIL_TEST_CASE(c_test_io_gets_from_stream_with_punctuation) {
7575 char expected [] = "This is a test with punctuation, and special characters!" ;
7676 char buffer [256 ];
7777
78- FILE * stream = tmpfile ();
79- fwrite (input , 1 , strlen (input ), stream );
80- rewind (stream );
81- char * result = fossil_io_gets_from_stream (buffer , sizeof (buffer ), stream );
82- fclose (stream );
78+ fossil_fstream_t stream = { tmpfile (), "tempfile" } ;
79+ fwrite (input , 1 , strlen (input ), stream . file );
80+ rewind (stream . file );
81+ char * result = fossil_io_gets_from_stream (buffer , sizeof (buffer ), & stream );
82+ fclose (stream . file );
8383
8484 ASSUME_ITS_EQUAL_CSTR (expected , result );
8585}
8686
8787FOSSIL_TEST_CASE (c_test_io_gets_from_stream_empty_input ) {
8888 const char * input_data = "\n" ;
89- FILE * input_stream = tmpfile ();
90- fwrite (input_data , 1 , strlen (input_data ), input_stream );
91- rewind (input_stream );
89+ fossil_fstream_t input_stream = { tmpfile (), "tempfile" } ;
90+ fwrite (input_data , 1 , strlen (input_data ), input_stream . file );
91+ rewind (input_stream . file );
9292
9393 char buf [20 ];
94- char * result = fossil_io_gets_from_stream (buf , sizeof (buf ), input_stream );
94+ char * result = fossil_io_gets_from_stream (buf , sizeof (buf ), & input_stream );
9595 ASSUME_ITS_EQUAL_CSTR ("" , buf );
9696 ASSUME_NOT_CNULL (result );
97- fclose (input_stream );
97+ fclose (input_stream . file );
9898}
9999
100100FOSSIL_TEST_CASE (c_test_io_gets_from_stream_only_whitespace ) {
101101 const char * input_data = " \n" ;
102- FILE * input_stream = tmpfile ();
103- fwrite (input_data , 1 , strlen (input_data ), input_stream );
104- rewind (input_stream );
102+ fossil_fstream_t input_stream = { tmpfile (), "tempfile" } ;
103+ fwrite (input_data , 1 , strlen (input_data ), input_stream . file );
104+ rewind (input_stream . file );
105105
106106 char buf [20 ];
107- char * result = fossil_io_gets_from_stream (buf , sizeof (buf ), input_stream );
107+ char * result = fossil_io_gets_from_stream (buf , sizeof (buf ), & input_stream );
108108 ASSUME_ITS_EQUAL_CSTR ("" , buf );
109109 ASSUME_NOT_CNULL (result );
110- fclose (input_stream );
110+ fclose (input_stream . file );
111111}
112112
113113FOSSIL_TEST_CASE (c_test_io_gets_from_stream_long_input ) {
114114 const char * input_data = "This is a very long input string that exceeds the buffer size\n" ;
115- FILE * input_stream = tmpfile ();
116- fwrite (input_data , 1 , strlen (input_data ), input_stream );
117- rewind (input_stream );
115+ fossil_fstream_t input_stream = { tmpfile (), "tempfile" } ;
116+ fwrite (input_data , 1 , strlen (input_data ), input_stream . file );
117+ rewind (input_stream . file );
118118
119119 char buf [20 ];
120- char * result = fossil_io_gets_from_stream (buf , sizeof (buf ), input_stream );
120+ char * result = fossil_io_gets_from_stream (buf , sizeof (buf ), & input_stream );
121121 ASSUME_ITS_EQUAL_CSTR ("This is a very long" , buf );
122122 ASSUME_NOT_CNULL (result );
123- fclose (input_stream );
123+ fclose (input_stream . file );
124124}
125125
126126FOSSIL_TEST_CASE (c_test_io_gets_from_stream_ex ) {
127127 const char * input_data = "test input\n" ;
128- FILE * input_stream = tmpfile ();
129- fwrite (input_data , 1 , strlen (input_data ), input_stream );
130- rewind (input_stream );
128+ fossil_fstream_t input_stream = { tmpfile (), "tempfile" } ;
129+ fwrite (input_data , 1 , strlen (input_data ), input_stream . file );
130+ rewind (input_stream . file );
131131
132132 char buf [20 ];
133133 int error_code = 0 ;
134- char * result = fossil_io_gets_from_stream_ex (buf , sizeof (buf ), input_stream , & error_code );
134+ char * result = fossil_io_gets_from_stream_ex (buf , sizeof (buf ), & input_stream , & error_code );
135135 ASSUME_ITS_EQUAL_CSTR ("test input" , buf );
136136 ASSUME_NOT_CNULL (result );
137- fclose (input_stream );
137+ fclose (input_stream . file );
138138}
139139
140140FOSSIL_TEST_CASE (c_test_io_gets_utf8 ) {
141141 const char * input_data = "test input\n" ;
142- FILE * input_stream = tmpfile ();
143- fwrite (input_data , 1 , strlen (input_data ), input_stream );
144- rewind (input_stream );
142+ fossil_fstream_t input_stream = { tmpfile (), "tempfile" } ;
143+ fwrite (input_data , 1 , strlen (input_data ), input_stream . file );
144+ rewind (input_stream . file );
145145
146146 char buf [20 ];
147- char * result = fossil_io_gets_utf8 (buf , sizeof (buf ), input_stream );
147+ char * result = fossil_io_gets_utf8 (buf , sizeof (buf ), & input_stream );
148148 ASSUME_ITS_EQUAL_CSTR ("test input" , buf );
149149 ASSUME_NOT_CNULL (result );
150- fclose (input_stream );
150+ fclose (input_stream . file );
151151}
152152
153153FOSSIL_TEST_CASE (c_test_io_validate_is_int_valid ) {
@@ -185,7 +185,7 @@ FOSSIL_TEST_CASE(c_test_io_validate_is_alnum_invalid) {
185185}
186186
187187FOSSIL_TEST_CASE (c_test_io_validate_is_email_valid ) {
188- const char * input = "test@example .com" ;
188+ const char * input = "test@gmail .com" ; // now checks for valid email providers like gmail.com
189189 int result = fossil_io_validate_is_email (input );
190190 ASSUME_ITS_TRUE (result );
191191}
@@ -210,13 +210,13 @@ FOSSIL_TEST_CASE(c_test_io_validate_is_length_invalid) {
210210
211211FOSSIL_TEST_CASE (c_test_io_getc ) {
212212 const char * input_data = "test input\n" ;
213- FILE * input_stream = tmpfile ();
214- fwrite (input_data , 1 , strlen (input_data ), input_stream );
215- rewind (input_stream );
213+ fossil_fstream_t input_stream = { tmpfile (), "tempfile" } ;
214+ fwrite (input_data , 1 , strlen (input_data ), input_stream . file );
215+ rewind (input_stream . file );
216216
217- int ch = fossil_io_getc (input_stream );
217+ int ch = fossil_io_getc (& input_stream );
218218 ASSUME_ITS_EQUAL_I32 ('t' , ch );
219- fclose (input_stream );
219+ fclose (input_stream . file );
220220}
221221
222222// * * * * * * * * * * * * * * * * * * * * * * * *
0 commit comments