Skip to content

Commit 3ba27a2

Browse files
committed
Fix borken tests.
1 parent 9a7e4f6 commit 3ba27a2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

ModLoader/ModLoader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void commonItems::ModLoader::loadMods(const std::string& gameDocumentsPath, cons
2929
{
3030
#pragma warning(push)
3131
#pragma warning(disable : 4996)
32-
loadMods(std::vector<std::string>{gameDocumentsPath + "mod"}, incomingMods);
32+
loadMods(std::vector<std::string>{gameDocumentsPath + "/mod"}, incomingMods);
3333
#pragma warning(pop)
3434
}
3535

tests/ModLoaderTests.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ TEST(ModLoaderTests, ModsByPathCanBeLocatedUnpackedAndUpdated)
4848

4949
ASSERT_EQ(mods.size(), 1);
5050
EXPECT_EQ(mods[0].name, "The Mod");
51-
EXPECT_EQ(mods[0].path.string(), "GameDocumentsFolder\\mod\\themodsfolder");
51+
EXPECT_EQ(mods[0].path.string(), "GameDocumentsFolder/mod\\themodsfolder/");
5252
EXPECT_THAT(mods[0].dependencies, UnorderedElementsAre("Packed Mod", "Missing Mod"));
5353
#pragma warning(pop)
5454
}
@@ -68,7 +68,7 @@ TEST(ModLoaderTests, ModsByNameCanBeLocatedUnpackedAndUpdated)
6868

6969
ASSERT_EQ(mods.size(), 1);
7070
EXPECT_EQ(mods[0].name, "The Mod");
71-
EXPECT_EQ(mods[0].path.string(), "GameDocumentsFolder\\mod\\themodsfolder");
71+
EXPECT_EQ(mods[0].path.string(), "GameDocumentsFolder/mod\\themodsfolder/");
7272
EXPECT_THAT(mods[0].dependencies, UnorderedElementsAre("Packed Mod", "Missing Mod"));
7373
#pragma warning(pop)
7474
}
@@ -88,7 +88,7 @@ TEST(ModLoaderTests, ModsByNameCanBeLocatedByMetadataUnpackedAndUpdated)
8888

8989
ASSERT_EQ(mods.size(), 1);
9090
EXPECT_EQ(mods[0].name, "The Metadata Mod");
91-
EXPECT_EQ(mods[0].path.string(), "GameDocumentsFolder\\mod\\the_metadata_mod");
91+
EXPECT_EQ(mods[0].path.string(), "GameDocumentsFolder/mod\\the_metadata_mod/");
9292
EXPECT_THAT(mods[0].replacedFolders, testing::UnorderedElementsAre("replaced/path", "replaced/path/two"));
9393
#pragma warning(pop)
9494
}
@@ -111,7 +111,7 @@ TEST(ModLoaderTests, BrokenMissingAndNonexistentModsAreDiscarded)
111111

112112
ASSERT_EQ(mods.size(), 1);
113113
EXPECT_EQ(mods[0].name, "The Mod");
114-
EXPECT_EQ(mods[0].path.string(), "GameDocumentsFolder\\mod\\themodsfolder");
114+
EXPECT_EQ(mods[0].path.string(), "GameDocumentsFolder/mod\\themodsfolder/");
115115
#pragma warning(pop)
116116
}
117117

@@ -130,7 +130,7 @@ TEST(ModLoaderTests, CompressedModsCanBeUnpacked)
130130

131131
ASSERT_EQ(mods.size(), 1);
132132
EXPECT_EQ(mods[0].name, "Packed Mod");
133-
EXPECT_EQ(mods[0].path.string(), "mods\\packedmod");
133+
EXPECT_EQ(mods[0].path.string(), "mods\\packedmod/");
134134
EXPECT_TRUE(commonItems::DoesFolderExist(mods[0].path));
135135
#pragma warning(pop)
136136
}

0 commit comments

Comments
 (0)