Index: src/libchengine/Tests/TestsTFileFilter.cpp =================================================================== diff -u -N -r07f5ed57f11f0b908313f692fc4830401f0db552 -r2190633f7d79d51e3cb0b9a3a5349c439ef0b533 --- src/libchengine/Tests/TestsTFileFilter.cpp (.../TestsTFileFilter.cpp) (revision 07f5ed57f11f0b908313f692fc4830401f0db552) +++ src/libchengine/Tests/TestsTFileFilter.cpp (.../TestsTFileFilter.cpp) (revision 2190633f7d79d51e3cb0b9a3a5349c439ef0b533) @@ -2,6 +2,7 @@ #include "gtest/gtest.h" #include "gmock/gmock.h" #include "../TFileFilter.h" +#include "../ECompareType.h" using namespace chengine; @@ -19,26 +20,26 @@ EXPECT_STREQ(L"", filter.GetCombinedExcludeMask().c_str()); EXPECT_EQ(false, filter.GetUseSize1()); - EXPECT_EQ(TFileFilter::eSizeCmp_Greater, filter.GetSizeType1()); + EXPECT_EQ(eCmp_Greater, filter.GetSizeType1()); EXPECT_EQ(0, filter.GetSize1()); EXPECT_EQ(false, filter.GetUseSize2()); - EXPECT_EQ(TFileFilter::eSizeCmp_Less, filter.GetSizeType2()); + EXPECT_EQ(eCmp_Less, filter.GetSizeType2()); EXPECT_EQ(0, filter.GetSize2()); // dates EXPECT_EQ(TFileFilter::eDateType_Created, filter.GetDateType()); // date 1 EXPECT_EQ(false, filter.GetUseDateTime1()); - EXPECT_EQ(TFileFilter::eDateCmp_Greater, filter.GetDateCmpType1()); + EXPECT_EQ(eCmp_Greater, filter.GetDateCmpType1()); EXPECT_EQ(false, filter.GetUseDate1()); EXPECT_EQ(false, filter.GetUseTime1()); // EXPECT_EQ(TDateTime(), filter.GetDateTime1()); // date 2 EXPECT_EQ(false, filter.GetUseDateTime2()); - EXPECT_EQ(TFileFilter::eDateCmp_Less, filter.GetDateCmpType2()); + EXPECT_EQ(eCmp_Less, filter.GetDateCmpType2()); EXPECT_EQ(false, filter.GetUseDate2()); EXPECT_EQ(false, filter.GetUseTime2()); // EXPECT_EQ(TDateTime(), filter.GetDateTime2());