Skip to content

Commit beb0077

Browse files
authored
Merge pull request #205 from scratchcpp/rename_md5ext
Rename Asset::md5ext() to Asset::fileName()
2 parents 483c506 + c7865ec commit beb0077

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

include/scratchcpp/asset.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class LIBSCRATCHCPP_EXPORT Asset : public Entity
2222

2323
const std::string &name() const;
2424

25-
const std::string &md5ext() const;
25+
const std::string &fileName() const;
2626

2727
const std::string &dataFormat() const;
2828

src/scratch/asset.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const std::string &Asset::name() const
2828
}
2929

3030
/*! Returns the name of the asset file. */
31-
const std::string &Asset::md5ext() const
31+
const std::string &Asset::fileName() const
3232
{
3333
return impl->fileName;
3434
}

test/assets/asset_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ TEST(AssetTest, Constructors)
1010
ASSERT_EQ(asset.id(), "a");
1111
ASSERT_EQ(asset.name(), "costume1");
1212
ASSERT_EQ(asset.dataFormat(), "svg");
13-
ASSERT_EQ(asset.md5ext(), "a.svg");
13+
ASSERT_EQ(asset.fileName(), "a.svg");
1414
}
1515

1616
TEST(AssetTest, Id)
@@ -19,5 +19,5 @@ TEST(AssetTest, Id)
1919

2020
asset.setId("b");
2121
ASSERT_EQ(asset.id(), "b");
22-
ASSERT_EQ(asset.md5ext(), "b.svg");
22+
ASSERT_EQ(asset.fileName(), "b.svg");
2323
}

test/assets/costume_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ TEST(CostumeTest, Constructors)
1010
ASSERT_EQ(costume.id(), "a");
1111
ASSERT_EQ(costume.name(), "costume1");
1212
ASSERT_EQ(costume.dataFormat(), "svg");
13-
ASSERT_EQ(costume.md5ext(), "a.svg");
13+
ASSERT_EQ(costume.fileName(), "a.svg");
1414
ASSERT_EQ(costume.bitmapResolution(), 1);
1515
ASSERT_EQ(costume.rotationCenterX(), 0);
1616
ASSERT_EQ(costume.rotationCenterY(), 0);

test/assets/sound_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ TEST(SoundTest, Constructors)
1010
ASSERT_EQ(sound.id(), "a");
1111
ASSERT_EQ(sound.name(), "sound1");
1212
ASSERT_EQ(sound.dataFormat(), "svg");
13-
ASSERT_EQ(sound.md5ext(), "a.svg");
13+
ASSERT_EQ(sound.fileName(), "a.svg");
1414
ASSERT_EQ(sound.rate(), 0);
1515
ASSERT_EQ(sound.sampleCount(), 0);
1616
}

test/load_project/load_project_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ TEST(LoadProjectTest, EmptyProject)
5252
auto backdrop = stage->costumeAt(0);
5353
ASSERT_EQ(backdrop->name(), "backdrop1");
5454
ASSERT_FALSE(backdrop->id().empty());
55-
ASSERT_EQ(backdrop->md5ext(), backdrop->id() + ".svg");
55+
ASSERT_EQ(backdrop->fileName(), backdrop->id() + ".svg");
5656
ASSERT_EQ(backdrop->dataFormat(), "svg");
5757

5858
i++;
@@ -111,7 +111,7 @@ TEST(LoadProjectTest, LoadTestProject)
111111
auto sound = sprite1->soundAt(0);
112112
ASSERT_EQ(sound->name(), "Meow");
113113
ASSERT_FALSE(sound->id().empty());
114-
ASSERT_EQ(sound->md5ext(), sound->id() + ".wav");
114+
ASSERT_EQ(sound->fileName(), sound->id() + ".wav");
115115
ASSERT_EQ(sound->dataFormat(), "wav");
116116

117117
// Sprite1: variables
@@ -240,7 +240,7 @@ TEST(LoadProjectTest, LoadTestProject)
240240
sound = sprite2->soundAt(0);
241241
ASSERT_EQ(sound->name(), "Pop");
242242
ASSERT_FALSE(sound->id().empty());
243-
ASSERT_EQ(sound->md5ext(), sound->id() + ".wav");
243+
ASSERT_EQ(sound->fileName(), sound->id() + ".wav");
244244
ASSERT_EQ(sound->dataFormat(), "wav");
245245

246246
// Balloon1: variables

0 commit comments

Comments
 (0)