From cbc906ceb79ba18e53fb94a563648b0347a1b15f Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 23 Feb 2002 18:57:11 +0000 Subject: [PATCH] Added new stream tests to typetest. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/minimal/minimal.cpp | 3 + samples/typetest/typetest.cpp | 171 +++++++++++++++++++++++++++++++++- samples/typetest/typetest.h | 4 + 3 files changed, 175 insertions(+), 3 deletions(-) diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp index 5ba383e3c3..b077830509 100644 --- a/samples/minimal/minimal.cpp +++ b/samples/minimal/minimal.cpp @@ -174,6 +174,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { + char *test = NULL; + *test = 0; + // TRUE is to force the frame to close Close(TRUE); } diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp index 8f6ef265dc..98ee15d096 100644 --- a/samples/typetest/typetest.cpp +++ b/samples/typetest/typetest.cpp @@ -72,6 +72,8 @@ BEGIN_EVENT_TABLE(MyApp, wxApp) EVT_MENU(TYPES_STREAM3, MyApp::DoStreamDemo3) EVT_MENU(TYPES_STREAM4, MyApp::DoStreamDemo4) EVT_MENU(TYPES_STREAM5, MyApp::DoStreamDemo5) + EVT_MENU(TYPES_STREAM6, MyApp::DoStreamDemo6) + EVT_MENU(TYPES_STREAM7, MyApp::DoStreamDemo7) EVT_MENU(TYPES_MIME, MyApp::DoMIMEDemo) END_EVENT_TABLE() @@ -106,6 +108,8 @@ bool MyApp::OnInit() test_menu->Append(TYPES_STREAM3, "&Stream error test"); test_menu->Append(TYPES_STREAM4, "&Stream buffer test"); test_menu->Append(TYPES_STREAM5, "&Stream peek test"); + test_menu->Append(TYPES_STREAM6, "&Stream ungetch test"); + test_menu->Append(TYPES_STREAM7, "&Stream ungetch test for a buffered stream"); test_menu->AppendSeparator(); test_menu->Append(TYPES_MIME, "&MIME database test"); @@ -304,14 +308,14 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( "\n\n\n" ); textCtrl.WriteText( "Writing number 0 to 9 to buffered wxFileOutputStream, then\n" ); - textCtrl.WriteText( "seeking back to #3 and writing 3:\n\n" ); + textCtrl.WriteText( "seeking back to #3 and writing 0:\n\n" ); wxFileOutputStream file_output2( wxString("test_wx2.dat") ); wxBufferedOutputStream buf_output2( file_output2 ); for (ch = 0; ch < 10; ch++) buf_output2.Write( &ch, 1 ); buf_output2.SeekO( 3 ); - ch = 3; + ch = 0; buf_output2.Write( &ch, 1 ); buf_output2.Sync(); @@ -331,7 +335,7 @@ void MyApp::DoStreamDemo2(wxCommandEvent& WXUNUSED(event)) buf_output2.Sync(); textCtrl.WriteText( "Reading number 0 to 9 from buffered wxFileInputStream, then\n" ); - textCtrl.WriteText( "seeking back to #3 and reading 3:\n\n" ); + textCtrl.WriteText( "seeking back to #3 and reading the 0:\n\n" ); wxFileInputStream file_input3( wxString("test_wx2.dat") ); wxBufferedInputStream buf_input3( file_input3 ); @@ -725,6 +729,167 @@ void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event)) textCtrl.WriteText( str ); } +void MyApp::DoStreamDemo6(wxCommandEvent& WXUNUSED(event)) +{ + wxTextCtrl& textCtrl = * GetTextCtrl(); + + textCtrl.Clear(); + textCtrl.WriteText( "\nTesting Ungetch():\n\n" ); + + char ch = 0; + size_t pos = 0; + wxString str; + + textCtrl.WriteText( "Writing number 0 to 9 to wxFileOutputStream...\n\n" ); + + wxFileOutputStream file_output( wxString("test_wx.dat") ); + for (ch = 0; ch < 10; ch++) + file_output.Write( &ch, 1 ); + + file_output.Sync(); + + textCtrl.WriteText( "Reading char from wxFileInputStream:\n\n" ); + + wxFileInputStream file_input( wxString("test_wx.dat") ); + + ch = file_input.GetC(); + pos = file_input.TellI(); + str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Reading another char from wxFileInputStream:\n\n" ); + + ch = file_input.GetC(); + pos = file_input.TellI(); + str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Reading yet another char from wxFileInputStream:\n\n" ); + + ch = file_input.GetC(); + pos = file_input.TellI(); + str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Now calling Ungetch( 5 ) from wxFileInputStream...\n\n" ); + + file_input.Ungetch( 5 ); + pos = file_input.TellI(); + str.Printf( wxT("Now at position %d\n\n"), (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Reading char from wxFileInputStream:\n\n" ); + + ch = file_input.GetC(); + pos = file_input.TellI(); + str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Reading another char from wxFileInputStream:\n\n" ); + + ch = file_input.GetC(); + pos = file_input.TellI(); + str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Now calling Ungetch( 5 ) from wxFileInputStream again...\n\n" ); + + file_input.Ungetch( 5 ); + pos = file_input.TellI(); + str.Printf( wxT("Now at position %d\n\n"), (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Seeking to pos 3 in wxFileInputStream. This invalidates the writeback buffer.\n\n" ); + + file_input.SeekI( 3 ); + + ch = file_input.GetC(); + pos = file_input.TellI(); + str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); + textCtrl.WriteText( str ); +} + +void MyApp::DoStreamDemo7(wxCommandEvent& WXUNUSED(event)) +{ + wxTextCtrl& textCtrl = * GetTextCtrl(); + + textCtrl.Clear(); + textCtrl.WriteText( "\nTesting Ungetch() in buffered input stream:\n\n" ); + + char ch = 0; + size_t pos = 0; + wxString str; + + textCtrl.WriteText( "Writing number 0 to 9 to wxFileOutputStream...\n\n" ); + + wxFileOutputStream file_output( wxString("test_wx.dat") ); + for (ch = 0; ch < 10; ch++) + file_output.Write( &ch, 1 ); + + file_output.Sync(); + + textCtrl.WriteText( "Reading char from wxBufferedInputStream via wxFileInputStream:\n\n" ); + + wxFileInputStream file_input( wxString("test_wx.dat") ); + wxBufferedInputStream buf_input( file_input ); + + ch = buf_input.GetC(); + pos = buf_input.TellI(); + str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Reading another char from wxBufferedInputStream:\n\n" ); + + ch = buf_input.GetC(); + pos = buf_input.TellI(); + str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Reading yet another char from wxBufferedInputStream:\n\n" ); + + ch = buf_input.GetC(); + pos = buf_input.TellI(); + str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Now calling Ungetch( 5 ) from wxBufferedInputStream...\n\n" ); + + buf_input.Ungetch( 5 ); + pos = buf_input.TellI(); + str.Printf( wxT("Now at position %d\n\n"), (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Reading char from wxBufferedInputStream:\n\n" ); + + ch = buf_input.GetC(); + pos = buf_input.TellI(); + str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Reading another char from wxBufferedInputStream:\n\n" ); + + ch = buf_input.GetC(); + pos = buf_input.TellI(); + str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Now calling Ungetch( 5 ) from wxBufferedInputStream again...\n\n" ); + + buf_input.Ungetch( 5 ); + pos = buf_input.TellI(); + str.Printf( wxT("Now at position %d\n\n"), (int) pos ); + textCtrl.WriteText( str ); + + textCtrl.WriteText( "Seeking to pos 3 in wxBufferedInputStream. This invalidates the writeback buffer.\n\n" ); + + buf_input.SeekI( 3 ); + + ch = buf_input.GetC(); + pos = buf_input.TellI(); + str.Printf( wxT("Read char: %d. Now at position %d\n\n"), (int) ch, (int) pos ); + textCtrl.WriteText( str ); +} + #if wxUSE_UNICODE void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event)) { diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h index 2fa8ab0e0c..2c60f54424 100644 --- a/samples/typetest/typetest.h +++ b/samples/typetest/typetest.h @@ -36,6 +36,8 @@ public: void DoStreamDemo3(wxCommandEvent& event); void DoStreamDemo4(wxCommandEvent& event); void DoStreamDemo5(wxCommandEvent& event); + void DoStreamDemo6(wxCommandEvent& event); + void DoStreamDemo7(wxCommandEvent& event); #if wxUSE_UNICODE void DoUnicodeDemo(wxCommandEvent& event); #endif // wxUSE_UNICODE @@ -84,6 +86,8 @@ enum TYPES_STREAM3, TYPES_STREAM4, TYPES_STREAM5, + TYPES_STREAM6, + TYPES_STREAM7, TYPES_MIME }; -- 2.45.2