real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Add failing test for TraceEntry. Fix TraceEntry.

Browse Source 
This was SVN commit r7046.
This commit is contained in:
Ykkrosh 2009-07-28 10:24:42 +00:00
parent cdfb58a62f
commit 4ee7e26776
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
source/lib/file/common/tests/test_trace.h Normal file
View File

@ -0,0 +1,58 @@
/* Copyright (C) 2009 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* 0 A.D. is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
#include "lib/self_test.h"
#include "lib/file/common/trace.h"
class TestTraceEntry : public CxxTest::TestSuite
{
public:
void test_entry()
{
char buf1[1024];
char buf2[1024];
TraceEntry t1(TraceEntry::Load, "example.txt", 1234);
TS_ASSERT_EQUALS(t1.Action(), TraceEntry::Load);
TS_ASSERT_STR_EQUALS(t1.Pathname(), "example.txt");
TS_ASSERT_EQUALS(t1.Size(), (size_t)1234);
t1.EncodeAsText(buf1, sizeof(buf1));
// The part before the ':' is an unpredictable timestamp,
// so just test the string after that point
TS_ASSERT_STR_EQUALS(strchr(buf1, ':'), ": L \"example.txt\" 1234\n");
TraceEntry t2(TraceEntry::Store, "example two.txt", 16777216);
TS_ASSERT_EQUALS(t2.Action(), TraceEntry::Store);
TS_ASSERT_STR_EQUALS(t2.Pathname(), "example two.txt");
TS_ASSERT_EQUALS(t2.Size(), (size_t)16777216);
t2.EncodeAsText(buf2, sizeof(buf2));
TS_ASSERT_STR_EQUALS(strchr(buf2, ':'), ": S \"example two.txt\" 16777216\n");
TraceEntry t3(buf1);
TS_ASSERT_EQUALS(t3.Action(), TraceEntry::Load);
TS_ASSERT_STR_EQUALS(t3.Pathname(), "example.txt");
TS_ASSERT_EQUALS(t3.Size(), (size_t)1234);
TraceEntry t4(buf2);
TS_ASSERT_EQUALS(t4.Action(), TraceEntry::Store);
TS_ASSERT_STR_EQUALS(t4.Pathname(), "example two.txt");
TS_ASSERT_EQUALS(t4.Size(), (size_t)16777216);
}
};

4
source/lib/file/common/trace.cpp
View File

@ -44,10 +44,10 @@ TraceEntry::TraceEntry(EAction action, const char* pathname, size_t size)
TraceEntry::TraceEntry(const char* text)
{
const char* fmt = "%f: %c \"" STRINGIZE(PATH_MAX) "[^\"]\" %d\n";
#define TRACE_FORMAT "%f: %c \"%" STRINGIZE(PATH_MAX) "[^\"]\" %d\n" /* use a macro to allow compile-time type-checking */
char pathname[PATH_MAX];
char action;
const int fieldsRead = sscanf_s(text, fmt, &m_timestamp, &action, pathname, &m_size);
const int fieldsRead = sscanf_s(text, TRACE_FORMAT, &m_timestamp, &action, pathname, &m_size);
debug_assert(fieldsRead == 4);
debug_assert(action == 'L' || action == 'S');
m_action = (EAction)action;