haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up spice tests in qa_eeschema 

* Guard their inclusion with the KICAD_SPICE flag
* Code cleanup inside actual testing function

Fixes https://gitlab.com/kicad/code/kicad/issues/4220
This commit is contained in:
Ian McInerney 2020-04-18 00:46:01 +01:00
parent 3b67e3d0a4
commit d44a252182
2 changed files with 65 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qa/eeschema/CMakeLists.txt
View File

@ -24,10 +24,7 @@
include_directories( BEFORE ${INC_BEFORE} ) include_directories( BEFORE ${INC_BEFORE} )
add_executable( qa_eeschema set( QA_EESCHEMA_SRCS
# A single top to load the pcnew kiface
# ../../common/single_top.cpp
# stuff from common which is needed...why? # stuff from common which is needed...why?
${CMAKE_SOURCE_DIR}/common/colors.cpp ${CMAKE_SOURCE_DIR}/common/colors.cpp
${CMAKE_SOURCE_DIR}/common/observable.cpp ${CMAKE_SOURCE_DIR}/common/observable.cpp
@ -51,9 +48,20 @@ add_executable( qa_eeschema
test_sch_rtree.cpp test_sch_rtree.cpp
test_sch_sheet.cpp test_sch_sheet.cpp
test_sch_sheet_path.cpp test_sch_sheet_path.cpp
)
# Simulation tests
sim/test_netlist_exporter_pspice_sim.cpp
# Spice specific testing routine
if( KICAD_SPICE )
set( QA_EESCHEMA_SRCS
${QA_EESCHEMA_SRCS}
# Simulation tests
sim/test_netlist_exporter_pspice_sim.cpp
)
endif()
add_executable( qa_eeschema
${QA_EESCHEMA_SRCS}
# Older CMakes cannot link OBJECT libraries # Older CMakes cannot link OBJECT libraries
# https://cmake.org/pipermail/cmake/2013-November/056263.html # https://cmake.org/pipermail/cmake/2013-November/056263.html

74
qa/eeschema/sim/test_netlist_exporter_pspice_sim.cpp
View File

@ -94,13 +94,17 @@ BOOST_AUTO_TEST_CASE( CommandToSimType )
for( auto& step : testData ) for( auto& step : testData )
{ {
BOOST_CHECK_EQUAL( m_exporter.CommandToSimType( wxString( step.command ) ), step.type ); SIM_TYPE result = NETLIST_EXPORTER_PSPICE_SIM::CommandToSimType( step.command );
BOOST_CHECK_EQUAL( result, step.type );
} }
for( auto& step : testData ) for( auto& step : testData )
{ {
step.command.Append( "\n" ); step.command.Append( "\n" );
BOOST_CHECK_EQUAL( m_exporter.CommandToSimType( wxString( step.command ) ), step.type ); SIM_TYPE result = NETLIST_EXPORTER_PSPICE_SIM::CommandToSimType( step.command );
BOOST_CHECK_EQUAL( result, step.type );
} }
} }
@ -117,34 +121,56 @@ BOOST_AUTO_TEST_CASE( VectorToSignal )
SIM_PLOT_TYPE type; SIM_PLOT_TYPE type;
}; };
std::vector<struct TEST_DATA> testData = { { "@c3[i]", "I(C3)", SPT_CURRENT }, std::vector<struct TEST_DATA> testData = {
{ "@r12[i]", "I(R12)", SPT_CURRENT }, { "@r7[i]", "I(R7)", SPT_CURRENT }, { "@c3[i]", "I(C3)", SPT_CURRENT },
{ "@l2[i]", "I(L2)", SPT_CURRENT }, { "@c2[i]", "I(C2)", SPT_CURRENT }, { "@r12[i]", "I(R12)", SPT_CURRENT },
{ "@r6[i]", "I(R6)", SPT_CURRENT }, { "@r5[i]", "I(R5)", SPT_CURRENT }, { "@r7[i]", "I(R7)", SPT_CURRENT },
{ "@r10[i]", "I(R10)", SPT_CURRENT }, { "@q3[ie]", "Ie(Q3)", SPT_CURRENT }, { "@l2[i]", "I(L2)", SPT_CURRENT },
{ "@q3[ic]", "Ic(Q3)", SPT_CURRENT }, { "@q3[ib]", "Ib(Q3)", SPT_CURRENT }, { "@c2[i]", "I(C2)", SPT_CURRENT },
{ "@r11[i]", "I(R11)", SPT_CURRENT }, { "@r8[i]", "I(R8)", SPT_CURRENT }, { "@r6[i]", "I(R6)", SPT_CURRENT },
{ "@q1[ie]", "Ie(Q1)", SPT_CURRENT }, { "@q1[ic]", "Ic(Q1)", SPT_CURRENT }, { "@r5[i]", "I(R5)", SPT_CURRENT },
{ "@q1[ib]", "Ib(Q1)", SPT_CURRENT }, { "@r1[i]", "I(R1)", SPT_CURRENT }, { "@r10[i]", "I(R10)", SPT_CURRENT },
{ "@l1[i]", "I(L1)", SPT_CURRENT }, { "@c4[i]", "I(C4)", SPT_CURRENT }, { "@q3[ie]", "Ie(Q3)", SPT_CURRENT },
{ "@r2[i]", "I(R2)", SPT_CURRENT }, { "@q2[ig]", "Ig(Q2)", SPT_CURRENT }, { "@q3[ic]", "Ic(Q3)", SPT_CURRENT },
{ "@q2[id]", "Id(Q2)", SPT_CURRENT }, { "@q2[is]", "Is(Q2)", SPT_CURRENT }, { "@q3[ib]", "Ib(Q3)", SPT_CURRENT },
{ "@v2[i]", "I(V2)", SPT_CURRENT }, { "@r9[i]", "I(R9)", SPT_CURRENT }, { "@r11[i]", "I(R11)", SPT_CURRENT },
{ "@c1[i]", "I(C1)", SPT_CURRENT }, { "@v1[i]", "I(V1)", SPT_CURRENT }, { "@r8[i]", "I(R8)", SPT_CURRENT },
{ "@r3[i]", "I(R3)", SPT_CURRENT }, { "@r4[i]", "I(R4)", SPT_CURRENT }, { "@q1[ie]", "Ie(Q1)", SPT_CURRENT },
{ "vout", "V(vout)", SPT_VOLTAGE }, { "net-_q3-pad2_", "V(net-_q3-pad2_)", SPT_VOLTAGE }, { "@q1[ic]", "Ic(Q1)", SPT_CURRENT },
{ "@q1[ib]", "Ib(Q1)", SPT_CURRENT },
{ "@r1[i]", "I(R1)", SPT_CURRENT },
{ "@l1[i]", "I(L1)", SPT_CURRENT },
{ "@c4[i]", "I(C4)", SPT_CURRENT },
{ "@r2[i]", "I(R2)", SPT_CURRENT },
{ "@q2[ig]", "Ig(Q2)", SPT_CURRENT },
{ "@q2[id]", "Id(Q2)", SPT_CURRENT },
{ "@q2[is]", "Is(Q2)", SPT_CURRENT },
{ "@v2[i]", "I(V2)", SPT_CURRENT },
{ "@r9[i]", "I(R9)", SPT_CURRENT },
{ "@c1[i]", "I(C1)", SPT_CURRENT },
{ "@v1[i]", "I(V1)", SPT_CURRENT },
{ "@r3[i]", "I(R3)", SPT_CURRENT },
{ "@r4[i]", "I(R4)", SPT_CURRENT },
{ "vout", "V(vout)", SPT_VOLTAGE },
{ "net-_q3-pad2_", "V(net-_q3-pad2_)", SPT_VOLTAGE },
{ "net-_q2-pad3_", "V(net-_q2-pad3_)", SPT_VOLTAGE }, { "net-_q2-pad3_", "V(net-_q2-pad3_)", SPT_VOLTAGE },
{ "net-_q2-pad1_", "V(net-_q2-pad1_)", SPT_VOLTAGE }, { "net-_q2-pad1_", "V(net-_q2-pad1_)", SPT_VOLTAGE },
{ "net-_q1-pad3_", "V(net-_q1-pad3_)", SPT_VOLTAGE }, { "net-_q1-pad3_", "V(net-_q1-pad3_)", SPT_VOLTAGE },
{ "net-_l2-pad1_", "V(net-_l2-pad1_)", SPT_VOLTAGE }, { "net-_l2-pad1_", "V(net-_l2-pad1_)", SPT_VOLTAGE },
{ "net-_c4-pad2_", "V(net-_c4-pad2_)", SPT_VOLTAGE }, { "net-_c4-pad2_", "V(net-_c4-pad2_)", SPT_VOLTAGE },
{ "net-_c3-pad1_", "V(net-_c3-pad1_)", SPT_VOLTAGE }, { "net-_c3-pad1_", "V(net-_c3-pad1_)", SPT_VOLTAGE },
{ "net-_c1-pad2_", "V(net-_c1-pad2_)", SPT_VOLTAGE }, { "/vin", "V(/vin)", SPT_VOLTAGE }, { "net-_c1-pad2_", "V(net-_c1-pad2_)", SPT_VOLTAGE },
{ "/vbase", "V(/vbase)", SPT_VOLTAGE }, { "+12v", "V(+12v)", SPT_VOLTAGE }, { "/vin", "V(/vin)", SPT_VOLTAGE },
{ "@m1[cgs]", "", SPT_UNKNOWN }, { "@d1[g11]", "", SPT_UNKNOWN }, { "/vbase", "V(/vbase)", SPT_VOLTAGE },
{ "@d1[c12]", "", SPT_UNKNOWN }, { "@d1[y21]", "", SPT_UNKNOWN }, { "+12v", "V(+12v)", SPT_VOLTAGE },
{ "@n1[vth0]", "", SPT_UNKNOWN }, { "@mn1[gm]", "", SPT_UNKNOWN }, { "@m1[cgs]", "", SPT_UNKNOWN },
{ "@m.xmos1.xmos2.m1[vdsat]", "", SPT_UNKNOWN } }; { "@d1[g11]", "", SPT_UNKNOWN },
{ "@d1[c12]", "", SPT_UNKNOWN },
{ "@d1[y21]", "", SPT_UNKNOWN },
{ "@n1[vth0]", "", SPT_UNKNOWN },
{ "@mn1[gm]", "", SPT_UNKNOWN },
{ "@m.xmos1.xmos2.m1[vdsat]", "", SPT_UNKNOWN }
};
for( auto& step : testData ) for( auto& step : testData )
{ {