Skip to content

Commit ed8f8dc

Browse files
cgaycgay
authored
Merge pull request #1476 from cgay/channels
channels-test-suite cleanups
2 parents 18e4197 + 3c1c76f commit ed8f8dc

File tree

7 files changed

+63
-42
lines changed

7 files changed

+63
-42
lines changed

‎Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ TEST_LIBS = \
368368
duim-test-suite \
369369
deuce-test-suite \
370370
jam-test-suite \
371-
channels-tests \
371+
channels-test-suite \
372372
variable-search-tests \
373373
command-line-parser-test-suite \
374374
logging-test-suite \

‎build/windows/Makefile

+6-8
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ OLE_COCLASS_TEST = $(INSTALL_BIN_DIRECTORY)\ole-coclass-test.exe
587587
OLE_MACRO_TEST = $(INSTALL_BIN_DIRECTORY)\ole-macro-test.exe
588588
SQL_ODBC_TEST = $(INSTALL_BIN_DIRECTORY)\sql-odbc-test.exe
589589

590-
CHANNELS_TESTS = $(INSTALL_BIN_DIRECTORY)\channels-tests.dll
590+
CHANNELS_TEST_SUITE = $(INSTALL_BIN_DIRECTORY)\channels-test-suite.dll
591591
DFMC_ENVIRONMENT_TEST_SUITE = $(INSTALL_BIN_DIRECTORY)\dfmc-environment-test-suite.dll
592592
DFMC_ENVIRONMENT_TEST_SUITE_APP = $(INSTALL_BIN_DIRECTORY)\dfmc-environment-test-suite-app.exe
593593
WARNINGS_TEST_SUITE = $(INSTALL_BIN_DIRECTORY)\warnings-test-suite.dll
@@ -833,7 +833,7 @@ ole-coclass-test: $(OLE_COCLASS_TEST)
833833
ole-macro-test: $(OLE_MACRO_TEST)
834834
sql-odbc-test: $(SQL_ODBC_TEST)
835835

836-
channels-tests: $(CHANNELS_TESTS)
836+
channels-test-suite: $(CHANNELS_TEST_SUITE)
837837
dfmc-environment-test-suite: $(DFMC_ENVIRONMENT_TEST_SUITE)
838838
dfmc-environment-test-suite-app: $(DFMC_ENVIRONMENT_TEST_SUITE_APP)
839839

@@ -843,7 +843,7 @@ test-suites: libraries-test-suite-app duim-test-suites
843843
pentium-test-suites: pentium-test-suite-app
844844
ole-test-suites: ole-test ole-coclass-test ole-macro-test
845845
database-test-suites: sql-odbc-test
846-
environment-test-suites: channels-tests dfmc-environment-test-suite-app
846+
environment-test-suites: channels-test-suite dfmc-environment-test-suite-app
847847

848848
console-scepter-tests: $(CONSOLE_SCEPTER_TESTS)
849849
corba-tests-client-app: $(CORBA_TESTS_CLIENT_APP)
@@ -2237,11 +2237,11 @@ test-corba: test-scepter test-orb
22372237

22382238
# Compiler/Environment testing
22392239

2240-
$(CHANNELS_TESTS):
2240+
$(CHANNELS_TEST_SUITE):
22412241
$(ENSURE_RUNTIME_LIBRARY) $(CHANNELS_DLL) channels
22422242
$(ENSURE_RUNTIME_LIBRARY) $(TESTWORKS_DLL) testworks
2243-
$(ENSURE_SOURCES) channels-tests $(CHANNELS_TESTS_SOURCE)
2244-
$(BUILD_APPLICATION) channels-tests
2243+
$(ENSURE_SOURCES) channels-test-suite $(CHANNELS_TESTS_SOURCE)
2244+
$(BUILD_LIBRARY) channels-test-suite
22452245

22462246
$(DFMC_ENVIRONMENT_TEST_SUITE):
22472247
$(ENSURE_RUNTIME_LIBRARY) $(TESTWORKS_DLL) testworks
@@ -2265,8 +2265,6 @@ test-compiler: warnings-test-suite
22652265
test-environment: test-environment-test-suites test-environment-scripts
22662266

