Commit 75e29571 authored by Nina Džugasová's avatar Nina Džugasová
Browse files

More StringExamples and added FileNameTest

parent 803c5c5f

src/Examples/StringExample.cpp

+37 −11
Original line number Diff line number Diff line
@@ -108,5 +108,31 @@ int main() 
    new_phrase = phrase.replace( "a", "u", 2 );

    cout << "new_phrase:" << new_phrase << endl;



    // strip

    String names("       Josh Martin   John  Marley Charles   ");

    better_names = names.strip();

    cout << "better_names:" << better_names << endl;



    // split

    String dates("3/4/2005;8/7/2011;11/12/2019");

    list_dates = dates.split( list, ';' );

    cout << "list_dates:" << list_dates << endl;



    // save

    String("Header").save(my-file.tnl); // saves "Header" into file my-file.tnl



    // load

    String strg;

    strg.load(my-file.tnl);

    cout << "strg:" << strg << endl;



    // get line

    std::stringstream text;

    text << "Hello!" << std::endl;

    text << "What's up?" << std::endl;



    String str;

    str.getLine( text );

    cout << "str:" << str << endl;



}

src/Examples/StringExample.out

+14 −2
Original line number Diff line number Diff line
@@ -38,3 +38,15 @@ String is empty. 
        

// replace

new_phrase: Hukunu matata



// strip

list_dates: 3/4/2005 8/7/2011 11/12/2019



// save

true



// load

strg: Header



// get line

str: Hello!
 
 No newline at end of file

src/TNL/String.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ String convertToString( const T& value ); 
/// \par Example

/// \include StringExample.cpp

/// \par Output

/// \include StringOutput.cpp

/// \include StringExample.out

class String

{

   public:

src/UnitTests/FileNameTest.cpp

+50 −9
Original line number Diff line number Diff line
@@ -15,22 +15,63 @@ 
#endif



#include <TNL/FileName.h>

#include <TNL/String.h>



using namespace TNL;



#ifdef HAVE_GTEST 

TEST( FileNameTest, Constructor )

{

   /*String str1( "string1" );

   String str2( "xxxstring2", 3 );

   String str3( "string3xxx", 0, 3 );

   String str4( "xxxstring4xxx", 3, 3 );



   EXPECT_EQ( strcmp( str1.getString(), "string1" ), 0 );

   EXPECT_EQ( strcmp( str2.getString(), "string2" ), 0 );

   EXPECT_EQ( strcmp( str3.getString(), "string3" ), 0 );

   EXPECT_EQ( strcmp( str4.getString(), "string4" ), 0 );*/

    FileName fname;



    EXPECT_EQ( strcmp( fname.getFileName(), "00000." ), 0 );

}



TEST( FileNameTest, Base )

{

    FileName fname;

    fname.setFileNameBase("name");



    EXPECT_EQ( strcmp( fname.getFileName(), "name00000." ), 0 );

}



/*TEST( FileNameTest, Extension )

{

    FileName fname;

    fname.setExtension("tnl");



    EXPECT_EQ( strcmp( fname.getFileName(), "00000.tnl" ), 0 );

}*/



/*TEST( FileNameTest, Index )

{

    FileName fname1;

    FileName fname2;

    fname1.setIndex(1);

    fname2.setIndex(50);



    EXPECT_EQ( strcmp( fname1.getFileName(), "00001." ), 0 );

    EXPECT_EQ( strcmp( fname2.getFileName(), "00050." ), 0 );

}*/



/*TEST( FileNameTest, DigitsCount )

{

    FileName fname;

    fname.setDigitsCount(4);



    EXPECT_EQ( strcmp( fname.getFileName(), "0000." ), 0 );

}



TEST( FileNameTest, AllTogether )

{

    FileName fname;

    fname.setFileNameBase("name");

    fname.setExtension("tnl");

    fname.setIndex(8);

    fname.setDigitsCount(3);



    EXPECT_EQ( strcmp( fname.getFileName(), "name008.tnl" ), 0 );

}*/

#endif

src/UnitTests/StringTest.cpp

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 


/* See Copyright Notice in tnl/Copyright */



// Implemented by Nina Dzugasova



#ifdef HAVE_GTEST 

#include <gtest/gtest.h>

#endif