Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make AbstractNamedBean.toString() final #6463

Merged
merged 98 commits into from Feb 13, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
019d15d
Make AbstractNamedBean.toString() final
danielb987 Jan 19, 2019
066c956
Merge branch 'master' into make_methods_final_2
danielb987 Feb 9, 2019
73718ab
Rename TranspondingTag.toString() to toReportString()
danielb987 Feb 9, 2019
1abb73b
Remove unused method NullAudioBuffer.parseFormat()
danielb987 Feb 9, 2019
17e9895
Fix tests
danielb987 Feb 9, 2019
af7aa79
Merge branch 'master' into make_methods_final_2
danielb987 Feb 13, 2019
3b12574
Revert changes to TranspondingTag
danielb987 Feb 13, 2019
1333121
Merge branch 'master' into make_methods_final_2
danielb987 Mar 6, 2019
b32e942
Merge branch 'master' into make_methods_final_2
danielb987 Mar 7, 2019
9c477ed
Merge branch 'master' into make_methods_final_2
danielb987 Mar 8, 2019
11222db
Merge branch 'master' into make_methods_final_2
danielb987 Mar 9, 2019
2c0320b
Merge branch 'master' into make_methods_final_2
danielb987 Mar 10, 2019
c3fc5da
Merge branch 'master' into make_methods_final_2
danielb987 Mar 11, 2019
64ff270
Merge branch 'master' into make_methods_final_2
danielb987 Mar 13, 2019
f1dce0c
Merge branch 'master' into make_methods_final_2
danielb987 Mar 18, 2019
bfff031
Merge branch 'master' into make_methods_final_2
danielb987 Mar 18, 2019
6dfbc26
Merge branch 'master' into make_methods_final_2
danielb987 Mar 20, 2019
ba3e978
Merge branch 'master' into make_methods_final_2
danielb987 Mar 21, 2019
74a4291
Merge branch 'master' into make_methods_final_2
danielb987 Mar 22, 2019
ddc1398
Merge branch 'master' into make_methods_final_2
danielb987 Mar 25, 2019
f8ccca3
Merge branch 'master' into make_methods_final_2
danielb987 Mar 27, 2019
3605353
Merge branch 'master' into make_methods_final_2
danielb987 Apr 10, 2019
70d5a93
Merge branch 'master' into make_methods_final_2
danielb987 Apr 15, 2019
11d0870
Merge branch 'master' into make_methods_final_2
danielb987 Apr 17, 2019
53e9a75
Merge branch 'master' into make_methods_final_2
danielb987 Apr 18, 2019
41ab520
Merge branch 'master' into make_methods_final_2
danielb987 Apr 21, 2019
a1848bf
Merge branch 'master' into make_methods_final_2
danielb987 Apr 24, 2019
86d7335
Merge branch 'master' into make_methods_final_2
danielb987 Apr 26, 2019
27ed000
Merge branch 'master' into make_methods_final_2
danielb987 Apr 28, 2019
22f7b75
Merge branch 'master' into make_methods_final_2
danielb987 Apr 30, 2019
498b600
Merge branch 'master' into make_methods_final_2
danielb987 May 7, 2019
07b2b53
Merge branch 'master' into make_methods_final_2
danielb987 May 9, 2019
cbc07b9
Merge branch 'master' into make_methods_final_2
danielb987 May 13, 2019
4596d95
Merge branch 'master' into make_methods_final_2
danielb987 May 20, 2019
4980f92
Merge branch 'master' into make_methods_final_2
danielb987 May 24, 2019
d78cf76
Merge branch 'master' into make_methods_final_2
danielb987 May 27, 2019
741e837
Merge branch 'master' into make_methods_final_2
danielb987 Jun 2, 2019
5ccf36e
Merge branch 'master' into make_methods_final_2
danielb987 Jun 9, 2019
3314463
Merge branch 'master' into make_methods_final_2
danielb987 Jun 12, 2019
38c899d
Merge branch 'master' into make_methods_final_2
danielb987 Jun 13, 2019
583affc
Merge branch 'master' into make_methods_final_2
danielb987 Jun 15, 2019
aac028b
Merge branch 'master' into make_methods_final_2
danielb987 Jun 16, 2019
ba3db02
Merge branch 'master' into make_methods_final_2
danielb987 Jun 18, 2019
63a9d6b
Merge branch 'master' into make_methods_final_2
danielb987 Jun 20, 2019
3e68608
Merge branch 'master' into make_methods_final_2
danielb987 Jun 23, 2019
defc2c4
Merge branch 'master' into make_methods_final_2
danielb987 Jun 26, 2019
b1821a8
Merge branch 'master' into make_methods_final_2
danielb987 Jul 1, 2019
8cfa345
Merge branch 'master' into make_methods_final_2
danielb987 Jul 1, 2019
9ce5270
Merge branch 'master' into make_methods_final_2
danielb987 Jul 2, 2019
6f4c19a
Merge branch 'master' into make_methods_final_2
danielb987 Jul 4, 2019
7944cd9
Merge branch 'master' into make_methods_final_2
danielb987 Jul 5, 2019
2600813
Merge branch 'master' into make_methods_final_2
danielb987 Jul 11, 2019
f705c7a
Merge branch 'master' into make_methods_final_2
danielb987 Jul 13, 2019
b99d0a0
Merge branch 'master' into make_methods_final_2
danielb987 Jul 15, 2019
2474204
Merge branch 'master' into make_methods_final_2
danielb987 Jul 19, 2019
41c2f93
Merge branch 'master' into make_methods_final_2
danielb987 Jul 22, 2019
654fd5c
Merge branch 'master' into make_methods_final_2
danielb987 Jul 29, 2019
20994d0
Merge branch 'master' into make_methods_final_2
danielb987 Aug 2, 2019
f619669
Merge branch 'master' into make_methods_final_2
danielb987 Aug 3, 2019
88620d4
Merge branch 'master' into make_methods_final_2
danielb987 Aug 4, 2019
e67ad83
Merge branch 'master' into make_methods_final_2
danielb987 Aug 6, 2019
c41cadb
Merge branch 'master' into make_methods_final_2
danielb987 Aug 10, 2019
4442b5f
Merge remote-tracking branch 'upstream/master' into make_methods_final_2
danielb987 Aug 21, 2019
d305b8a
Merge branch 'master' into make_methods_final_2
danielb987 Aug 28, 2019
2fd9e84
Merge branch 'master' into make_methods_final_2
danielb987 Aug 31, 2019
70c8287
Merge branch 'master' into make_methods_final_2
danielb987 Sep 7, 2019
51dcdea
Merge branch 'master' into make_methods_final_2
danielb987 Sep 8, 2019
4134121
Merge branch 'master' into make_methods_final_2
danielb987 Sep 19, 2019
db32377
Merge branch 'master' into make_methods_final_2
danielb987 Sep 28, 2019
eb3d9c3
Merge branch 'master' into make_methods_final_2
danielb987 Oct 3, 2019
23d6ee1
Merge branch 'master' into make_methods_final_2
danielb987 Oct 6, 2019
c42a4fb
Merge branch 'master' into make_methods_final_2
danielb987 Oct 11, 2019
8019306
Merge branch 'master' into make_methods_final_2
danielb987 Oct 17, 2019
48b36e0
Merge branch 'master' into make_methods_final_2
danielb987 Oct 26, 2019
d0ba3b9
Merge branch 'master' into make_methods_final_2
danielb987 Nov 9, 2019
8ad183a
Merge branch 'master' into make_methods_final_2
danielb987 Nov 15, 2019
d802a9e
Merge branch 'master' into make_methods_final_2
danielb987 Nov 21, 2019
52309d3
Merge branch 'master' into make_methods_final_2
danielb987 Nov 25, 2019
575fcbf
Merge branch 'master' into make_methods_final_2
danielb987 Dec 2, 2019
05b158a
Merge branch 'master' into make_methods_final_2
danielb987 Dec 5, 2019
5e14d6c
Restore method toString in Portal
danielb987 Dec 5, 2019
ed93517
Merge branch 'master' into make_methods_final_2
danielb987 Dec 16, 2019
697ce5a
Remove toString(). Add AudioSource.getDebugString()
danielb987 Dec 16, 2019
19d4351
Fix tests
danielb987 Dec 16, 2019
1c3b157
Merge branch 'master' into make_methods_final_2
danielb987 Dec 23, 2019
de9798b
Merge branch 'master' into make_methods_final_2
danielb987 Dec 28, 2019
874916d
Merge branch 'master' into make_methods_final_2
danielb987 Jan 1, 2020
321cef0
Merge branch 'master' into make_methods_final_2
danielb987 Jan 4, 2020
e8ee7bb
Merge branch 'master' into make_methods_final_2
danielb987 Jan 6, 2020
bc59dfd
Merge branch 'master' into make_methods_final_2
danielb987 Jan 9, 2020
1e4a783
Merge branch 'master' into make_methods_final_2
danielb987 Jan 12, 2020
e18ec05
Merge branch 'master' into make_methods_final_2
danielb987 Jan 17, 2020
eddd78a
Merge branch 'master' into make_methods_final_2
danielb987 Jan 20, 2020
87691af
Merge branch 'master' into make_methods_final_2
danielb987 Jan 25, 2020
f12fedc
Merge branch 'master' into make_methods_final_2
danielb987 Jan 26, 2020
ba76578
Merge branch 'master' into make_methods_final_2
danielb987 Feb 3, 2020
3fa17d0
Merge remote-tracking branch 'upstream/master' into make_methods_final_2
danielb987 Feb 8, 2020
eb9e9af
Merge branch 'master' into make_methods_final_2
danielb987 Feb 11, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions java/test/jmri/implementation/AbstractAudioTest.java
Expand Up @@ -26,8 +26,7 @@ public void testState() {
Assert.assertTrue("state is playing", audio.getState() == jmri.Audio.STATE_PLAYING);
// Check that audio.setState() triggers stateChanged()
Assert.assertTrue("state has changed", stateHasChanged.get());
Assert.assertTrue("toString() matches",
"jmri.implementation.AbstractAudioTest$MyAbstractAudio (MYSYSTEMNAME)".equals(audio.toString()));
Assert.assertTrue("toString() matches", "MYSYSTEMNAME".equals(audio.toString()));

Assert.assertTrue("getBeanType() matches", "Audio".equals(audio.getBeanType()));
}
Expand Down
3 changes: 1 addition & 2 deletions java/test/jmri/implementation/AbstractStringIOTest.java
Expand Up @@ -45,8 +45,7 @@ public void testStringIO() throws JmriException {
Assert.assertTrue("string is cut",
"8:20. Trai".equals(myStringIO.getKnownStringValue()));

Assert.assertTrue("toString() matches",
"jmri.implementation.AbstractStringIOTest$MyAbstractStringIO (MySystemName)".equals(myStringIO.toString()));
Assert.assertTrue("toString() matches", "MySystemName".equals(myStringIO.toString()));

Assert.assertTrue("getBeanType() matches", "String I/O".equals(myStringIO.getBeanType()));
}
Expand Down
4 changes: 3 additions & 1 deletion java/test/jmri/jmrix/loconet/TranspondingTagTest.java
Expand Up @@ -40,13 +40,15 @@ public void testTranspondingTagToString() {
TranspondingTag r = new TranspondingTag("ID1234");
// set the entryexit property
r.setProperty("entryexit","exits");
Assert.assertEquals("TranspondingTag toString ", "1234 exits", r.toString());
Assert.assertEquals("TranspondingTag toString ", "ID1234", r.toString());
danielb987 marked this conversation as resolved.
Show resolved Hide resolved
}

@Test
public void testTranspondingTagToReportString() {
TranspondingTag r = new TranspondingTag("LD1234");
Assert.assertEquals("TranspondingTag toReportString ", "1234", r.toReportString());
r.setProperty("entryexit","exits");
Assert.assertEquals("TranspondingTag toReportString ", "1234 exits", r.toReportString());
}

@Test
Expand Down