Skip to content

Commit d1979e7

Browse files
michaeltrybymichaeltryby
committedApr 17, 2019
Update errror code from 250 to 252
1 parent f161eca commit d1979e7

7 files changed

+28
-25
lines changed
 

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ temp/
223223
# Testing Stuff
224224
nrtestsuite/
225225
tests/data/
226+
tests/outfile/data/en*
227+
226228

227229
#Cmake stuff
228230
__cmake_systeminformation/

‎src/epanet.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -1734,7 +1734,7 @@ int DLLEXPORT EN_addnode(EN_Project p, char *id, int nodeType)
17341734
if (hyd->OpenHflag || qual->OpenQflag) return 262;
17351735

17361736
// Check if id contains invalid characters
1737-
if (!cstr_isvalid(id)) return 250;
1737+
if (!cstr_isvalid(id)) return 252;
17381738

17391739
// Check if a node with same id already exists
17401740
if (EN_getnodeindex(p, id, &i) == 0) return 215;
@@ -2021,7 +2021,7 @@ int DLLEXPORT EN_setnodeid(EN_Project p, int index, char *newid)
20212021
if (index <= 0 || index > net->Nnodes) return 203;
20222022
n = strlen(newid);
20232023
if (n < 1 || n > MAXID) return 209;
2024-
if (!cstr_isvalid(newid)) return 250;
2024+
if (!cstr_isvalid(newid)) return 252;
20252025

20262026
// Check if another node with same name exists
20272027
if (hashtable_find(net->NodeHashTable, newid) > 0) return 215;
@@ -2945,7 +2945,7 @@ int DLLEXPORT EN_addlink(EN_Project p, char *id, int linkType,
29452945
if (p->hydraul.OpenHflag || p->quality.OpenQflag) return 262;
29462946

29472947
// Check if id contains invalid characters
2948-
if (!cstr_isvalid(id)) return 250;
2948+
if (!cstr_isvalid(id)) return 252;
29492949

29502950
// Check if a link with same id already exists
29512951
if (EN_getlinkindex(p, id, &i) == 0) return 215;
@@ -3208,7 +3208,7 @@ int DLLEXPORT EN_setlinkid(EN_Project p, int index, char *newid)
32083208
if (index <= 0 || index > net->Nlinks) return 204;
32093209
n = strlen(newid);
32103210
if (n < 1 || n > MAXID) return 211;
3211-
if (!cstr_isvalid(newid)) return 250;
3211+
if (!cstr_isvalid(newid)) return 252;
32123212

32133213
// Check if another link with same name exists
32143214
if (hashtable_find(net->LinkHashTable, newid) > 0) return 215;
@@ -3960,7 +3960,7 @@ int DLLEXPORT EN_addpattern(EN_Project p, char *id)
39603960
if (EN_getpatternindex(p, id, &i) == 0) return 215;
39613961

39623962
// Check is id name contains invalid characters
3963-
if (!cstr_isvalid(id)) return 250;
3963+
if (!cstr_isvalid(id)) return 252;
39643964

39653965
// Check that id name is not too long
39663966
if (strlen(id) > MAXID) return 250;
@@ -4087,7 +4087,7 @@ int DLLEXPORT EN_setpatternid(EN_Project p, int index, char *id)
40874087
if (index < 1 || index > p->network.Npats) return 205;
40884088

40894089
// Check is id name contains invalid characters
4090-
if (!cstr_isvalid(id)) return 250;
4090+
if (!cstr_isvalid(id)) return 252;
40914091

40924092
if (strlen(id) > MAXID) return 250;
40934093

@@ -4236,7 +4236,7 @@ int DLLEXPORT EN_addcurve(EN_Project p, char *id)
42364236
if (EN_getcurveindex(p, id, &i) == 0) return 215;
42374237

42384238
// Check is id name contains invalid characters
4239-
if (!cstr_isvalid(id)) return 250;
4239+
if (!cstr_isvalid(id)) return 252;
42404240

42414241
// Check that id name is not too long
42424242
if (strlen(id) > MAXID) return 250;
@@ -4359,8 +4359,8 @@ int DLLEXPORT EN_setcurveid(EN_Project p, int index, char *id)
43594359
if (index < 1 || index > p->network.Ncurves) return 205;
43604360

43614361
// Check is id name contains invalid characters
4362-
if (!cstr_isvalid(id)) return 250;
4363-
4362+
if (!cstr_isvalid(id)) return 252;
4363+
43644364
if (strlen(id) > MAXID) return 250;
43654365
for (i = 1; i <= p->network.Ncurves; i++)
43664366
{

‎src/errors.dat

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ DAT(240,"nonexistent source")
4949
DAT(241,"nonexistent control")
5050
DAT(250,"invalid format")
5151
DAT(251,"invalid parameter code")
52+
DAT(252,"invalid ID name")
5253
DAT(253,"nonexistent demand category")
5354
DAT(254,"node with no coordinates")
5455
DAT(257,"nonexistent rule")

‎tests/test_curve.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,17 @@ BOOST_FIXTURE_TEST_CASE(test_curve_id_isvalid, FixtureInitClose)
7575
BOOST_REQUIRE(error == 0);
7676

7777
error = EN_addcurve(ph, (char *)"C 2");
78-
BOOST_REQUIRE(error == 250);
78+
BOOST_REQUIRE(error == 252);
7979

8080
error = EN_addcurve(ph, (char *)"C\"2");
81-
BOOST_REQUIRE(error == 250);
81+
BOOST_REQUIRE(error == 252);
8282

8383
error = EN_addcurve(ph, (char *)"C;2");
84-
BOOST_REQUIRE(error == 250);
84+
BOOST_REQUIRE(error == 252);
8585

8686
EN_getcurveindex(ph, (char *)"C1", &index);
8787
error = EN_setcurveid(ph, index, (char *)"C;2");
88-
BOOST_REQUIRE(error == 250);
88+
BOOST_REQUIRE(error == 252);
8989
}
9090

9191

‎tests/test_link.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,17 @@ BOOST_FIXTURE_TEST_CASE(test_link_id_isvalid, FixtureInitClose)
6868
BOOST_REQUIRE(error == 0);
6969

7070
error = EN_addlink(ph, (char *)"L 2", EN_PIPE, (char *)"N1", (char *)"N2");
71-
BOOST_REQUIRE(error == 250);
71+
BOOST_REQUIRE(error == 252);
7272

7373
error = EN_addlink(ph, (char *)"L\"2", EN_PIPE, (char *)"N1", (char *)"N2");
74-
BOOST_REQUIRE(error == 250);
74+
BOOST_REQUIRE(error == 252);
7575

7676
error = EN_addlink(ph, (char *)"L;2", EN_PIPE, (char *)"N1", (char *)"N2");
77-
BOOST_REQUIRE(error == 250);
77+
BOOST_REQUIRE(error == 252);
7878

7979
EN_getlinkindex(ph, (char *)"L1", &index);
8080
error = EN_setlinkid(ph, index, (char *)"L;1");
81-
BOOST_REQUIRE(error == 250);
81+
BOOST_REQUIRE(error == 252);
8282
}
8383

