Skip to content

Commit

Permalink
[CORRECTIVE] Fix ipxactsystemverilogparser test compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
@epekkar
epekkar committed Dec 4, 2023
1 parent 0a3f39a commit a7861fd
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
40 changes: 20 additions & 20 deletions tests/Core/tst_IPXactSystemVerilogParser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void tst_IPXactSystemVerilogParser::testParseConstant()
QFETCH(QString, expectedResult);
QFETCH(bool, expectedValid);

QSharedPointer<Component> emptyComponent(new Component());
QSharedPointer<Component> emptyComponent(new Component(VLNV(), Document::Revision::Std14));

IPXactSystemVerilogParser parser(QSharedPointer<ParameterFinder>(new ComponentParameterFinder(emptyComponent)));

Expand Down Expand Up @@ -126,35 +126,35 @@ void tst_IPXactSystemVerilogParser::testParseConstant_data()
//-----------------------------------------------------------------------------
void tst_IPXactSystemVerilogParser::testExpressionWithUnknownReference()
{
QSharedPointer<Component> emptyComponent(new Component());
QSharedPointer<Component> emptyComponent(new Component(VLNV(), Document::Revision::Std14));

IPXactSystemVerilogParser parser(QSharedPointer<ParameterFinder>(new ComponentParameterFinder(emptyComponent)));

QCOMPARE(parser.parseExpression("unknownParameter"), QString("x"));
QCOMPARE(parser.parseExpression(QString("unknownParameter")), QString("x"));
}

//-----------------------------------------------------------------------------
// Function: tst_IPXactSystemVerilogParser::testParameterWithoutId()
//-----------------------------------------------------------------------------
void tst_IPXactSystemVerilogParser::testParameterWithoutId()
{
QSharedPointer<Component> testComponent(new Component());
QSharedPointer<Component> testComponent(new Component(VLNV(), Document::Revision::Std14));
QSharedPointer<Parameter> firstParameter(new Parameter());
firstParameter->setValueId("");
firstParameter->setValue("1");
testComponent->getParameters()->append(firstParameter);

IPXactSystemVerilogParser parser(QSharedPointer<ParameterFinder>(new ComponentParameterFinder(testComponent)));

QCOMPARE(parser.parseExpression("unknownParameter"), QString("x"));
QCOMPARE(parser.parseExpression(QString("unknownParameter")), QString("x"));
}

