IO: removed unused methods from File class and moved tests

vengi-voxel · Feb 13, 2025 · e51a562 · e51a562
1 parent 3be7e36
commit e51a562
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 24 deletions.
diff --git a/src/modules/io/File.cpp b/src/modules/io/File.cpp
@@ -101,18 +101,6 @@ bool File::validHandle() const {
 	return _file != nullptr;
 }
 
-bool File::isAnyOf(const io::FormatDescription* desc) const {
-	const core::String& ext = extension();
-	while (desc->valid()) {
-		if (desc->matchesExtension(ext)) {
-			// TODO: isA check
-			return true;
-		}
-		++desc;
-	}
-	return false;
-}
-
 bool File::exists() const {
 	if (_mode == FileMode::Read || _mode == FileMode::SysRead) {
 		return _file != nullptr;

diff --git a/src/modules/io/File.h b/src/modules/io/File.h
@@ -80,8 +80,6 @@ class File : public IOResource {
 	long tell() const;
 	long seek(long offset, int seekType) const;
 
-	bool isAnyOf(const io::FormatDescription* desc) const;
-
 	/**
 	 * @return The FileMode the file was opened with
 	 */

diff --git a/src/modules/io/tests/FileTest.cpp b/src/modules/io/tests/FileTest.cpp
@@ -1,22 +1,12 @@
 #include "app/tests/AbstractTest.h"
 #include "core/StringUtil.h"
 #include "io/Filesystem.h"
-#include "io/FormatDescription.h"
 #include <gtest/gtest.h>
 
 namespace io {
 
 class FileTest : public app::AbstractTest {};
 
-TEST_F(FileTest, testIsAnyOf) {
-	io::Filesystem fs;
-	fs.init("test", "test");
-
-	const io::FilePtr &img = fs.open("image.png");
-	EXPECT_TRUE(img->isAnyOf(io::format::images()));
-	EXPECT_FALSE(img->isAnyOf(io::format::lua()));
-}
-
 TEST_F(FileTest, testGetPath) {
 	io::Filesystem fs;
 	fs.init("test", "test");

diff --git a/src/modules/io/tests/FormatDescriptionTest.cpp b/src/modules/io/tests/FormatDescriptionTest.cpp
@@ -6,6 +6,11 @@ namespace io {
 class FormatDescriptionTest: public testing::Test {
 };
 
+TEST_F(FormatDescriptionTest, testIsA) {
+	EXPECT_TRUE(isA("image.png", io::format::images()));
+	EXPECT_FALSE(isA("something.else", io::format::lua()));
+}
+
 TEST_F(FormatDescriptionTest, testIsImage) {
 	ASSERT_TRUE(isImage("foobar.PNG"));
 	ASSERT_TRUE(isImage("foobar.png"));