Commit cdce6c13 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'nina' of mmg-gitlab.fjfi.cvut.cz:mmg/tnl-dev into nina

parents 27eeb545 f041b082

src/TNL/FileName.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ class FileName 
      FileName( const String& fileNameBase, 

                const String& extension );

      



      /// \brief Sets the base name of given file.

      ///

      /// Sets \e fileNameBase as the base name of given file.

src/TNL/String.h

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ class String 
      /// \brief Destructor.

      ~String();



      /// Returns the number of characters in given string. Equivalent to \c getSize().

      /// \brief Returns the number of characters in given string. Equivalent to getSize().

      int getLength() const;



      /// \brief Returns the number of characters in given string.

src/UnitTests/StringTest.cpp

+1 −7
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ TEST( StringTest, split ) 
   ASSERT_EQ( list.getSize(), 1 );

   EXPECT_EQ( list[ 0 ], "abracadabra" );



   /// !!!! ma problem s prazdnym stringom !!!!

   // !!!! ma problem s prazdnym stringom !!!!

   String( "a,,b,c" ).split( list, ',' );

   ASSERT_EQ( list.getSize(), 4 );

   EXPECT_EQ( list[ 0 ], "a" );
@@ -351,12 +351,6 @@ TEST( StringTest, getLine ) 
   EXPECT_EQ( s, "Line 2" );

};



/*TEST( StringTest, OperatorCudny )

{

    String str("String1");

    EXPECT_EQ(strcmp(String( "a", str ), "aString1"), 0 );

};*/



#endif