//-----------------------------------------------------------------------------
// Function: tst_IPXactSystemVerilogParser::testParameterWithGeneratedId()
//-----------------------------------------------------------------------------
void tst_IPXactSystemVerilogParser::testParameterWithGeneratedId()
{
QSharedPointer<Component> testComponent(new Component());
QSharedPointer<Component> testComponent(new Component(VLNV(), Document::Revision::Std14));
QSharedPointer<Parameter> firstParameter(new Parameter());
firstParameter->setValue("1");
testComponent->getParameters()->append(firstParameter);
Expand All @@ -174,7 +174,7 @@ void tst_IPXactSystemVerilogParser::testExpressionWithParameterReferences()
QFETCH(QString, expectedResult);
QFETCH(bool, expectedValid);

QSharedPointer<Component> testComponent(new Component());
QSharedPointer<Component> testComponent(new Component(VLNV(), Document::Revision::Std14));
QSharedPointer<Parameter> firstParameter(new Parameter());
firstParameter->setValueId("one");
firstParameter->setValue("1");
Expand Down Expand Up @@ -229,7 +229,7 @@ void tst_IPXactSystemVerilogParser::testExpressionWithRegisterParameterReference
QFETCH(QString, expectedResult);
QFETCH(bool, expectedValid);

QSharedPointer<Component> testComponent(new Component());
QSharedPointer<Component> testComponent(new Component(VLNV(), Document::Revision::Std14));

QSharedPointer<MemoryMap> memoryMap(new MemoryMap());
testComponent->getMemoryMaps()->append(memoryMap);
Expand Down Expand Up @@ -283,7 +283,7 @@ void tst_IPXactSystemVerilogParser::testExpressionWithBusInterfaceParameterRefer
QFETCH(QString, expectedResult);
QFETCH(bool, expectedValid);

QSharedPointer<Component> testComponent(new Component());
QSharedPointer<Component> testComponent(new Component(VLNV(), Document::Revision::Std14));
QSharedPointer<Parameter> firstParameter(new Parameter());
firstParameter->setValueId("one");
firstParameter->setValue("1");
Expand Down Expand Up @@ -329,7 +329,7 @@ void tst_IPXactSystemVerilogParser::testParameterDefinedUsingOtherParameter()
QFETCH(QString, expression);
QFETCH(QString, expectedResult);

QSharedPointer<Component> testComponent(new Component());
QSharedPointer<Component> testComponent(new Component(VLNV(), Document::Revision::Std14));
QSharedPointer<Parameter> firstParameter(new Parameter());
firstParameter->setValueId("first");
firstParameter->setValue("1");
Expand Down Expand Up @@ -368,7 +368,7 @@ void tst_IPXactSystemVerilogParser::testParameterDefinedUsingOtherParameter_data
//-----------------------------------------------------------------------------
void tst_IPXactSystemVerilogParser::testLoopTerminatesEventually()
{
QSharedPointer<Component> testComponent(new Component());
QSharedPointer<Component> testComponent(new Component(VLNV(), Document::Revision::Std14));
QSharedPointer<Parameter> firstParameter(new Parameter());
firstParameter->setValueId("first");
firstParameter->setValue("second");
Expand All @@ -381,15 +381,15 @@ void tst_IPXactSystemVerilogParser::testLoopTerminatesEventually()

IPXactSystemVerilogParser parser(QSharedPointer<ParameterFinder>(new ComponentParameterFinder(testComponent)));

QTRY_COMPARE_WITH_TIMEOUT(parser.parseExpression("second"), QString("x"), 3000);
QTRY_COMPARE_WITH_TIMEOUT(parser.parseExpression(QString("second")), QString("x"), 3000);
}

//-----------------------------------------------------------------------------
// Function: tst_IPXactSystemVerilogParser::testReferenceToString()
//-----------------------------------------------------------------------------
void tst_IPXactSystemVerilogParser::testReferenceToStringInExpression()
{
QSharedPointer<Component> testComponent(new Component());
QSharedPointer<Component> testComponent(new Component(VLNV(), Document::Revision::Std14));
QSharedPointer<Parameter> firstParameter(new Parameter());
firstParameter->setValueId("first");
firstParameter->setValue("\"text\"");
Expand All @@ -402,24 +402,24 @@ void tst_IPXactSystemVerilogParser::testReferenceToStringInExpression()

IPXactSystemVerilogParser parser(QSharedPointer<ParameterFinder>(new ComponentParameterFinder(testComponent)));

QCOMPARE(parser.parseExpression("first"), QString("\"text\""));
QCOMPARE(parser.parseExpression("second"), QString("x"));
QCOMPARE(parser.parseExpression(QString("first")), QString("\"text\""));
QCOMPARE(parser.parseExpression(QString("second")), QString("x"));
}

//-----------------------------------------------------------------------------
// Function: tst_IPXactSystemVerilogParser::testGetBaseForExpression()
//-----------------------------------------------------------------------------
void tst_IPXactSystemVerilogParser::testGetBaseForExpression()
{
QSharedPointer<Component> testComponent(new Component());
QSharedPointer<Component> testComponent(new Component(VLNV(), Document::Revision::Std14));
QSharedPointer<Parameter> firstParameter(new Parameter());
firstParameter->setValueId("first");
firstParameter->setValue("'h1");
testComponent->getParameters()->append(firstParameter);

IPXactSystemVerilogParser parser(QSharedPointer<ParameterFinder>(new ComponentParameterFinder(testComponent)));

QCOMPARE(parser.baseForExpression("2*first"), 16);
QCOMPARE(parser.baseForExpression(QString("2*first")), 16);
}

//-----------------------------------------------------------------------------
Expand All @@ -430,7 +430,7 @@ void tst_IPXactSystemVerilogParser::testExpressionWithRealValueParameterReferenc
QFETCH(QString, expression);
QFETCH(QString, expectedResult);

QSharedPointer<Component> testComponent(new Component());
QSharedPointer<Component> testComponent(new Component(VLNV(), Document::Revision::Std14));
QSharedPointer<Parameter> firstParameter(new Parameter());
firstParameter->setValueId("firstValue");
firstParameter->setValue("30");
Expand Down Expand Up @@ -471,7 +471,7 @@ void tst_IPXactSystemVerilogParser::testExpressionComparison()
QFETCH(QString, expression);
QFETCH(int, expectedResult);

QSharedPointer<Component> testComponent(new Component());
QSharedPointer<Component> testComponent(new Component(VLNV(), Document::Revision::Std14));
QSharedPointer<Parameter> firstParameter(new Parameter());
firstParameter->setValueId("firstValue");
firstParameter->setValue(valueOne);
Expand Down Expand Up @@ -525,7 +525,7 @@ void tst_IPXactSystemVerilogParser::testLongReferenceChainPerformance()
QFETCH(int, chainLength);
QFETCH(bool, useCache);

QSharedPointer<Component> testComponent(new Component());
QSharedPointer<Component> testComponent(new Component(VLNV(), Document::Revision::Std14));

QSharedPointer<Parameter> firstParameter(new Parameter());
firstParameter->setValueId("id_0");
Expand Down
4 changes: 2 additions & 2 deletions tests/Core/tst_IPXactSystemVerilogParser.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ QT -= gui widgets
CONFIG += c++11 testcase console

win32:CONFIG(release, debug|release) {
LIBS += -L$$PWD/../../x64/executable/ -lIPXACTmodels -lKactusAPI
LIBS += -L$$PWD/../../executable/ -lIPXACTmodels -lKactusAPI
DESTDIR = ./release
}
else:win32:CONFIG(debug, debug|release) {
LIBS += -L$$PWD/../../x64/executable/ -lIPXACTmodelsd -lKactusAPId
LIBS += -L$$PWD/../../executable/ -lIPXACTmodelsd -lKactusAPId
DESTDIR = ./debug
}
else:unix {
Expand Down

0 comments on commit a7861fd

Please sign in to comment.