Skip to content

Add unit tests for subdirectory lookup #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asarium wants to merge 1 commit into
base: eff_subdirs
Choose a base branch
from
Open

Add unit tests for subdirectory lookup #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions test/src/cfile/test_cfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

#include <gtest/gtest.h>

#include <cfile/cfile.h>

#include "util/FSTestFixture.h"

class CFileTest : public test::FSTestFixture {
public:
CFileTest() : test::FSTestFixture(0) {
pushModDir("cfile");
Copy link
Owner

@ln-zookeeper ln-zookeeper Dec 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand the hows and whys, but there seems to be something wrong with the ways directories are handled in these tests. Changing this line to pushModDir("cfile/temp_subdir") makes the temp_subdir tests work, and changing it to pushModDir("cfile/temp_subdir_vps") makes the temp_subdir_vps tests work. Added debugging statements say that all file lookup happens relative to test_data/cfile/, not relative to test_data/cfile/temp_subdir/ and test_data/cfile/temp_subdir_vps/ as it should.

However, I don't know why for example adding a test like ASSERT_TRUE(cf_exists_full("test.eff", CF_TYPE_ANY)) doesn't cause a(nother) failure. Debug output tells me that it looks in the wrong path (as described above), yet that doesn't cause the test to fail.

Copy link
Author

@asarium asarium Dec 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pushModDir simply adds another -mod parameter so it seems like the subdirectory implementation doesn't handle mods correctly.

}
};

TEST_F(CFileTest, temp_subdir) {
ASSERT_FALSE(cf_exists_full("test_001.dds", CF_TYPE_ANY));

ASSERT_TRUE(cf_set_temp_subdir_pathtype("test.eff"));

ASSERT_TRUE(cf_exists_full("test_001.dds", CF_TYPE_ANY));
}

TEST_F(CFileTest, temp_subdir_vps) {
ASSERT_FALSE(cf_exists_full("test_001.dds", CF_TYPE_ANY));

ASSERT_TRUE(cf_set_temp_subdir_pathtype("test.eff"));

ASSERT_TRUE(cf_exists_full("test_001.dds", CF_TYPE_ANY));
}
4 changes: 4 additions & 0 deletions test/src/source_groups.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ add_file_folder(root ""
test_stubs.cpp
)

add_file_folder(graphics "CFile"
cfile/test_cfile.cpp
)

add_file_folder(graphics "Globalincs"
globalincs/test_flagset.cpp
globalincs/test_safe_strings.cpp
Expand Down
1 change: 1 addition & 0 deletions test/test_data/cfile/temp_subdir/data/effects/test.eff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Dummy file
1 change: 1 addition & 0 deletions test/test_data/cfile/temp_subdir/data/effects/test/test_001.dds
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dummy content
Binary file added test/test_data/cfile/temp_subdir_vps/test.vp
View file
Open in desktop
Binary file not shown.