mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-21 13:05:43 -05:00
Compare commits
1 Commits
2742-datab
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
08753eedcd |
@@ -48,6 +48,7 @@ public class P25FullyQualifiedRadio extends Radio
|
|||||||
super(Protocol.APCO25, id);
|
super(Protocol.APCO25, id);
|
||||||
mWacn = wacn;
|
mWacn = wacn;
|
||||||
mSystem = system;
|
mSystem = system;
|
||||||
|
updateValueProperty();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ public class Radio extends AliasID implements Comparable<Radio>
|
|||||||
{
|
{
|
||||||
mProtocol = protocol;
|
mProtocol = protocol;
|
||||||
mValue = value;
|
mValue = value;
|
||||||
|
updateValueProperty();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ public class TalkerAliasAutoAdderTest
|
|||||||
assertEquals(TalkerAliasAutoAdder.ALIAS_GROUP, alias.getGroup());
|
assertEquals(TalkerAliasAutoAdder.ALIAS_GROUP, alias.getGroup());
|
||||||
assertTrue(alias.getAliasIdentifiers().get(0) instanceof Radio radio && radio.getValue() == 1234 &&
|
assertTrue(alias.getAliasIdentifiers().get(0) instanceof Radio radio && radio.getValue() == 1234 &&
|
||||||
radio.getProtocol() == Protocol.APCO25);
|
radio.getProtocol() == Protocol.APCO25);
|
||||||
|
assertEquals("Radio ID:1234 Protocol:APCO-25", alias.getAliasIdentifiers().get(0).valueProperty().get());
|
||||||
|
|
||||||
decode(RADIO, "ENGINE 12");
|
decode(RADIO, "ENGINE 12");
|
||||||
assertEquals(1, aliases().size(), "no duplicate alias");
|
assertEquals(1, aliases().size(), "no duplicate alias");
|
||||||
@@ -252,6 +253,8 @@ public class TalkerAliasAutoAdderTest
|
|||||||
decode(roaming, "ROAMER");
|
decode(roaming, "ROAMER");
|
||||||
Alias alias = alias(roaming);
|
Alias alias = alias(roaming);
|
||||||
assertTrue(alias.getAliasIdentifiers().get(0) instanceof P25FullyQualifiedRadio);
|
assertTrue(alias.getAliasIdentifiers().get(0) instanceof P25FullyQualifiedRadio);
|
||||||
|
assertEquals("Fully Qualified Radio ID:781824.291.777 Protocol:APCO-25",
|
||||||
|
alias.getAliasIdentifiers().get(0).valueProperty().get());
|
||||||
assertNull(alias(RADIO), "local radio with the same value isn't aliased");
|
assertNull(alias(RADIO), "local radio with the same value isn't aliased");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user