22672267
test-environment-test-suites:
2268-
$(ENSURE_APPLICATION) channels-tests
2269-
$(TEST_APP) channels-tests
22702268
$(ENSURE_APPLICATION) dfmc-environment-test-suite-app
22712269
$(TEST_APP) dfmc-environment-test-suite-app dfmc-environment-test-suite
22722270

‎sources/lib/channels/tests/channels-tests.lid ‎sources/lib/channels/tests/channels-test-suite.lid

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
Module: channels-tests
21
Author: Jason Trenouth
3-
Library: channels-tests
4-
Target-Type: executable
2+
Library: channels-test-suite
3+
Target-Type: dll
54
Files: library
65
channels
76
Copyright: Original Code is Copyright (c) 1995-2004 Functional Objects, Inc.

‎sources/lib/channels/tests/channels.dylan

+51-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Module: channels-tests
1+
Module: channels-test-suite
22
Author: Jason Trenouth
33
Copyright: Original Code is Copyright (c) 1995-2004 Functional Objects, Inc.
44
All rights reserved.
@@ -10,8 +10,8 @@ Warranty: Distributed WITHOUT WARRANTY OF ANY KIND
1010
/// typical uses
1111
/// mapper
1212

13-
define test channels-test-1 (name: "Default (object is callback)",
14-
description: "Check channel callbacks called only once while tuned-in.")
13+
// Check channel callbacks called only once while tuned-in.
14+
define test test-defaults--object-is-callback ()
1515
let channel = make(<channel>);
1616
let count1 = 1;
1717
let count2 = 2;
@@ -43,13 +43,14 @@ define test channels-test-1 (name: "Default (object is callback)",
4343
check-true("Count2 still 4", count2 = 4);
4444
end test;
4545

46-
define test channels-test-2 (name: "Object plus callback",
47-
description: "Make unique object as receiver key.")
46+
define test test-unique-object-as-receiver-key ()
4847
let channel = make(<channel>);
4948
let object = pair(#f, #f);
5049
let count = 0;
5150

52-
tune-in(channel, object, callback: method (message) count := count + message end method);
51+
tune-in(channel, object, callback: method (message)
52+
count := count + message
53+
end);
5354
broadcast(channel, 1);
5455
check-true("Count now 1", count = 1);
5556

@@ -58,93 +59,116 @@ define test channels-test-2 (name: "Object plus callback",
5859
check-true("Count still 1", count = 1);
5960
end test;
6061

61-
define test channels-test-3 (name: "No message passed (channel property)")
62+
define test test-no-message-passed--channel-property ()
6263
let channel = make(<channel>, message?: #f);
6364
let count = 0;
64-
local method inc-count () count := count + 2 end method;
65+
local method inc-count ()
66+
count := count + 2
67+
end;
6568
tune-in(channel, inc-count);
6669
broadcast(channel, 1);
6770
check-true("Count now 2", count = 2);
6871
end test;
6972

70-
define test channels-test-4 (name: "No message passed (receiver property)")
73+
define test test-no-message-passed--receiver-property ()
7174
let channel = make(<channel>);
7275
let count = 0;
73-
local method inc-count () count := count + 2 end method;
76+
local method inc-count ()
77+
count := count + 2
78+
end;
7479
tune-in(channel, inc-count, message?: #f);
7580
broadcast(channel, 1);
7681
check-true("Count now 2", count = 2);
7782
end test;
7883

79-
define test channels-test-5 (name: "Receiver passed (channel property)")
84+
define test test-receiver-passed--channel-property ()
8085
let channel = make(<channel>, receiver?: #t);
8186
let object = pair(-1, -1);
8287
let maybe-object = #f;
83-
local method inc-count (message, passed-object) maybe-object := passed-object end method;
88+
local method inc-count (message, passed-object)
89+
maybe-object := passed-object
90+
end;
8491
tune-in(channel, object, callback: inc-count);
8592
broadcast(channel, 1);
8693
check-true("Receiver passed", object == maybe-object);
8794
end test;
8895

89-
define test channels-test-6 (name: "Receiver passed (receiver property)")
96+
define test test-receiver-passed--receiver-property ()
9097
let channel = make(<channel>);
9198
let object = pair(-1, -1);
9299
let maybe-object = #f;
93-
local method set-maybe-object (message, passed-object) maybe-object := passed-object end method;
100+
local method set-maybe-object (message, passed-object)
101+
maybe-object := passed-object
102+
end;
94103
tune-in(channel, object, receiver?: #t, callback: set-maybe-object);
95104
broadcast(channel, 1);
96105
check-true("Receiver passed", object == maybe-object);
97106
end test;
98107

99-
define test channels-test-7 (name: "Matches message type")
108+
define test test-message-type ()
100109
let channel = make(<channel>);
101110
let message = list(1);
102111
let maybe-message = #f;
103-
local method set-maybe-message (passed-message) maybe-message := passed-message end method;
112+
local method set-maybe-message (passed-message)
113+
maybe-message := passed-message
114+
end;
104115

105116
tune-in(channel, set-maybe-message, message-type: <list>);
106117
broadcast(channel, vector(1));
107-
check-true("Maybe-message still #F", maybe-message == #f);
118+
check-false("Maybe-message still #F", maybe-message);
108119

109120
broadcast(channel, message);
110-
check-true("Maybe-message now message", maybe-message = message);
121+
check-equal("Maybe-message now message", maybe-message, message);
111122
end test;
112123

113-
define test channels-test-8 (name: "Channel defines callback")
124+
define test test-channel-defines-callback ()
114125
let count = 0;
115-
local method inc-count (message) count := count + message end method;
126+
local method inc-count (message)
127+
count := count + message
128+
end;
116129
let channel = make(<channel>, callback: inc-count);
117130
tune-in(channel, #f);
118131
tune-in(channel, #t);
119132
broadcast(channel, 1);
120133
check-true("Count now 2", count = 2);
121134
end test;
122135

123-
define test channels-test-9 (name: "Receiver overrides channel")
136+
define test test-receiver-overrides-channel ()
124137
let count = 0;
125138
let receiver = #f;
126-
local method inc-count (message) count := count + message end method;
139+
local method inc-count (message)
140+
count := count + message
141+
end;
127142
let channel = make(<channel>, callback: inc-count);
128143
tune-in(channel, #f);
129-
tune-in(channel, #t, message?: #f, receiver?: #t, callback: method (x) receiver := x; count := count + 9 end method);
144+
tune-in(channel, #t, message?: #f, receiver?: #t,
145+
callback: method (x)
146+
receiver := x;
147+
count := count + 9
148+
end);
130149
broadcast(channel, 1);
131150
check-true("Count now 10", count = 10);
132151
check-true("Receiver now #t", receiver = #t);
133152
end test;
134153

135-
define test channels-test-10 (name: "Broadcaster passes extra arguments")
154+
define test test-broadcaster-passes-extra-arguments ()
136155
let channel = make(<channel>);
137156
let count = 0;
138-
local method inc-count (message, extra-arg) count := count + message + extra-arg end method;
157+
local method inc-count (message, extra-arg)
158+
count := count + message + extra-arg
159+
end;
139160
tune-in(channel, inc-count);
140161
broadcast(channel, 1, 99);
141162
check-true("Count now 100", count = 100);
142163
end test;
143164

144-
define test channels-test-11 (name: "Override channel")
165+
define test test-override-channel ()
145166
let channel = make(<channel>);
146167
let count = 0;
147-
local method inc-count (receiver) count := count + receiver; #t end method;
168+
local method inc-count (receiver)
169+
count := count + receiver;
170+
#t
171+
end;
148172
tune-in(channel, 1);
149173
tune-in(channel, 2);
150174
let result = broadcast(override-channel(channel,

‎sources/lib/channels/tests/library.dylan

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ Copyright: Original Code is Copyright (c) 1995-2004 Functional Objects, Inc.
55
License: See License.txt in this distribution for details.
66
Warranty: Distributed WITHOUT WARRANTY OF ANY KIND
77

8-
define library channels-tests
8+
define library channels-test-suite
99
use common-dylan;
1010
use channels;
1111
use testworks;
1212
end library;
1313

14-
define module channels-tests
14+
define module channels-test-suite
1515
use common-dylan;
1616
use channels;
1717
use testworks;

‎sources/registry/generic/channels-test-suite

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
abstract://dylan/lib/channels/tests/channels-test-suite.lid

‎sources/registry/generic/channels-tests

-1
This file was deleted.

0 commit comments

Comments
 (0)