Skip to content

Commit

Permalink
TESTS: Replace ScopedPtr/ScopedArray with std::unique_ptr
Browse files Browse the repository at this point in the history
  • Loading branch information
@DrMcCoy
DrMcCoy committed Aug 11, 2020
1 parent 424cade commit e57091f
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 49 deletions.
40 changes: 20 additions & 20 deletions tests/aurora/erfwriter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ GTEST_TEST(ERFWriter, WriteFile) {
Common::SeekableReadStream *readStream = erf.getResource(0);
ASSERT_EQ(readStream->size(), kFileDataSize);

Common::ScopedArray<byte> fileData(new byte[readStream->size()]);
std::unique_ptr<byte[]> fileData = std::make_unique<byte[]>(readStream->size());
readStream->read(fileData.get(), readStream->size());

for (size_t i = 0; i < kFileDataSize; ++i) {
Expand Down Expand Up @@ -517,11 +517,11 @@ GTEST_TEST(ERFWriter, WriteMultipleFiles) {
Common::SeekableReadStream *readStream3 = erf.getResource(2);
ASSERT_EQ(readStream3->size(), kLogoDataSize);

Common::ScopedArray<byte> fileData1(new byte[readStream1->size()]);
std::unique_ptr<byte[]> fileData1 = std::make_unique<byte[]>(readStream1->size());
readStream1->read(fileData1.get(), readStream1->size());
Common::ScopedArray<byte> fileData2(new byte[readStream2->size()]);
std::unique_ptr<byte[]> fileData2 = std::make_unique<byte[]>(readStream2->size());
readStream2->read(fileData2.get(), readStream2->size());
Common::ScopedArray<byte> fileData3(new byte[readStream3->size()]);
std::unique_ptr<byte[]> fileData3 = std::make_unique<byte[]>(readStream3->size());
readStream3->read(fileData3.get(), readStream3->size());

for (size_t i = 0; i < kFileDataSize; ++i) {
Expand Down Expand Up @@ -570,7 +570,7 @@ GTEST_TEST(ERFWriter, WriteFileV20) {
Common::SeekableReadStream *readStream = erf.getResource(0);
ASSERT_EQ(readStream->size(), kFileDataSize);

Common::ScopedArray<byte> fileData(new byte[readStream->size()]);
std::unique_ptr<byte[]> fileData = std::make_unique<byte[]>(readStream->size());
readStream->read(fileData.get(), readStream->size());

for (size_t i = 0; i < kFileDataSize; ++i) {
Expand Down Expand Up @@ -614,11 +614,11 @@ GTEST_TEST(ERFWriter, WriteMultipleFilesV20) {
Common::SeekableReadStream *readStream3 = erf.getResource(2);
ASSERT_EQ(readStream3->size(), kLogoDataSize);

Common::ScopedArray<byte> fileData1(new byte[readStream1->size()]);
std::unique_ptr<byte[]> fileData1 = std::make_unique<byte[]>(readStream1->size());
readStream1->read(fileData1.get(), readStream1->size());
Common::ScopedArray<byte> fileData2(new byte[readStream2->size()]);
std::unique_ptr<byte[]> fileData2 = std::make_unique<byte[]>(readStream2->size());
readStream2->read(fileData2.get(), readStream2->size());
Common::ScopedArray<byte> fileData3(new byte[readStream3->size()]);
std::unique_ptr<byte[]> fileData3 = std::make_unique<byte[]>(readStream3->size());
readStream3->read(fileData3.get(), readStream3->size());

for (size_t i = 0; i < kFileDataSize; ++i) {
Expand Down Expand Up @@ -667,7 +667,7 @@ GTEST_TEST(ERFWriter, WriteFileV22) {
Common::SeekableReadStream *readStream = erf.getResource(0);
ASSERT_EQ(readStream->size(), kFileDataSize);

Common::ScopedArray<byte> fileData(new byte[readStream->size()]);
std::unique_ptr<byte[]> fileData = std::make_unique<byte[]>(readStream->size());
readStream->read(fileData.get(), readStream->size());

for (size_t i = 0; i < kFileDataSize; ++i) {
Expand Down Expand Up @@ -711,11 +711,11 @@ GTEST_TEST(ERFWriter, WriteMultipleFilesV22) {
Common::SeekableReadStream *readStream3 = erf.getResource(2);
ASSERT_EQ(readStream3->size(), kLogoDataSize);

Common::ScopedArray<byte> fileData1(new byte[readStream1->size()]);
std::unique_ptr<byte[]> fileData1 = std::make_unique<byte[]>(readStream1->size());
readStream1->read(fileData1.get(), readStream1->size());
Common::ScopedArray<byte> fileData2(new byte[readStream2->size()]);
std::unique_ptr<byte[]> fileData2 = std::make_unique<byte[]>(readStream2->size());
readStream2->read(fileData2.get(), readStream2->size());
Common::ScopedArray<byte> fileData3(new byte[readStream3->size()]);
std::unique_ptr<byte[]> fileData3 = std::make_unique<byte[]>(readStream3->size());
readStream3->read(fileData3.get(), readStream3->size());

for (size_t i = 0; i < kFileDataSize; ++i) {
Expand Down Expand Up @@ -753,7 +753,7 @@ GTEST_TEST(ERFWriter, WriteFileV22BiowareZlib) {
Common::SeekableReadStream *readStream = erf.getResource(0);
ASSERT_EQ(readStream->size(), kFileDataSize);

Common::ScopedArray<byte> fileData(new byte[readStream->size()]);
std::unique_ptr<byte[]> fileData = std::make_unique<byte[]>(readStream->size());
readStream->read(fileData.get(), readStream->size());

for (size_t i = 0; i < kFileDataSize; ++i) {
Expand Down Expand Up @@ -797,11 +797,11 @@ GTEST_TEST(ERFWriter, WriteMultipleFilesV22BiowareZlib) {
Common::SeekableReadStream *readStream3 = erf.getResource(2);
ASSERT_EQ(readStream3->size(), kLogoDataSize);

Common::ScopedArray<byte> fileData1(new byte[readStream1->size()]);
std::unique_ptr<byte[]> fileData1 = std::make_unique<byte[]>(readStream1->size());
readStream1->read(fileData1.get(), readStream1->size());
Common::ScopedArray<byte> fileData2(new byte[readStream2->size()]);
std::unique_ptr<byte[]> fileData2 = std::make_unique<byte[]>(readStream2->size());
readStream2->read(fileData2.get(), readStream2->size());
Common::ScopedArray<byte> fileData3(new byte[readStream3->size()]);
std::unique_ptr<byte[]> fileData3 = std::make_unique<byte[]>(readStream3->size());
readStream3->read(fileData3.get(), readStream3->size());

for (size_t i = 0; i < kFileDataSize; ++i) {
Expand Down Expand Up @@ -839,7 +839,7 @@ GTEST_TEST(ERFWriter, WriteFileV22HeaderlessZlib) {
Common::SeekableReadStream *readStream = erf.getResource(0);
ASSERT_EQ(readStream->size(), kFileDataSize);

Common::ScopedArray<byte> fileData(new byte[readStream->size()]);
std::unique_ptr<byte[]> fileData = std::make_unique<byte[]>(readStream->size());
readStream->read(fileData.get(), readStream->size());

for (size_t i = 0; i < kFileDataSize; ++i) {
Expand Down Expand Up @@ -883,11 +883,11 @@ GTEST_TEST(ERFWriter, WriteMultipleFilesV22HeaderlessZlib) {
Common::SeekableReadStream *readStream3 = erf.getResource(2);
ASSERT_EQ(readStream3->size(), kLogoDataSize);

Common::ScopedArray<byte> fileData1(new byte[readStream1->size()]);
std::unique_ptr<byte[]> fileData1 = std::make_unique<byte[]>(readStream1->size());
readStream1->read(fileData1.get(), readStream1->size());
Common::ScopedArray<byte> fileData2(new byte[readStream2->size()]);
std::unique_ptr<byte[]> fileData2 = std::make_unique<byte[]>(readStream2->size());
readStream2->read(fileData2.get(), readStream2->size());
Common::ScopedArray<byte> fileData3(new byte[readStream3->size()]);
std::unique_ptr<byte[]> fileData3 = std::make_unique<byte[]>(readStream3->size());
readStream3->read(fileData3.get(), readStream3->size());

for (size_t i = 0; i < kFileDataSize; ++i) {
Expand Down
8 changes: 4 additions & 4 deletions tests/aurora/thewitchersavewriter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ GTEST_TEST(TheWitcherSaveWriter, WriteFile) {
Common::SeekableReadStream *readStream = tws.getResource(0);
ASSERT_EQ(readStream->size(), kFileDataSize);

Common::ScopedArray<byte> fileData(new byte[readStream->size()]);
std::unique_ptr<byte[]> fileData = std::make_unique<byte[]>(readStream->size());
readStream->read(fileData.get(), readStream->size());

for (size_t i = 0; i < kFileDataSize; ++i) {
Expand Down Expand Up @@ -478,11 +478,11 @@ GTEST_TEST(TheWitcherSaveWriter, WriteMultipleFiles) {
Common::SeekableReadStream *readStream3 = tws.getResource(2);
ASSERT_EQ(readStream3->size(), kLogoDataSize);

Common::ScopedArray<byte> fileData1(new byte[readStream1->size()]);
std::unique_ptr<byte[]> fileData1 = std::make_unique<byte[]>(readStream1->size());
readStream1->read(fileData1.get(), readStream1->size());
Common::ScopedArray<byte> fileData2(new byte[readStream2->size()]);
std::unique_ptr<byte[]> fileData2 = std::make_unique<byte[]>(readStream2->size());
readStream2->read(fileData2.get(), readStream2->size());
Common::ScopedArray<byte> fileData3(new byte[readStream3->size()]);
std::unique_ptr<byte[]> fileData3 = std::make_unique<byte[]>(readStream3->size());
readStream3->read(fileData3.get(), readStream3->size());

for (size_t i = 0; i < kFileDataSize; ++i) {
Expand Down
19 changes: 9 additions & 10 deletions tests/engines/nwn2/creature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "tests/engines/nwn2/creature3.h"

#include "src/common/memreadstream.h"
#include "src/common/scopedptr.h"
#include "src/common/error.h"

#include "src/aurora/gff3file.h"
Expand All @@ -44,10 +43,10 @@
static const float kEpsilon = 1e-5f;

GTEST_TEST(NWN2Creature, creature1) {
Common::ScopedPtr<Common::MemoryReadStream> stream(new Common::MemoryReadStream(kDataCreature1));
std::unique_ptr<Common::MemoryReadStream> stream = std::make_unique<Common::MemoryReadStream>(kDataCreature1);
if (!stream)
throw Common::Exception("No test data available");
Common::ScopedPtr<Aurora::GFF3File> gff(new Aurora::GFF3File(stream.release(), MKTAG('G', 'I', 'T', ' ')));
std::unique_ptr<Aurora::GFF3File> gff = std::make_unique<Aurora::GFF3File>(stream.release(), MKTAG('G', 'I', 'T', ' '));

// Get the creature list
const Aurora::GFF3Struct &top = gff->getTopLevel();
Expand All @@ -56,7 +55,7 @@ GTEST_TEST(NWN2Creature, creature1) {

// Get the creature data
Aurora::GFF3List::const_iterator it = crlist.begin();
Common::ScopedPtr<Engines::NWN2::Creature> cr(new Engines::NWN2::Creature(**it));
std::unique_ptr<Engines::NWN2::Creature> cr = std::make_unique<Engines::NWN2::Creature>(**it);

EXPECT_STREQ(cr->getTag().c_str(), "c_halforc");
EXPECT_STREQ(cr->getFirstName().c_str(), "[???]"); // Should be "Orcus"
Expand Down Expand Up @@ -110,14 +109,14 @@ GTEST_TEST(NWN2Creature, creature1) {
}

GTEST_TEST(NWN2Creature, creature2) {
Common::ScopedPtr<Common::MemoryReadStream> stream(new Common::MemoryReadStream(kDataCreature2));
std::unique_ptr<Common::MemoryReadStream> stream = std::make_unique<Common::MemoryReadStream>(kDataCreature2);
if (!stream)
throw Common::Exception("No test data available");
Common::ScopedPtr<Aurora::GFF3File> gff(new Aurora::GFF3File(stream.release(), MKTAG('B', 'I', 'C', ' ')));
std::unique_ptr<Aurora::GFF3File> gff = std::make_unique<Aurora::GFF3File>(stream.release(), MKTAG('B', 'I', 'C', ' '));

// Load the PC
const Aurora::GFF3Struct &top = gff->getTopLevel();
Common::ScopedPtr<Engines::NWN2::Creature> cr(new Engines::NWN2::Creature(top));
std::unique_ptr<Engines::NWN2::Creature> cr = std::make_unique<Engines::NWN2::Creature>(top);

EXPECT_EQ(cr->getRace(), 21);
EXPECT_EQ(cr->getSubRace(), 20);
Expand Down Expand Up @@ -166,14 +165,14 @@ GTEST_TEST(NWN2Creature, creature2) {
}

GTEST_TEST(NWN2Creature, inventory) {
Common::ScopedPtr<Common::MemoryReadStream> stream(new Common::MemoryReadStream(kDataCreature3));
std::unique_ptr<Common::MemoryReadStream> stream = std::make_unique<Common::MemoryReadStream>(kDataCreature3);
if (!stream)
throw Common::Exception("No test data available");
Common::ScopedPtr<Aurora::GFF3File> gff(new Aurora::GFF3File(stream.release(), MKTAG('R', 'O', 'S', ' ')));
std::unique_ptr<Aurora::GFF3File> gff = std::make_unique<Aurora::GFF3File>(stream.release(), MKTAG('R', 'O', 'S', ' '));

// Load the PC
const Aurora::GFF3Struct &top = gff->getTopLevel();
Common::ScopedPtr<Engines::NWN2::Creature> cr(new Engines::NWN2::Creature(top));
std::unique_ptr<Engines::NWN2::Creature> cr = std::make_unique<Engines::NWN2::Creature>(top);

EXPECT_STREQ(cr->getTag().c_str(), "elanee");

Expand Down
9 changes: 5 additions & 4 deletions tests/engines/nwn2/door.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
* Unit tests for NWN2 door objects.
*/

#include <memory>

#include "gtest/gtest.h"

#include "tests/engines/nwn2/door.h"

#include "src/common/memreadstream.h"
#include "src/common/scopedptr.h"
#include "src/common/error.h"

#include "src/aurora/gff3file.h"
Expand All @@ -40,10 +41,10 @@
static const float kEpsilon = 1e-5f;

Engines::NWN2::Door *getDoor(const unsigned int index) {
Common::ScopedPtr<Common::MemoryReadStream> stream(new Common::MemoryReadStream(kDataDoor));
std::unique_ptr<Common::MemoryReadStream> stream = std::make_unique<Common::MemoryReadStream>(kDataDoor);
if (!stream)
throw Common::Exception("No test data available");
Common::ScopedPtr<Aurora::GFF3File> gff(new Aurora::GFF3File(stream.release(), MKTAG('G', 'I', 'T', ' ')));
std::unique_ptr<Aurora::GFF3File> gff = std::make_unique<Aurora::GFF3File>(stream.release(), MKTAG('G', 'I', 'T', ' '));

// Get the door list
const Aurora::GFF3Struct &top = gff->getTopLevel();
Expand All @@ -55,7 +56,7 @@ Engines::NWN2::Door *getDoor(const unsigned int index) {
Aurora::GFF3List::const_iterator it = doorList.begin();
it += index;

std::unique_ptr<Engines::NWN2::Module> module(new Engines::NWN2::Module());
std::unique_ptr<Engines::NWN2::Module> module = std::make_unique<Engines::NWN2::Module>();
return new Engines::NWN2::Door(*module, **it);
}

Expand Down
12 changes: 6 additions & 6 deletions tests/engines/nwn2/roster.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
class TestRoster : public Engines::NWN2::Roster {
public:
TestRoster() {
Common::ScopedPtr<Common::MemoryReadStream> stream(new Common::MemoryReadStream(kDataRoster));
std::unique_ptr<Common::MemoryReadStream> stream = std::make_unique<Common::MemoryReadStream>(kDataRoster);
if (!stream)
throw Common::Exception("No test data available");
Common::ScopedPtr<Aurora::GFF3File> gff(new Aurora::GFF3File(stream.release(), MKTAG('R', 'S', 'T', ' ')));
std::unique_ptr<Aurora::GFF3File> gff = std::make_unique<Aurora::GFF3File>(stream.release(), MKTAG('R', 'S', 'T', ' '));
const Aurora::GFF3Struct &top = gff->getTopLevel();

// Insert the roster members
Expand All @@ -58,7 +58,7 @@ class TestRoster : public Engines::NWN2::Roster {
*/

GTEST_TEST(NWN2Roster, rosterNames) {
std::unique_ptr<TestRoster> roster(new TestRoster);
std::unique_ptr<TestRoster> roster = std::make_unique<TestRoster>();

EXPECT_STREQ(roster->getFirstRosterMember().c_str(), "ammon_jerro");
EXPECT_STREQ(roster->getNextRosterMember().c_str(), "bishop");
Expand All @@ -82,7 +82,7 @@ GTEST_TEST(NWN2Roster, rosterNames) {
* Test the roster member settings in the ROSTER.rst file data.
*/
GTEST_TEST(NWN2Roster, rosterSettings) {
std::unique_ptr<TestRoster> roster(new TestRoster);
std::unique_ptr<TestRoster> roster = std::make_unique<TestRoster>();

EXPECT_TRUE(roster->getIsRosterMemberAvailable("ammon_jerro"));
EXPECT_FALSE(roster->getIsRosterMemberAvailable("khelgar"));
Expand All @@ -96,7 +96,7 @@ GTEST_TEST(NWN2Roster, rosterSettings) {
* Test the Roster class 'set' calls.
*/
GTEST_TEST(NWN2Roster, rosterSetCalls) {
std::unique_ptr<Engines::NWN2::Roster> roster(new Engines::NWN2::Roster);
std::unique_ptr<Engines::NWN2::Roster> roster = std::make_unique<Engines::NWN2::Roster>();

// Bypass the ResMan resource check by inserting "[GTEST]" at the template start
EXPECT_TRUE(roster->addRosterMemberByTemplate("adam_ant", "[GTEST]n_aldanon"));
Expand Down Expand Up @@ -126,7 +126,7 @@ GTEST_TEST(NWN2Roster, rosterSetCalls) {
*/

GTEST_TEST(NWN2Roster, rosterLimit) {
std::unique_ptr<TestRoster> roster(new TestRoster);
std::unique_ptr<TestRoster> roster = std::make_unique<TestRoster>();

EXPECT_EQ(roster->getRosterNPCPartyLimit(), 3);
roster->setRosterNPCPartyLimit(6);
Expand Down
11 changes: 6 additions & 5 deletions tests/engines/nwn2/waypoint.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
* Unit tests for NWN2 waypoint objects.
*/

#include <memory>

#include "gtest/gtest.h"

#include "tests/engines/nwn2/waypoint.h"

#include "src/common/memreadstream.h"
#include "src/common/scopedptr.h"
#include "src/common/error.h"

#include "src/aurora/gff3file.h"
Expand All @@ -37,10 +38,10 @@
static const float kEpsilon = 1e-5f;

Engines::NWN2::Waypoint *getWaypoint(const unsigned int index) {
Common::ScopedPtr<Common::MemoryReadStream> stream(new Common::MemoryReadStream(kDataWaypoint));
std::unique_ptr<Common::MemoryReadStream> stream = std::make_unique<Common::MemoryReadStream>(kDataWaypoint);
if (!stream)
throw Common::Exception("No test data available");
Common::ScopedPtr<Aurora::GFF3File> gff(new Aurora::GFF3File(stream.release(), MKTAG('G', 'I', 'T', ' ')));
std::unique_ptr<Aurora::GFF3File> gff = std::make_unique<Aurora::GFF3File>(stream.release(), MKTAG('G', 'I', 'T', ' '));

// Get the waypoint list
const Aurora::GFF3Struct &top = gff->getTopLevel();
Expand Down Expand Up @@ -69,7 +70,7 @@ Engines::NWN2::Waypoint *getWaypoint(const unsigned int index) {
*/

GTEST_TEST(NWN2Waypoint, mapnote1) {
Common::ScopedPtr<Engines::NWN2::Waypoint> wp(getWaypoint(0));
std::unique_ptr<Engines::NWN2::Waypoint> wp(getWaypoint(0));
float x, y, z, angle;

EXPECT_STREQ(wp->getTag().c_str(), "mapnote1");
Expand Down Expand Up @@ -99,7 +100,7 @@ GTEST_TEST(NWN2Waypoint, mapnote1) {
*/

GTEST_TEST(NWN2Waypoint, waypoint1) {
Common::ScopedPtr<Engines::NWN2::Waypoint> wp(getWaypoint(1));
std::unique_ptr<Engines::NWN2::Waypoint> wp(getWaypoint(1));
float x, y, z, angle;

EXPECT_STREQ(wp->getTag().c_str(), "waypoint1");
Expand Down

0 comments on commit e57091f

Please sign in to comment.