8484
BOOST_AUTO_TEST_CASE(test_setlinktype)

‎tests/test_node.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ BOOST_FIXTURE_TEST_CASE(test_node_validate_id, FixtureInitClose)
5555
BOOST_REQUIRE(error == 0);
5656

5757
error = EN_addnode(ph, (char *)"N 3", EN_JUNCTION);
58-
BOOST_REQUIRE(error == 250);
58+
BOOST_REQUIRE(error == 252);
5959

6060
error = EN_addnode(ph, (char *)"N\"3", EN_JUNCTION);
61-
BOOST_REQUIRE(error == 250);
61+
BOOST_REQUIRE(error == 252);
6262

6363
error = EN_addnode(ph, (char *)"N;3", EN_JUNCTION);
64-
BOOST_REQUIRE(error == 250);
64+
BOOST_REQUIRE(error == 252);
6565

6666
EN_getnodeindex(ph, (char *)"N2", &index);
6767
error = EN_setnodeid(ph, index, (char *)"N;2");
68-
BOOST_REQUIRE(error = 250);
68+
BOOST_REQUIRE(error = 252);
6969
}
7070

7171

‎tests/test_pattern.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -155,17 +155,17 @@ BOOST_FIXTURE_TEST_CASE(test_pat_id_isvalid, FixtureInitClose)
155155
BOOST_REQUIRE(error == 0);
156156

157157
error = EN_addpattern(ph, (char *)"P 2");
158-
BOOST_REQUIRE(error == 250);
158+
BOOST_REQUIRE(error == 252);
159159

160160
error = EN_addpattern(ph, (char *)"P\"2");
161-
BOOST_REQUIRE(error == 250);
161+
BOOST_REQUIRE(error == 252);
162162

163163
error = EN_addpattern(ph, (char *)"P;2");
164-
BOOST_REQUIRE(error == 250);
164+
BOOST_REQUIRE(error == 252);
165165

166166
EN_getpatternindex(ph, (char *)"P1", &index);
167167
error = EN_setpatternid(ph, index, (char *)"P;1");
168-
BOOST_REQUIRE(error == 250);
168+
BOOST_REQUIRE(error == 252);
169169

170170
}
171171

0 commit comments

Comments
 (0)
Please sign in to comment.