mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-09-24 10:44:13 +02:00
6f2c66afef
Second half of #819: where a coil declares what contacts it provides, the General tab now reports each type as used against declared rather than as a bare count. NO : 3/4, NC : 1/2, inverseurs : 0/1, autres : 0/0 MasterElement::contactCapacity() sums contactCount over the element's SlaveContactGroup list, per type, reusing the same ContactUsage tally the used count is built on. The mapping from ElementData::SlaveState onto the tally's own type is factored into one helper so the used count and the declared capacity cannot classify a contact differently. Falls back to the plain count from the previous commit when an element declares no groups, which is every element in the standard collection today -- nothing in the corpus declares slaveContactGroups, so this changes no existing display. A type used beyond what is declared reads as e.g. "1/0". That is deliberate: it says this contact does not fit the part. Display only. Whether a declared capacity should also feed MasterElement::isFull() is the open question in #819 and is not touched here. Verified end to end against a purpose-built fixture, since no existing element exercises this path: a coil declaring two NO groups of two, one NC group of two and one changeover group of one parses and reports NO=4 NC=2 SW=1 other=0 total=7, matching the declaration exactly. tst_contactusage gains a case covering capacity summed across groups (10 cases, all passing). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
138 lines
3.6 KiB
C++
138 lines
3.6 KiB
C++
/*
|
|
Copyright 2006-2026 The QElectroTech Team
|
|
This file is part of QElectroTech.
|
|
|
|
QElectroTech is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
QElectroTech is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include <QtTest>
|
|
|
|
#include "contactusage.h"
|
|
|
|
class tst_contactusage : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
private slots:
|
|
// An empty master uses nothing.
|
|
void emptyUsesNothing()
|
|
{
|
|
ContactUsage usage;
|
|
|
|
QCOMPARE(usage.no, 0);
|
|
QCOMPARE(usage.nc, 0);
|
|
QCOMPARE(usage.sw, 0);
|
|
QCOMPARE(usage.other, 0);
|
|
QCOMPARE(usage.total(), 0);
|
|
}
|
|
|
|
// Each type accumulates into its own field only.
|
|
void countsEachTypeSeparately()
|
|
{
|
|
ContactUsage usage;
|
|
usage.addSlave(ContactUsage::NO, 1);
|
|
usage.addSlave(ContactUsage::NO, 1);
|
|
usage.addSlave(ContactUsage::NC, 1);
|
|
usage.addSlave(ContactUsage::SW, 1);
|
|
usage.addSlave(ContactUsage::Other, 1);
|
|
|
|
QCOMPARE(usage.no, 2);
|
|
QCOMPARE(usage.nc, 1);
|
|
QCOMPARE(usage.sw, 1);
|
|
QCOMPARE(usage.other, 1);
|
|
QCOMPARE(usage.total(), 5);
|
|
}
|
|
|
|
// A slave standing for several contacts counts once per contact.
|
|
// Counting elements rather than contacts made a 4 pole contact
|
|
// consume a single contact from the master's budget.
|
|
void countsContactsNotElements()
|
|
{
|
|
ContactUsage usage;
|
|
usage.addSlave(ContactUsage::NO, 4);
|
|
|
|
QCOMPARE(usage.no, 4);
|
|
QCOMPARE(usage.total(), 4);
|
|
}
|
|
|
|
// A changeover is one contact of its own kind, never one NO plus
|
|
// one NC. CrossRefItem::NOElements() and NCElements() both return
|
|
// changeovers, so a count built by adding those two lists would
|
|
// report a single changeover as two contacts.
|
|
void changeoverIsCountedOnce()
|
|
{
|
|
ContactUsage usage;
|
|
usage.addSlave(ContactUsage::SW, 1);
|
|
|
|
QCOMPARE(usage.sw, 1);
|
|
QCOMPARE(usage.no, 0);
|
|
QCOMPARE(usage.nc, 0);
|
|
QCOMPARE(usage.total(), 1);
|
|
}
|
|
|
|
// An element which declares no contact count, or a nonsensical one,
|
|
// is still a contact.
|
|
void missingContactCountIsOneContact_data()
|
|
{
|
|
QTest::addColumn<int>("declared");
|
|
|
|
QTest::newRow("zero") << 0;
|
|
QTest::newRow("negative") << -1;
|
|
}
|
|
|
|
void missingContactCountIsOneContact()
|
|
{
|
|
QFETCH(int, declared);
|
|
|
|
ContactUsage usage;
|
|
usage.addSlave(ContactUsage::NO, declared);
|
|
|
|
QCOMPARE(usage.no, 1);
|
|
QCOMPARE(usage.total(), 1);
|
|
}
|
|
|
|
// A declared capacity is summed across groups, so two NO groups of two
|
|
// contacts each declare four NO contacts, not two groups.
|
|
void capacitySumsAcrossGroups()
|
|
{
|
|
ContactUsage capacity;
|
|
capacity.addSlave(ContactUsage::NO, 2);
|
|
capacity.addSlave(ContactUsage::NO, 2);
|
|
capacity.addSlave(ContactUsage::NC, 1);
|
|
|
|
QCOMPARE(capacity.no, 4);
|
|
QCOMPARE(capacity.nc, 1);
|
|
QCOMPARE(capacity.total(), 5);
|
|
}
|
|
|
|
// The mix a coil would actually carry: two single NO, one 4 pole NO,
|
|
// one NC and one changeover.
|
|
void tallysARealisticMix()
|
|
{
|
|
ContactUsage usage;
|
|
usage.addSlave(ContactUsage::NO, 1);
|
|
usage.addSlave(ContactUsage::NO, 1);
|
|
usage.addSlave(ContactUsage::NO, 4);
|
|
usage.addSlave(ContactUsage::NC, 1);
|
|
usage.addSlave(ContactUsage::SW, 1);
|
|
|
|
QCOMPARE(usage.no, 6);
|
|
QCOMPARE(usage.nc, 1);
|
|
QCOMPARE(usage.sw, 1);
|
|
QCOMPARE(usage.total(), 8);
|
|
}
|
|
};
|
|
|
|
QTEST_APPLESS_MAIN(tst_contactusage)
|
|
#include "tst_contactusage.moc"
|