mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: change maName to more descriptive variable name

Browse Source 
Change-Id: I93b553c74bfa6f046092c6a550d229278e413446
Reviewed-on: https://gerrit.libreoffice.org/20956
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
This commit is contained in:
Chris Sherlock
2015-12-27 00:50:44 +11:00
parent 1a263563f5
commit 38e4f62709
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/test/container/xnamed.hxx
View File

@@ -19,7 +19,7 @@ namespace apitest {
class OOO_DLLPUBLIC_TEST XNamed class OOO_DLLPUBLIC_TEST XNamed
{ {
public: public:
XNamed(const OUString& rName): maName(rName) {} XNamed(const OUString& rName): maTestName(rName) {}
virtual ~XNamed(); virtual ~XNamed();
void testGetName(); void testGetName();
@@ -27,7 +27,7 @@ public:
virtual css::uno::Reference< css::uno::XInterface > init() = 0; virtual css::uno::Reference< css::uno::XInterface > init() = 0;
private: private:
OUString maName; OUString maTestName;
}; };

4
include/test/container/xnamereplace.hxx
View File

@@ -20,7 +20,7 @@ namespace apitest {
class OOO_DLLPUBLIC_TEST XNameReplace class OOO_DLLPUBLIC_TEST XNameReplace
{ {
public: public:
XNameReplace(const OUString& rName): maName(rName) {} XNameReplace(const OUString& rName): maTestReplacementName(rName) {}
virtual css::uno::Reference< css::uno::XInterface > init() = 0; virtual css::uno::Reference< css::uno::XInterface > init() = 0;
@@ -31,7 +31,7 @@ public:
virtual ~XNameReplace() {} virtual ~XNameReplace() {}
private: private:
OUString maName; OUString maTestReplacementName;
}; };

12
test/source/container/xnamed.cxx
View File

@@ -19,20 +19,20 @@ namespace apitest {
void XNamed::testGetName() void XNamed::testGetName()
{ {
uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW); uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW);
CPPUNIT_ASSERT( maName == xNamed->getName() ); CPPUNIT_ASSERT( maTestName == xNamed->getName() );
} }
void XNamed::testSetName() void XNamed::testSetName()
{ {
uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW); uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW);
OUString aName("NewName"); OUString aTestName("NewName");
xNamed->setName(aName); xNamed->setName(aTestName);
CPPUNIT_ASSERT( aName == xNamed->getName() ); CPPUNIT_ASSERT( aTestName == xNamed->getName() );
// restore old name // restore old name
xNamed->setName(maName); xNamed->setName(maTestName);
CPPUNIT_ASSERT(maName == xNamed->getName()); CPPUNIT_ASSERT(maTestName == xNamed->getName());
} }
XNamed::~XNamed() XNamed::~XNamed()

4
test/source/container/xnamereplace.cxx
View File

@@ -19,8 +19,8 @@ namespace apitest {
void XNameReplace::testReplaceByName() void XNameReplace::testReplaceByName()
{ {
uno::Reference< container::XNameReplace > xNameReplace(init(), UNO_QUERY_THROW); uno::Reference< container::XNameReplace > xNameReplace(init(), UNO_QUERY_THROW);
xNameReplace->replaceByName(maName, getAnyElementForNameReplace()); xNameReplace->replaceByName(maTestReplacementName, getAnyElementForNameReplace());
Any aAny = xNameReplace->getByName( maName ); Any aAny = xNameReplace->getByName( maTestReplacementName );
uno::Reference< uno::XInterface > xElement(aAny, UNO_QUERY_THROW); uno::Reference< uno::XInterface > xElement(aAny, UNO_QUERY_THROW);
CPPUNIT_ASSERT(xElement.is()); CPPUNIT_ASSERT(xElement.is());
} }