1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713
|
/*
* mergeinfo-test.c -- test the mergeinfo functions
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
* ====================================================================
*/
#include <stdio.h>
#include <string.h>
#include <apr_hash.h>
#include <apr_tables.h>
#define SVN_DEPRECATED
#include "svn_hash.h"
#include "svn_pools.h"
#include "svn_types.h"
#include "svn_mergeinfo.h"
#include "private/svn_mergeinfo_private.h"
#include "../svn_test.h"
/* A quick way to create error messages. */
static svn_error_t *
fail(apr_pool_t *pool, const char *fmt, ...)
{
va_list ap;
char *msg;
va_start(ap, fmt);
msg = apr_pvsprintf(pool, fmt, ap);
va_end(ap);
return svn_error_create(SVN_ERR_TEST_FAILED, 0, msg);
}
#define MAX_NBR_RANGES 5
/* Verify that INPUT is parsed properly, and returns an error if
parsing fails, or incorret parsing is detected. Assumes that INPUT
contains only one path -> ranges mapping, and that EXPECTED_RANGES points
to the first range in an array whose size is greater than or equal to
the number of ranges in INPUTS path -> ranges mapping but less than
MAX_NBR_RANGES. If fewer than MAX_NBR_RANGES ranges are present, then the
trailing expected_ranges should be have their end revision set to 0. */
static svn_error_t *
verify_mergeinfo_parse(const char *input,
const char *expected_path,
const svn_merge_range_t *expected_ranges,
apr_pool_t *pool)
{
svn_error_t *err;
apr_hash_t *path_to_merge_ranges;
apr_hash_index_t *hi;
/* Test valid input. */
err = svn_mergeinfo_parse(&path_to_merge_ranges, input, pool);
if (err || apr_hash_count(path_to_merge_ranges) != 1)
return svn_error_createf(SVN_ERR_TEST_FAILED, err,
"svn_mergeinfo_parse (%s) failed unexpectedly",
input);
for (hi = apr_hash_first(pool, path_to_merge_ranges); hi;
hi = apr_hash_next(hi))
{
const void *path;
void *val;
svn_rangelist_t *ranges;
svn_merge_range_t *range;
int j;
apr_hash_this(hi, &path, NULL, &val);
ranges = val;
if (strcmp((const char *) path, expected_path) != 0)
return fail(pool, "svn_mergeinfo_parse (%s) failed to parse the "
"correct path (%s)", input, expected_path);
/* Test each parsed range. */
for (j = 0; j < ranges->nelts; j++)
{
range = APR_ARRAY_IDX(ranges, j, svn_merge_range_t *);
if (range->start != expected_ranges[j].start
|| range->end != expected_ranges[j].end
|| range->inheritable != expected_ranges[j].inheritable)
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"svn_mergeinfo_parse (%s) failed to "
"parse the correct range",
input);
}
/* Were we expecting any more ranges? */
if (j < MAX_NBR_RANGES - 1
&& !expected_ranges[j].end == 0)
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"svn_mergeinfo_parse (%s) failed to "
"produce the expected number of ranges",
input);
}
return SVN_NO_ERROR;
}
/* Some of our own global variables (for simplicity), which map paths
-> merge ranges. */
static apr_hash_t *info1, *info2;
#define NBR_MERGEINFO_VALS 24
/* Valid mergeinfo values. */
static const char * const mergeinfo_vals[NBR_MERGEINFO_VALS] =
{
"/trunk:1",
"/trunk/foo:1-6",
"/trunk: 5,7-9,10,11,13,14",
"/trunk: 3-10,11*,13,14",
"/branch: 1,2-18*,33*",
/* Path names containing ':'s */
"patch-common::netasq-bpf.c:25381",
"patch-common_netasq-bpf.c::25381",
":patch:common:netasq:bpf.c:25381",
/* Unordered rangelists */
"/trunk:3-6,15,18,9,22",
"/trunk:5,3",
"/trunk:3-6*,15*,18*,9,22*",
"/trunk:5,3*",
"/trunk:100,3-7,50,99,1-2",
/* Overlapping rangelists */
"/gunther_branch:5-10,7-12",
"/gunther_branch:5-10*,7-12*",
"/branches/branch1:43832-45742,49990-53669,43832-49987",
/* Unordered and overlapping rangelists */
"/gunther_branch:7-12,1,5-10",
"/gunther_branch:7-12*,1,5-10*",
/* Adjacent rangelists of differing inheritability. */
"/b5:5-53,1-4,54-90*",
"/c0:1-77,12-44",
/* Non-canonical paths. */
"/A/:7-8",
"/A///:7-8",
"/A/.:7-8",
"/A/./B:7-8"
};
/* Paths corresponding to mergeinfo_vals. */
static const char * const mergeinfo_paths[NBR_MERGEINFO_VALS] =
{
"/trunk",
"/trunk/foo",
"/trunk",
"/trunk",
"/branch",
/* svn_mergeinfo_parse converts relative merge soure paths to absolute. */
"/patch-common::netasq-bpf.c",
"/patch-common_netasq-bpf.c:",
"/:patch:common:netasq:bpf.c",
"/trunk",
"/trunk",
"/trunk",
"/trunk",
"/trunk",
"/gunther_branch",
"/gunther_branch",
"/branches/branch1",
"/gunther_branch",
"/gunther_branch",
"/b5",
"/c0",
/* non-canonical paths converted to canonical */
"/A",
"/A",
"/A",
"/A/B"
};
/* First ranges from the paths identified by mergeinfo_paths. */
static svn_merge_range_t mergeinfo_ranges[NBR_MERGEINFO_VALS][MAX_NBR_RANGES] =
{
{ {0, 1, TRUE} },
{ {0, 6, TRUE} },
{ {4, 5, TRUE}, { 6, 11, TRUE }, {12, 14, TRUE } },
{ {2, 10, TRUE}, {10, 11, FALSE}, {12, 14, TRUE } },
{ {0, 1, TRUE}, { 1, 18, FALSE}, {32, 33, FALSE} },
{ {25380, 25381, TRUE } },
{ {25380, 25381, TRUE } },
{ {25380, 25381, TRUE } },
{ {2, 6, TRUE}, {8, 9, TRUE}, {14, 15, TRUE}, {17, 18, TRUE},
{21, 22, TRUE} },
{ {2, 3, TRUE}, {4, 5, TRUE} },
{ {2, 6, FALSE}, {8, 9, TRUE}, {14, 15, FALSE}, {17, 18, FALSE},
{21, 22, FALSE} },
{ {2, 3, FALSE}, {4, 5, TRUE} },
{ {0, 7, TRUE}, {49, 50, TRUE}, {98, 100, TRUE} },
{ {4, 12, TRUE} },
{ {4, 12, FALSE} },
{ {43831, 49987, TRUE}, {49989, 53669, TRUE} },
{ {0, 1, TRUE}, {4, 12, TRUE} },
{ {0, 1, TRUE}, {4, 12, FALSE} },
{ {0, 53, TRUE}, {53, 90, FALSE} },
{ {0, 77, TRUE} },
{ {6, 8, TRUE} },
{ {6, 8, TRUE} },
{ {6, 8, TRUE} },
{ {6, 8, TRUE} },
};
static svn_error_t *
test_parse_single_line_mergeinfo(apr_pool_t *pool)
{
int i;
for (i = 0; i < NBR_MERGEINFO_VALS; i++)
SVN_ERR(verify_mergeinfo_parse(mergeinfo_vals[i], mergeinfo_paths[i],
mergeinfo_ranges[i], pool));
return SVN_NO_ERROR;
}
static const char *single_mergeinfo = "/trunk: 5,7-9,10,11,13,14";
static svn_error_t *
test_mergeinfo_dup(apr_pool_t *pool)
{
apr_hash_t *orig_mergeinfo, *copied_mergeinfo;
apr_pool_t *subpool;
svn_rangelist_t *rangelist;
/* Assure that copies which should be empty turn out that way. */
subpool = svn_pool_create(pool);
orig_mergeinfo = apr_hash_make(subpool);
copied_mergeinfo = svn_mergeinfo_dup(orig_mergeinfo, subpool);
if (apr_hash_count(copied_mergeinfo) != 0)
return fail(pool, "Copied mergeinfo should be empty");
/* Create some mergeinfo, copy it using another pool, then destroy
the pool with which the original mergeinfo was created. */
SVN_ERR(svn_mergeinfo_parse(&orig_mergeinfo, single_mergeinfo, subpool));
copied_mergeinfo = svn_mergeinfo_dup(orig_mergeinfo, pool);
svn_pool_destroy(subpool);
if (apr_hash_count(copied_mergeinfo) != 1)
return fail(pool, "Copied mergeinfo should contain one merge source");
rangelist = apr_hash_get(copied_mergeinfo, "/trunk", APR_HASH_KEY_STRING);
if (! rangelist)
return fail(pool, "Expected copied mergeinfo; got nothing");
if (rangelist->nelts != 3)
return fail(pool, "Copied mergeinfo should contain 3 revision ranges, "
"rather than the %d it contains", rangelist->nelts);
return SVN_NO_ERROR;
}
static svn_error_t *
test_parse_combine_rangeinfo(apr_pool_t *pool)
{
apr_array_header_t *result;
svn_merge_range_t *resultrange;
SVN_ERR(svn_mergeinfo_parse(&info1, single_mergeinfo, pool));
if (apr_hash_count(info1) != 1)
return fail(pool, "Wrong number of paths in parsed mergeinfo");
result = apr_hash_get(info1, "/trunk", APR_HASH_KEY_STRING);
if (!result)
return fail(pool, "Missing path in parsed mergeinfo");
/* /trunk should have three ranges, 5-5, 7-11, 13-14 */
if (result->nelts != 3)
return fail(pool, "Parsing failed to combine ranges");
resultrange = APR_ARRAY_IDX(result, 0, svn_merge_range_t *);
if (resultrange->start != 4 || resultrange->end != 5)
return fail(pool, "Range combining produced wrong result");
resultrange = APR_ARRAY_IDX(result, 1, svn_merge_range_t *);
if (resultrange->start != 6 || resultrange->end != 11)
return fail(pool, "Range combining produced wrong result");
resultrange = APR_ARRAY_IDX(result, 2, svn_merge_range_t *);
if (resultrange->start != 12 || resultrange->end != 14)
return fail(pool, "Range combining produced wrong result");
return SVN_NO_ERROR;
}
#define NBR_BROKEN_MERGEINFO_VALS 27
/* Invalid mergeinfo values. */
static const char * const broken_mergeinfo_vals[NBR_BROKEN_MERGEINFO_VALS] =
{
/* Invalid grammar */
"/missing-revs",
"/trunk: 5,7-9,10,11,13,14,",
"/trunk 5,7-9,10,11,13,14",
"/trunk:5 7--9 10 11 13 14",
/* Overlapping revs differing inheritability */
"/trunk:5-9*,9",
"/trunk:5,5-9*",
"/trunk:5-9,9*",
"/trunk:5*,5-9",
"/trunk:4,4*",
"/trunk:4*,4",
"/trunk:3-7*,4-23",
"/trunk:3-7,4-23*",
/* Reversed revision ranges */
"/trunk:22-20",
"/trunk:22-20*",
"/trunk:3,7-12,22-20,25",
"/trunk:3,7,22-20*,25-30",
/* Range with same start and end revision */
"/trunk:22-22",
"/trunk:22-22*",
"/trunk:3,7-12,20-20,25",
"/trunk:3,7,20-20*,25-30",
/* path mapped to range with no revisions */
"/trunk:",
"/trunk:2-9\n/branch:",
"::",
/* No path */
":1-3",
/* Invalid revisions */
"trunk:a-3",
"branch:3-four",
"trunk:yadayadayada"
};
static svn_error_t *
test_parse_broken_mergeinfo(apr_pool_t *pool)
{
int i;
svn_error_t *err;
/* Trigger some error(s) with mal-formed input. */
for (i = 0; i < NBR_BROKEN_MERGEINFO_VALS; i++)
{
err = svn_mergeinfo_parse(&info1, broken_mergeinfo_vals[i], pool);
if (err == SVN_NO_ERROR)
{
return fail(pool, "svn_mergeinfo_parse (%s) failed to detect an error",
broken_mergeinfo_vals[i]);
}
else if (err->apr_err != SVN_ERR_MERGEINFO_PARSE_ERROR)
{
svn_error_clear(err);
return fail(pool, "svn_mergeinfo_parse (%s) returned some error other"
" than SVN_ERR_MERGEINFO_PARSE_ERROR",
broken_mergeinfo_vals[i]);
}
else
{
svn_error_clear(err);
}
}
return SVN_NO_ERROR;
}
static const char *mergeinfo1 = "/trunk: 3,5,7-9,10,11,13,14\n/fred:8-10";
#define NBR_RANGELIST_DELTAS 4
/* Convert a single svn_merge_range_t * back into an svn_stringbuf_t *. */
static char *
range_to_string(svn_merge_range_t *range,
apr_pool_t *pool)
{
if (range->start == range->end - 1)
return apr_psprintf(pool, "%ld%s", range->end,
range->inheritable
? "" : SVN_MERGEINFO_NONINHERITABLE_STR);
else
return apr_psprintf(pool, "%ld-%ld%s", range->start + 1,
range->end, range->inheritable
? "" : SVN_MERGEINFO_NONINHERITABLE_STR);
}
/* Verify that ACTUAL_RANGELIST matches EXPECTED_RANGES (an array of
NBR_EXPECTED length). Return an error based careful examination if
they do not match. FUNC_VERIFIED is the name of the API being
verified (e.g. "svn_rangelist_intersect"), while TYPE is a word
describing what the ranges being examined represent. */
static svn_error_t *
verify_ranges_match(const svn_rangelist_t *actual_rangelist,
svn_merge_range_t *expected_ranges, int nbr_expected,
const char *func_verified, const char *type,
apr_pool_t *pool)
{
int i;
if (actual_rangelist->nelts != nbr_expected)
return fail(pool, "%s should report %d range %ss, but found %d",
func_verified, nbr_expected, type, actual_rangelist->nelts);
for (i = 0; i < actual_rangelist->nelts; i++)
{
svn_merge_range_t *range = APR_ARRAY_IDX(actual_rangelist, i,
svn_merge_range_t *);
if (range->start != expected_ranges[i].start
|| range->end != expected_ranges[i].end
|| range->inheritable != expected_ranges[i].inheritable)
return fail(pool, "%s should report range %s, but found %s",
func_verified,
range_to_string(&expected_ranges[i], pool),
range_to_string(range, pool));
}
return SVN_NO_ERROR;
}
/* Verify that DELTAS matches EXPECTED_DELTAS (both expected to
contain only a rangelist for "/trunk"). Return an error based
careful examination if they do not match. FUNC_VERIFIED is the
name of the API being verified (e.g. "svn_mergeinfo_diff"), while
TYPE is a word describing what the deltas being examined
represent. */
static svn_error_t *
verify_mergeinfo_deltas(apr_hash_t *deltas, svn_merge_range_t *expected_deltas,
const char *func_verified, const char *type,
apr_pool_t *pool)
{
svn_rangelist_t *rangelist;
if (apr_hash_count(deltas) != 1)
/* Deltas on "/trunk" expected. */
return fail(pool, "%s should report 1 path %s, but found %d",
func_verified, type, apr_hash_count(deltas));
rangelist = apr_hash_get(deltas, "/trunk", APR_HASH_KEY_STRING);
if (rangelist == NULL)
return fail(pool, "%s failed to produce a rangelist for /trunk",
func_verified);
return verify_ranges_match(rangelist, expected_deltas, NBR_RANGELIST_DELTAS,
func_verified, type, pool);
}
static svn_error_t *
test_diff_mergeinfo(apr_pool_t *pool)
{
apr_hash_t *deleted, *added, *from, *to;
svn_merge_range_t expected_rangelist_deletions[NBR_RANGELIST_DELTAS] =
{ {6, 7, TRUE}, {8, 9, TRUE}, {10, 11, TRUE}, {32, 34, TRUE} };
svn_merge_range_t expected_rangelist_additions[NBR_RANGELIST_DELTAS] =
{ {1, 2, TRUE}, {4, 6, TRUE}, {12, 16, TRUE}, {29, 30, TRUE} };
SVN_ERR(svn_mergeinfo_parse(&from, "/trunk: 1,3-4,7,9,11-12,31-34", pool));
SVN_ERR(svn_mergeinfo_parse(&to, "/trunk: 1-6,12-16,30-32", pool));
/* On /trunk: deleted (7, 9, 11, 33-34) and added (2, 5-6, 13-16, 30) */
SVN_ERR(svn_mergeinfo_diff(&deleted, &added, from, to,
FALSE, pool));
/* Verify calculation of range list deltas. */
SVN_ERR(verify_mergeinfo_deltas(deleted, expected_rangelist_deletions,
"svn_mergeinfo_diff", "deletion", pool));
SVN_ERR(verify_mergeinfo_deltas(added, expected_rangelist_additions,
"svn_mergeinfo_diff", "addition", pool));
return SVN_NO_ERROR;
}
static svn_error_t *
test_rangelist_reverse(apr_pool_t *pool)
{
svn_rangelist_t *rangelist;
svn_merge_range_t expected_rangelist[3] =
{ {10, 9, TRUE}, {7, 4, TRUE}, {3, 2, TRUE} };
SVN_ERR(svn_rangelist__parse(&rangelist, "3,5-7,10", pool));
SVN_ERR(svn_rangelist_reverse(rangelist, pool));
return verify_ranges_match(rangelist, expected_rangelist, 3,
"svn_rangelist_reverse", "reversal", pool);
}
static svn_error_t *
test_rangelist_intersect(apr_pool_t *pool)
{
svn_rangelist_t *rangelist1, *rangelist2, *intersection;
/* Expected intersection when considering inheritance. */
svn_merge_range_t intersection_consider_inheritance[] =
{ {0, 1, TRUE}, {11, 12, TRUE}, {30, 32, FALSE}, {39, 42, TRUE} };
/* Expected intersection when ignoring inheritance. */
svn_merge_range_t intersection_ignore_inheritance[] =
{ {0, 1, TRUE}, {2, 4, TRUE}, {11, 12, TRUE}, {30, 32, FALSE},
{39, 42, TRUE} };
SVN_ERR(svn_rangelist__parse(&rangelist1, "1-6,12-16,30-32*,40-42", pool));
SVN_ERR(svn_rangelist__parse(&rangelist2, "1,3-4*,7,9,11-12,31-34*,38-44",
pool));
/* Check the intersection while considering inheritance twice, reversing
the order of the rangelist arguments on the second call to
svn_rangelist_intersection. The order *should* have no effect on
the result -- see http://svn.haxx.se/dev/archive-2010-03/0351.shtml.
'3-4*' has different inheritance than '1-6', so no intersection is
expected. '30-32*' and '31-34*' have the same inheritance, so intersect
at '31-32*'. Per the svn_rangelist_intersect API, since both ranges
are non-inheritable, so is the result. */
SVN_ERR(svn_rangelist_intersect(&intersection, rangelist1, rangelist2,
TRUE, pool));
SVN_ERR(verify_ranges_match(intersection,
intersection_consider_inheritance,
4, "svn_rangelist_intersect", "intersect",
pool));
SVN_ERR(svn_rangelist_intersect(&intersection, rangelist2, rangelist1,
TRUE, pool));
SVN_ERR(verify_ranges_match(intersection,
intersection_consider_inheritance,
4, "svn_rangelist_intersect", "intersect",
pool));
/* Check the intersection while ignoring inheritance. The one difference
from when we consider inheritance is that '3-4*' and '1-6' now intersect,
since we don't care about inheritability, just the start and end ranges.
Per the svn_rangelist_intersect API, since only one range is
non-inheritable the result is inheritable. */
SVN_ERR(svn_rangelist_intersect(&intersection, rangelist1, rangelist2,
FALSE, pool));
SVN_ERR(verify_ranges_match(intersection,
intersection_ignore_inheritance,
5, "svn_rangelist_intersect", "intersect",
pool));
SVN_ERR(svn_rangelist_intersect(&intersection, rangelist2, rangelist1,
FALSE, pool));
SVN_ERR(verify_ranges_match(intersection,
intersection_ignore_inheritance,
5, "svn_rangelist_intersect", "intersect",
pool));
return SVN_NO_ERROR;
}
static svn_error_t *
test_mergeinfo_intersect(apr_pool_t *pool)
{
svn_merge_range_t expected_intersection[3] =
{ {0, 1, TRUE}, {2, 4, TRUE}, {11, 12, TRUE} };
svn_rangelist_t *rangelist;
apr_hash_t *intersection;
SVN_ERR(svn_mergeinfo_parse(&info1, "/trunk: 1-6,12-16\n/foo: 31", pool));
SVN_ERR(svn_mergeinfo_parse(&info2, "/trunk: 1,3-4,7,9,11-12", pool));
SVN_ERR(svn_mergeinfo_intersect(&intersection, info1, info2, pool));
if (apr_hash_count(intersection) != 1)
return fail(pool, "Unexpected number of rangelists in mergeinfo "
"intersection: Expected %d, found %d", 1,
apr_hash_count(intersection));
rangelist = apr_hash_get(intersection, "/trunk", APR_HASH_KEY_STRING);
return verify_ranges_match(rangelist, expected_intersection, 3,
"svn_rangelist_intersect", "intersect", pool);
}
static svn_error_t *
test_merge_mergeinfo(apr_pool_t *pool)
{
int i;
/* Structures and constants for test_merge_mergeinfo() */
/* Number of svn_mergeinfo_merge test sets */
#define NBR_MERGEINFO_MERGES 12
/* Maximum number of expected paths in the results
of the svn_mergeinfo_merge tests */
#define MAX_NBR_MERGEINFO_PATHS 4
/* Maximum number of expected ranges in the results
of the svn_mergeinfo_merge tests */
#define MAX_NBR_MERGEINFO_RANGES 10
/* Struct to store a path and it's expected ranges,
i.e. the expected result of an svn_mergeinfo_merge
test. */
struct mergeinfo_merge_path_range
{
const char *path;
int expected_n;
svn_merge_range_t expected_rngs[MAX_NBR_MERGEINFO_RANGES];
};
/* Struct for svn_mergeinfo_merge test data.
If MERGEINFO1 and MERGEINFO2 are parsed to a hash with
svn_mergeinfo_parse() and then merged with svn_mergeinfo_merge(),
the resulting hash should have EXPECTED_PATHS number of paths
mapped to rangelists and each mapping is described by PATH_RNGS
where PATH_RNGS->PATH is not NULL. */
struct mergeinfo_merge_test_data
{
const char *mergeinfo1;
const char *mergeinfo2;
int expected_paths;
struct mergeinfo_merge_path_range path_rngs[MAX_NBR_MERGEINFO_PATHS];
};
static struct mergeinfo_merge_test_data mergeinfo[NBR_MERGEINFO_MERGES] =
{
/* One path, intersecting inheritable ranges */
{ "/trunk: 5-10",
"/trunk: 6", 1,
{ {"/trunk", 1, { {4, 10, TRUE} } } } },
/* One path, intersecting non-inheritable ranges */
{ "/trunk: 5-10*",
"/trunk: 6*", 1,
{ {"/trunk", 1, { {4, 10, FALSE} } } } },
/* One path, intersecting ranges with different inheritability */
{ "/trunk: 5-10",
"/trunk: 6*", 1,
{ {"/trunk", 1, { {4, 10, TRUE} } } } },
/* One path, intersecting ranges with different inheritability */
{ "/trunk: 5-10*",
"/trunk: 6", 1,
{ {"/trunk", 3, { {4, 5, FALSE}, {5, 6, TRUE}, {6, 10, FALSE} } } } },
/* Adjacent ranges all inheritable ranges */
{ "/trunk: 1,3,5-11,13",
"/trunk: 2,4,12,14-22", 1,
{ {"/trunk", 1, { {0, 22, TRUE} } } } },
/* Adjacent ranges all non-inheritable ranges */
{ "/trunk: 1*,3*,5-11*,13*",
"/trunk: 2*,4*,12*,14-22*", 1,
{ {"/trunk", 1, { {0, 22, FALSE} } } } },
/* Adjacent ranges differing inheritability */
{ "/trunk: 1*,3*,5-11*,13*",
"/trunk: 2,4,12,14-22", 1,
{ {"/trunk", 8, { { 0, 1, FALSE}, { 1, 2, TRUE},
{ 2, 3, FALSE}, { 3, 4, TRUE},
{ 4, 11, FALSE}, {11, 12, TRUE},
{12, 13, FALSE}, {13, 22, TRUE} } } } },
/* Adjacent ranges differing inheritability */
{ "/trunk: 1,3,5-11,13",
"/trunk: 2*,4*,12*,14-22*", 1,
{ {"/trunk", 8, { { 0, 1, TRUE}, { 1, 2, FALSE},
{ 2, 3, TRUE}, { 3, 4, FALSE},
{ 4, 11, TRUE}, {11, 12, FALSE},
{12, 13, TRUE}, {13, 22, FALSE} } } } },
/* Two paths all inheritable ranges */
{ "/trunk::1: 3,5,7-9,10,11,13,14\n/fred:8-10",
"/trunk::1: 1-4,6\n/fred:9-12", 2,
{ {"/trunk::1", 2, { {0, 11, TRUE}, {12, 14, TRUE} } },
{"/fred", 1, { {7, 12, TRUE} } } } },
/* Two paths all non-inheritable ranges */
{ "/trunk: 3*,5*,7-9*,10*,11*,13*,14*\n/fred:8-10*",
"/trunk: 1-4*,6*\n/fred:9-12*", 2,
{ {"/trunk", 2, { {0, 11, FALSE}, {12, 14, FALSE} } },
{"/fred", 1, { {7, 12, FALSE} } } } },
/* Two paths mixed inheritability */
{ "/trunk: 3,5*,7-9,10,11*,13,14\n/fred:8-10",
"/trunk: 1-4,6\n/fred:9-12*", 2,
{ {"/trunk", 5, { { 0, 4, TRUE }, { 4, 5, FALSE}, {5, 10, TRUE},
{10, 11, FALSE}, {12, 14, TRUE } } },
{"/fred", 2, { { 7, 10, TRUE }, {10, 12, FALSE} } } } },
/* A slew of different paths but no ranges to be merged */
{ "/trunk: 3,5-9*\n/betty: 2-4",
"/fred: 1-18\n/:barney: 1,3-43", 4,
{ {"/trunk", 2, { {2, 3, TRUE}, {4, 9, FALSE} } },
{"/betty", 1, { {1, 4, TRUE} } },
{"/:barney", 2, { {0, 1, TRUE}, {2, 43, TRUE} } },
{"/fred", 1, { {0, 18, TRUE} } } } }
};
for (i = 0; i < NBR_MERGEINFO_MERGES; i++)
{
int j;
svn_string_t *info2_starting, *info2_ending;
SVN_ERR(svn_mergeinfo_parse(&info1, mergeinfo[i].mergeinfo1, pool));
SVN_ERR(svn_mergeinfo_parse(&info2, mergeinfo[i].mergeinfo2, pool));
/* Make a copy of info2. We will merge it into info1, but info2
should remain unchanged. Store the mergeinfo as a svn_string_t
rather than making a copy and using svn_mergeinfo_diff(). Since
that API uses some of the underlying code as svn_mergeinfo_merge
we might mask potential errors. */
SVN_ERR(svn_mergeinfo_to_string(&info2_starting, info2, pool));
SVN_ERR(svn_mergeinfo_merge(info1, info2, pool));
if (mergeinfo[i].expected_paths != (int)apr_hash_count(info1))
return fail(pool, "Wrong number of paths in merged mergeinfo");
/* Check that info2 remained unchanged. */
SVN_ERR(svn_mergeinfo_to_string(&info2_ending, info2, pool));
if (strcmp(info2_ending->data, info2_starting->data))
return fail(pool,
apr_psprintf(pool,
"svn_mergeinfo_merge case %i "
"modified its CHANGES arg from "
"%s to %s", i, info2_starting->data,
info2_ending->data));
for (j = 0; j < mergeinfo[i].expected_paths; j++)
{
svn_rangelist_t *rangelist =
apr_hash_get(info1, mergeinfo[i].path_rngs[j].path,
APR_HASH_KEY_STRING);
if (!rangelist)
return fail(pool, "Missing path '%s' in merged mergeinfo",
mergeinfo[i].path_rngs[j].path);
SVN_ERR(verify_ranges_match(
rangelist,
mergeinfo[i].path_rngs[j].expected_rngs,
mergeinfo[i].path_rngs[j].expected_n,
apr_psprintf(pool, "svn_rangelist_merge case %i:%i", i, j),
"merge", pool));
}
}
return SVN_NO_ERROR;
}
static svn_error_t *
test_remove_rangelist(apr_pool_t *pool)
{
int i, j;
svn_error_t *err, *child_err;
svn_rangelist_t *output, *eraser, *whiteboard;
/* Struct for svn_rangelist_remove test data.
Parse WHITEBOARD and ERASER to hashes and then get the rangelist for
path 'A' from both.
Remove ERASER's rangelist from WHITEBOARD's twice, once while
considering inheritance and once while not. In the first case the
resulting rangelist should have EXPECTED_RANGES_CONSIDER_INHERITANCE
number of ranges and these ranges should match the ranges in
EXPECTED_REMOVED_CONSIDER_INHERITANCE. In the second case there
should be EXPECTED_RANGES_IGNORE_INHERITANCE number of ranges and
these should match EXPECTED_REMOVED_IGNORE_INHERITANCE */
struct rangelist_remove_test_data
{
const char *whiteboard;
const char *eraser;
int expected_ranges_consider_inheritance;
svn_merge_range_t expected_removed_consider_inheritance[10];
int expected_ranges_ignore_inheritance;
svn_merge_range_t expected_removed_ignore_inheritance[10];
};
#define SIZE_OF_RANGE_REMOVE_TEST_ARRAY 15
/* The actual test data */
struct rangelist_remove_test_data test_data[SIZE_OF_RANGE_REMOVE_TEST_ARRAY] =
{
/* Eraser is a proper subset of whiteboard */
{"1-44", "5", 2, { {0, 4, TRUE }, {5, 44, TRUE }},
2, { {0, 4, TRUE }, {5, 44, TRUE }}},
{"1-44*", "5", 1, { {0, 44, FALSE} },
2, { {0, 4, FALSE}, {5, 44, FALSE}}},
{"1-44", "5*", 1, { {0, 44, TRUE } },
2, { {0, 4, TRUE }, {5, 44, TRUE }}},
{"1-44*", "5*", 2, { {0, 4, FALSE}, {5, 44, FALSE}},
2, { {0, 4, FALSE}, {5, 44, FALSE}}},
/* Non-intersecting ranges...nothing is removed */
{"2-9,14-19", "12", 2, { {1, 9, TRUE }, {13, 19, TRUE }},
2, { {1, 9, TRUE }, {13, 19, TRUE }}},
{"2-9*,14-19*", "12", 2, { {1, 9, FALSE}, {13, 19, FALSE}},
2, { {1, 9, FALSE}, {13, 19, FALSE}}},
{"2-9,14-19", "12*", 2, { {1, 9, TRUE }, {13, 19, TRUE }},
2, { {1, 9, TRUE }, {13, 19, TRUE }}},
{"2-9*,14-19*", "12*", 2, { {1, 9, FALSE}, {13, 19, FALSE}},
2, { {1, 9, FALSE}, {13, 19, FALSE}}},
/* Eraser overlaps whiteboard */
{"1,9-17", "12-20", 2, { {0, 1, TRUE }, {8, 11, TRUE }},
2, { {0, 1, TRUE }, {8, 11, TRUE }}},
{"1,9-17*", "12-20", 2, { {0, 1, TRUE }, {8, 17, FALSE}},
2, { {0, 1, TRUE }, {8, 11, FALSE}}},
{"1,9-17", "12-20*", 2, { {0, 1, TRUE }, {8, 17, TRUE }},
2, { {0, 1, TRUE }, {8, 11, TRUE }}},
{"1,9-17*", "12-20*", 2, { {0, 1, TRUE }, {8, 11, FALSE}},
2, { {0, 1, TRUE }, {8, 11, FALSE}}},
/* Empty rangelist */
{"", "", 0, { {0, 0, FALSE}},
0, { {0, 0, FALSE}}},
{"", "5-8,10-100", 0, { {0, 0, FALSE}},
0, { {0, 0, FALSE}}},
{"5-8,10-100", "", 2, { {4, 8, TRUE }, {9, 100, TRUE }},
2, { {4, 8, TRUE }, {9, 100, TRUE }}}
};
err = child_err = SVN_NO_ERROR;
for (j = 0; j < 2; j++)
{
for (i = 0; i < SIZE_OF_RANGE_REMOVE_TEST_ARRAY; i++)
{
int expected_nbr_ranges;
svn_merge_range_t *expected_ranges;
svn_string_t *eraser_starting;
svn_string_t *eraser_ending;
svn_string_t *whiteboard_starting;
svn_string_t *whiteboard_ending;
SVN_ERR(svn_rangelist__parse(&eraser, test_data[i].eraser, pool));
SVN_ERR(svn_rangelist__parse(&whiteboard, test_data[i].whiteboard, pool));
/* Represent empty mergeinfo with an empty rangelist. */
if (eraser == NULL)
eraser = apr_array_make(pool, 0, sizeof(*eraser));
if (whiteboard == NULL)
whiteboard = apr_array_make(pool, 0, sizeof(*whiteboard));
/* First pass try removal considering inheritance, on the
second pass ignore it. */
if (j == 0)
{
expected_nbr_ranges = (test_data[i]).expected_ranges_consider_inheritance;
expected_ranges = (test_data[i]).expected_removed_consider_inheritance;
}
else
{
expected_nbr_ranges = (test_data[i]).expected_ranges_ignore_inheritance;
expected_ranges = (test_data[i]).expected_removed_ignore_inheritance;
}
/* Make a copies of whiteboard and eraser. They should not be
modified by svn_rangelist_remove(). */
SVN_ERR(svn_rangelist_to_string(&eraser_starting, eraser, pool));
SVN_ERR(svn_rangelist_to_string(&whiteboard_starting, whiteboard,
pool));
SVN_ERR(svn_rangelist_remove(&output, eraser, whiteboard,
j == 0,
pool));
child_err = verify_ranges_match(output, expected_ranges,
expected_nbr_ranges,
apr_psprintf(pool,
"svn_rangelist_remove "
"case %i", i),
"remove", pool);
/* Collect all the errors rather than returning on the first. */
if (child_err)
{
if (err)
svn_error_compose(err, child_err);
else
err = child_err;
}
/* Check that eraser and whiteboard were not modified. */
SVN_ERR(svn_rangelist_to_string(&eraser_ending, eraser, pool));
SVN_ERR(svn_rangelist_to_string(&whiteboard_ending, whiteboard,
pool));
if (strcmp(eraser_starting->data, eraser_ending->data))
{
child_err = fail(pool,
apr_psprintf(pool,
"svn_rangelist_remove case %i "
"modified its ERASER arg from "
"%s to %s when %sconsidering "
"inheritance", i,
eraser_starting->data,
eraser_ending->data,
j ? "" : "not "));
if (err)
svn_error_compose(err, child_err);
else
err = child_err;
}
if (strcmp(whiteboard_starting->data, whiteboard_ending->data))
{
child_err = fail(pool,
apr_psprintf(pool,
"svn_rangelist_remove case %i "
"modified its WHITEBOARD arg "
"from %s to %s when "
"%sconsidering inheritance", i,
whiteboard_starting->data,
whiteboard_ending->data,
j ? "" : "not "));
if (err)
svn_error_compose(err, child_err);
else
err = child_err;
}
}
}
return err;
}
#define RANDOM_REV_ARRAY_LENGTH 100
/* Random number seed. */
static apr_uint32_t random_rev_array_seed;
/* Set a random 3/4-ish of the elements of array REVS[RANDOM_REV_ARRAY_LENGTH]
* to TRUE and the rest to FALSE. */
static void
randomly_fill_rev_array(svn_boolean_t *revs)
{
int i;
for (i = 0; i < RANDOM_REV_ARRAY_LENGTH; i++)
{
apr_uint32_t next = svn_test_rand(&random_rev_array_seed);
revs[i] = (next < 0x40000000) ? 0 : 1;
}
}
/* Set *RANGELIST to a rangelist representing the revisions that are marked
* with TRUE in the array REVS[RANDOM_REV_ARRAY_LENGTH]. */
static svn_error_t *
rev_array_to_rangelist(svn_rangelist_t **rangelist,
svn_boolean_t *revs,
apr_pool_t *pool)
{
svn_stringbuf_t *buf = svn_stringbuf_create("/trunk: ", pool);
svn_boolean_t first = TRUE;
apr_hash_t *mergeinfo;
int i;
for (i = 0; i < RANDOM_REV_ARRAY_LENGTH; i++)
{
if (revs[i])
{
if (first)
first = FALSE;
else
svn_stringbuf_appendcstr(buf, ",");
svn_stringbuf_appendcstr(buf, apr_psprintf(pool, "%d", i));
}
}
SVN_ERR(svn_mergeinfo_parse(&mergeinfo, buf->data, pool));
*rangelist = apr_hash_get(mergeinfo, "/trunk", APR_HASH_KEY_STRING);
return SVN_NO_ERROR;
}
static svn_error_t *
test_rangelist_remove_randomly(apr_pool_t *pool)
{
int i;
apr_pool_t *iterpool;
random_rev_array_seed = (apr_uint32_t) apr_time_now();
iterpool = svn_pool_create(pool);
for (i = 0; i < 20; i++)
{
svn_boolean_t first_revs[RANDOM_REV_ARRAY_LENGTH],
second_revs[RANDOM_REV_ARRAY_LENGTH],
expected_revs[RANDOM_REV_ARRAY_LENGTH];
svn_rangelist_t *first_rangelist, *second_rangelist,
*expected_rangelist, *actual_rangelist;
/* There will be at most RANDOM_REV_ARRAY_LENGTH ranges in
expected_rangelist. */
svn_merge_range_t expected_range_array[RANDOM_REV_ARRAY_LENGTH];
int j;
svn_pool_clear(iterpool);
randomly_fill_rev_array(first_revs);
randomly_fill_rev_array(second_revs);
/* There is no change numbered "r0" */
first_revs[0] = FALSE;
second_revs[0] = FALSE;
for (j = 0; j < RANDOM_REV_ARRAY_LENGTH; j++)
expected_revs[j] = second_revs[j] && !first_revs[j];
SVN_ERR(rev_array_to_rangelist(&first_rangelist, first_revs, iterpool));
SVN_ERR(rev_array_to_rangelist(&second_rangelist, second_revs, iterpool));
SVN_ERR(rev_array_to_rangelist(&expected_rangelist, expected_revs,
iterpool));
for (j = 0; j < expected_rangelist->nelts; j++)
{
expected_range_array[j] = *(APR_ARRAY_IDX(expected_rangelist, j,
svn_merge_range_t *));
}
SVN_ERR(svn_rangelist_remove(&actual_rangelist, first_rangelist,
second_rangelist, TRUE, iterpool));
SVN_ERR(verify_ranges_match(actual_rangelist,
expected_range_array,
expected_rangelist->nelts,
"svn_rangelist_remove random call",
"remove", iterpool));
}
svn_pool_destroy(iterpool);
return SVN_NO_ERROR;
}
static svn_error_t *
test_rangelist_intersect_randomly(apr_pool_t *pool)
{
int i;
apr_pool_t *iterpool;
random_rev_array_seed = (apr_uint32_t) apr_time_now();
iterpool = svn_pool_create(pool);
for (i = 0; i < 20; i++)
{
svn_boolean_t first_revs[RANDOM_REV_ARRAY_LENGTH],
second_revs[RANDOM_REV_ARRAY_LENGTH],
expected_revs[RANDOM_REV_ARRAY_LENGTH];
svn_rangelist_t *first_rangelist, *second_rangelist,
*expected_rangelist, *actual_rangelist;
/* There will be at most RANDOM_REV_ARRAY_LENGTH ranges in
expected_rangelist. */
svn_merge_range_t expected_range_array[RANDOM_REV_ARRAY_LENGTH];
int j;
svn_pool_clear(iterpool);
randomly_fill_rev_array(first_revs);
randomly_fill_rev_array(second_revs);
/* There is no change numbered "r0" */
first_revs[0] = FALSE;
second_revs[0] = FALSE;
for (j = 0; j < RANDOM_REV_ARRAY_LENGTH; j++)
expected_revs[j] = second_revs[j] && first_revs[j];
SVN_ERR(rev_array_to_rangelist(&first_rangelist, first_revs, iterpool));
SVN_ERR(rev_array_to_rangelist(&second_rangelist, second_revs, iterpool));
SVN_ERR(rev_array_to_rangelist(&expected_rangelist, expected_revs,
iterpool));
for (j = 0; j < expected_rangelist->nelts; j++)
{
expected_range_array[j] = *(APR_ARRAY_IDX(expected_rangelist, j,
svn_merge_range_t *));
}
SVN_ERR(svn_rangelist_intersect(&actual_rangelist, first_rangelist,
second_rangelist, TRUE, iterpool));
SVN_ERR(verify_ranges_match(actual_rangelist,
expected_range_array,
expected_rangelist->nelts,
"svn_rangelist_intersect random call",
"intersect", iterpool));
}
svn_pool_destroy(iterpool);
return SVN_NO_ERROR;
}
/* ### Share code with test_diff_mergeinfo() and test_remove_rangelist(). */
static svn_error_t *
test_remove_mergeinfo(apr_pool_t *pool)
{
apr_hash_t *output, *whiteboard, *eraser;
svn_merge_range_t expected_rangelist_remainder[NBR_RANGELIST_DELTAS] =
{ {6, 7, TRUE}, {8, 9, TRUE}, {10, 11, TRUE}, {32, 34, TRUE} };
SVN_ERR(svn_mergeinfo_parse(&whiteboard,
"/trunk: 1,3-4,7,9,11-12,31-34", pool));
SVN_ERR(svn_mergeinfo_parse(&eraser, "/trunk: 1-6,12-16,30-32", pool));
/* Leftover on /trunk should be the set (7, 9, 11, 33-34) */
SVN_ERR(svn_mergeinfo_remove(&output, eraser, whiteboard, pool));
/* Verify calculation of range list remainder. */
return verify_mergeinfo_deltas(output, expected_rangelist_remainder,
"svn_mergeinfo_remove", "leftover", pool);
}
#undef NBR_RANGELIST_DELTAS
static svn_error_t *
test_rangelist_to_string(apr_pool_t *pool)
{
svn_rangelist_t *result;
svn_string_t *output;
svn_string_t *expected = svn_string_create("3,5,7-11,13-14", pool);
SVN_ERR(svn_mergeinfo_parse(&info1, mergeinfo1, pool));
result = apr_hash_get(info1, "/trunk", APR_HASH_KEY_STRING);
if (!result)
return fail(pool, "Missing path in parsed mergeinfo");
SVN_ERR(svn_rangelist_to_string(&output, result, pool));
if (!svn_string_compare(expected, output))
return fail(pool, "Rangelist string not what we expected");
return SVN_NO_ERROR;
}
static svn_error_t *
test_mergeinfo_to_string(apr_pool_t *pool)
{
svn_string_t *output;
svn_string_t *expected;
expected = svn_string_create("/fred:8-10\n/trunk:3,5,7-11,13-14", pool);
SVN_ERR(svn_mergeinfo_parse(&info1, mergeinfo1, pool));
SVN_ERR(svn_mergeinfo_to_string(&output, info1, pool));
if (!svn_string_compare(expected, output))
return fail(pool, "Mergeinfo string not what we expected");
/* Manually construct some mergeinfo with relative path
merge source keys. These should be tolerated as input
to svn_mergeinfo_to_string(), but the resulting svn_string_t
should have absolute keys. */
info2 = apr_hash_make(pool);
apr_hash_set(info2, "fred",
APR_HASH_KEY_STRING,
apr_hash_get(info1, "/fred", APR_HASH_KEY_STRING));
apr_hash_set(info2, "trunk",
APR_HASH_KEY_STRING,
apr_hash_get(info1, "/trunk", APR_HASH_KEY_STRING));
SVN_ERR(svn_mergeinfo_to_string(&output, info2, pool));
if (!svn_string_compare(expected, output))
return fail(pool, "Mergeinfo string not what we expected");
return SVN_NO_ERROR;
}
static svn_error_t *
test_rangelist_merge(apr_pool_t *pool)
{
int i;
svn_error_t *err, *child_err;
svn_rangelist_t *rangelist1, *rangelist2;
/* Struct for svn_rangelist_merge test data. Similar to
mergeinfo_merge_test_data struct in svn_mergeinfo_merge() test. */
struct rangelist_merge_test_data
{
const char *mergeinfo1;
const char *mergeinfo2;
int expected_ranges;
svn_merge_range_t expected_merge[6];
};
#define SIZE_OF_RANGE_MERGE_TEST_ARRAY 68
/* The actual test data. */
struct rangelist_merge_test_data test_data[SIZE_OF_RANGE_MERGE_TEST_ARRAY] =
{
/* Non-intersecting ranges */
{"1-44", "70-101", 2, {{ 0, 44, TRUE }, {69, 101, TRUE }}},
{"1-44*", "70-101", 2, {{ 0, 44, FALSE}, {69, 101, TRUE }}},
{"1-44", "70-101*", 2, {{ 0, 44, TRUE }, {69, 101, FALSE}}},
{"1-44*", "70-101*", 2, {{ 0, 44, FALSE}, {69, 101, FALSE}}},
{"70-101", "1-44", 2, {{ 0, 44, TRUE }, {69, 101, TRUE }}},
{"70-101*", "1-44", 2, {{ 0, 44, TRUE }, {69, 101, FALSE}}},
{"70-101", "1-44*", 2, {{ 0, 44, FALSE}, {69, 101, TRUE }}},
{"70-101*", "1-44*", 2, {{ 0, 44, FALSE}, {69, 101, FALSE}}},
/* Intersecting ranges with same starting and ending revisions */
{"4-20", "4-20", 1, {{3, 20, TRUE }}},
{"4-20*", "4-20", 1, {{3, 20, TRUE }}},
{"4-20", "4-20*", 1, {{3, 20, TRUE }}},
{"4-20*", "4-20*", 1, {{3, 20, FALSE}}},
/* Intersecting ranges with same starting revision */
{"6-17", "6-12", 1, {{5, 17, TRUE}}},
{"6-17*", "6-12", 2, {{5, 12, TRUE }, {12, 17, FALSE}}},
{"6-17", "6-12*", 1, {{5, 17, TRUE }}},
{"6-17*", "6-12*", 1, {{5, 17, FALSE}}},
{"6-12", "6-17", 1, {{5, 17, TRUE }}},
{"6-12*", "6-17", 1, {{5, 17, TRUE }}},
{"6-12", "6-17*", 2, {{5, 12, TRUE }, {12, 17, FALSE}}},
{"6-12*", "6-17*", 1, {{5, 17, FALSE}}},
/* Intersecting ranges with same ending revision */
{"5-77", "44-77", 1, {{4, 77, TRUE }}},
{"5-77*", "44-77", 2, {{4, 43, FALSE}, {43, 77, TRUE}}},
{"5-77", "44-77*", 1, {{4, 77, TRUE }}},
{"5-77*", "44-77*", 1, {{4, 77, FALSE}}},
{"44-77", "5-77", 1, {{4, 77, TRUE }}},
{"44-77*", "5-77", 1, {{4, 77, TRUE }}},
{"44-77", "5-77*", 2, {{4, 43, FALSE}, {43, 77, TRUE}}},
{"44-77*", "5-77*", 1, {{4, 77, FALSE}}},
/* Intersecting ranges with different starting and ending revision
where one range is a proper subset of the other. */
{"12-24", "20-23", 1, {{11, 24, TRUE }}},
{"12-24*", "20-23", 3, {{11, 19, FALSE}, {19, 23, TRUE },
{23, 24, FALSE}}},
{"12-24", "20-23*", 1, {{11, 24, TRUE }}},
{"12-24*", "20-23*", 1, {{11, 24, FALSE}}},
{"20-23", "12-24", 1, {{11, 24, TRUE }}},
{"20-23*", "12-24", 1, {{11, 24, TRUE }}},
{"20-23", "12-24*", 3, {{11, 19, FALSE}, {19, 23, TRUE },
{23, 24, FALSE}}},
{"20-23*", "12-24*", 1, {{11, 24, FALSE}}},
/* Intersecting ranges with different starting and ending revision
where neither range is a proper subset of the other. */
{"50-73", "60-99", 1, {{49, 99, TRUE }}},
{"50-73*", "60-99", 2, {{49, 59, FALSE}, {59, 99, TRUE }}},
{"50-73", "60-99*", 2, {{49, 73, TRUE }, {73, 99, FALSE}}},
{"50-73*", "60-99*", 1, {{49, 99, FALSE}}},
{"60-99", "50-73", 1, {{49, 99, TRUE }}},
{"60-99*", "50-73", 2, {{49, 73, TRUE }, {73, 99, FALSE}}},
{"60-99", "50-73*", 2, {{49, 59, FALSE}, {59, 99, TRUE }}},
{"60-99*", "50-73*", 1, {{49, 99, FALSE}}},
/* Multiple ranges. */
{"1-5,7,12-13", "2-17", 1, {{0, 17, TRUE }}},
{"1-5*,7*,12-13*", "2-17*", 1, {{0, 17, FALSE}}},
{"1-5,7,12-13", "2-17*", 6,
{{0, 5, TRUE }, { 5, 6, FALSE}, { 6, 7, TRUE },
{7, 11, FALSE}, {11, 13, TRUE }, {13, 17, FALSE}}},
{"1-5*,7*,12-13*", "2-17", 2,
{{0, 1, FALSE}, {1, 17, TRUE }}},
{"2-17", "1-5,7,12-13", 1, {{0, 17, TRUE }}},
{"2-17*", "1-5*,7*,12-13*", 1, {{0, 17, FALSE}}},
{"2-17*", "1-5,7,12-13", 6,
{{0, 5, TRUE }, { 5, 6, FALSE}, { 6, 7, TRUE },
{7, 11, FALSE}, {11, 13, TRUE }, {13, 17, FALSE}}},
{"2-17", "1-5*,7*,12-13*", 2,
{{0, 1, FALSE}, {1, 17, TRUE}}},
{"3-4*,10-15,20", "5-60*", 5,
{{2, 9, FALSE}, {9, 15, TRUE}, {15, 19, FALSE},{19, 20, TRUE},
{20, 60, FALSE}}},
{"5-60*", "3-4*,10-15,20", 5,
{{2, 9, FALSE}, {9, 15, TRUE}, {15, 19, FALSE},{19, 20, TRUE},
{20, 60, FALSE}}},
{"3-4*,50-100*", "5-60*", 1, {{2, 100, FALSE}}},
{"5-60*", "3-4*,50-100*", 1, {{2, 100, FALSE}}},
{"3-4*,50-100", "5-60*", 2, {{2, 49, FALSE}, {49, 100, TRUE}}},
{"5-60*", "3-4*,50-100", 2, {{2, 49, FALSE}, {49, 100, TRUE}}},
{"3-4,50-100*", "5-60", 2, {{2, 60, TRUE}, {60, 100, FALSE}}},
{"5-60", "3-4,50-100*", 2, {{2, 60, TRUE}, {60, 100, FALSE}}},
{"5,9,11-15,17,200-300,999", "7-50", 4,
{{4, 5, TRUE}, {6, 50, TRUE}, {199, 300, TRUE}, {998, 999, TRUE}}},
/* A rangelist merged with an empty rangelist should equal the
non-empty rangelist but in compacted form. */
{"1-44,45,46,47-50", "", 1, {{ 0, 50, TRUE }}},
{"1,2,3,4,5,6,7,8", "", 1, {{ 0, 8, TRUE }}},
{"6-10,12-13,14,15,16-22", "", 2,
{{ 5, 10, TRUE }, { 11, 22, TRUE }}},
{"", "1-44,45,46,47-50", 1, {{ 0, 50, TRUE }}},
{"", "1,2,3,4,5,6,7,8", 1, {{ 0, 8, TRUE }}},
{"", "6-10,12-13,14,15,16-22", 2,
{{ 5, 10, TRUE }, { 11, 22, TRUE }}},
/* An empty rangelist merged with an empty rangelist is, drum-roll
please, an empty rangelist. */
{"", "", 0, {{0, 0, FALSE}}}
};
err = child_err = SVN_NO_ERROR;
for (i = 0; i < SIZE_OF_RANGE_MERGE_TEST_ARRAY; i++)
{
svn_string_t *rangelist2_starting, *rangelist2_ending;
SVN_ERR(svn_rangelist__parse(&rangelist1, test_data[i].mergeinfo1, pool));
SVN_ERR(svn_rangelist__parse(&rangelist2, test_data[i].mergeinfo2, pool));
/* Create empty rangelists if necessary. */
if (rangelist1 == NULL)
rangelist1 = apr_array_make(pool, 0, sizeof(svn_merge_range_t *));
if (rangelist2 == NULL)
rangelist2 = apr_array_make(pool, 0, sizeof(svn_merge_range_t *));
/* Make a copy of rangelist2. We will merge it into rangelist1, but
rangelist2 should remain unchanged. */
SVN_ERR(svn_rangelist_to_string(&rangelist2_starting, rangelist2,
pool));
SVN_ERR(svn_rangelist_merge(&rangelist1, rangelist2, pool));
child_err = verify_ranges_match(rangelist1,
(test_data[i]).expected_merge,
(test_data[i]).expected_ranges,
apr_psprintf(pool,
"svn_rangelist_merge "
"case %i", i),
"merge", pool);
/* Collect all the errors rather than returning on the first. */
if (child_err)
{
if (err)
svn_error_compose(err, child_err);
else
err = child_err;
}
/* Check that rangelist2 remains unchanged. */
SVN_ERR(svn_rangelist_to_string(&rangelist2_ending, rangelist2, pool));
if (strcmp(rangelist2_ending->data, rangelist2_starting->data))
{
child_err = fail(pool,
apr_psprintf(pool,
"svn_rangelist_merge case %i "
"modified its CHANGES arg from "
"%s to %s", i,
rangelist2_starting->data,
rangelist2_ending->data));
if (err)
svn_error_compose(err, child_err);
else
err = child_err;
}
}
return err;
}
static svn_error_t *
test_rangelist_diff(apr_pool_t *pool)
{
int i;
svn_error_t *err, *child_err;
svn_rangelist_t *from, *to, *added, *deleted;
/* Structure containing two ranges to diff and the expected output of the
diff both when considering and ignoring range inheritance. */
struct rangelist_diff_test_data
{
/* svn:mergeinfo string representations */
const char *from;
const char *to;
/* Expected results for performing svn_rangelist_diff
while considering differences in inheritability to be real
differences. */
int expected_add_ranges;
svn_merge_range_t expected_adds[10];
int expected_del_ranges;
svn_merge_range_t expected_dels[10];
/* Expected results for performing svn_rangelist_diff
while ignoring differences in inheritability. */
int expected_add_ranges_ignore_inheritance;
svn_merge_range_t expected_adds_ignore_inheritance[10];
int expected_del_ranges_ignore_inheritance;
svn_merge_range_t expected_dels_ignore_inheritance[10];
};
#define SIZE_OF_RANGE_DIFF_TEST_ARRAY 16
/* The actual test data array.
'from' --> {"1,5-8", "1,6,10-12", <-- 'to'
Number of adds when --> 1, { { 9, 12, TRUE } },
considering inheritance
Number of dels when --> 2, { { 4, 5, TRUE }, { 6, 8, TRUE } },
considering inheritance
Number of adds when --> 1, { { 9, 12, TRUE } },
ignoring inheritance
Number of dels when --> 2, { { 4, 5, TRUE }, { 6, 8, TRUE } } },
ignoring inheritance
^ ^
The expected svn_merge_range_t's
*/
struct rangelist_diff_test_data test_data[SIZE_OF_RANGE_DIFF_TEST_ARRAY] =
{
/* Add and Delete */
{"1", "3",
1, { { 2, 3, TRUE } },
1, { { 0, 1, TRUE } },
1, { { 2, 3, TRUE } },
1, { { 0, 1, TRUE } } },
/* Add only */
{"1", "1,3",
1, { { 2, 3, TRUE } },
0, { { 0, 0, FALSE } },
1, { { 2, 3, TRUE } },
0, { { 0, 0, FALSE } } },
/* Delete only */
{"1,3", "1",
0, { { 0, 0, FALSE } },
1, { { 2, 3, TRUE } },
0, { { 0, 0, FALSE } },
1, { { 2, 3, TRUE } } },
/* No diff */
{"1,3", "1,3",
0, { { 0, 0, FALSE } },
0, { { 0, 0, FALSE } },
0, { { 0, 0, FALSE } },
0, { { 0, 0, FALSE } } },
{"1,3*", "1,3*",
0, { { 0, 0, FALSE } },
0, { { 0, 0, FALSE } },
0, { { 0, 0, FALSE } },
0, { { 0, 0, FALSE } } },
/* Adds and Deletes */
{"1,5-8", "1,6,10-12",
1, { { 9, 12, TRUE } },
2, { { 4, 5, TRUE }, { 6, 8, TRUE } },
1, { { 9, 12, TRUE } },
2, { { 4, 5, TRUE }, { 6, 8, TRUE } } },
{"6*", "6",
1, { { 5, 6, TRUE } },
1, { { 5, 6, FALSE } },
0, { { 0, 0, FALSE } },
0, { { 0, 0, FALSE } } },
/* Intersecting range with different inheritability */
{"6", "6*",
1, { { 5, 6, FALSE } },
1, { { 5, 6, TRUE } },
0, { { 0, 0, FALSE } },
0, { { 0, 0, FALSE } } },
{"6*", "6",
1, { { 5, 6, TRUE } },
1, { { 5, 6, FALSE } },
0, { { 0, 0, FALSE } },
0, { { 0, 0, FALSE } } },
{"1,5-8", "1,6*,10-12",
2, { { 5, 6, FALSE }, { 9, 12, TRUE } },
1, { { 4, 8, TRUE } },
1, { { 9, 12, TRUE } },
2, { { 4, 5, TRUE }, { 6, 8, TRUE } } },
{"1,5-8*", "1,6,10-12",
2, { { 5, 6, TRUE }, { 9, 12, TRUE } },
1, { { 4, 8, FALSE } },
1, { { 9, 12, TRUE } },
2, { { 4, 5, FALSE }, { 6, 8, FALSE } } },
/* Empty range diffs */
{"3-9", "",
0, { { 0, 0, FALSE } },
1, { { 2, 9, TRUE } },
0, { { 0, 0, FALSE } },
1, { { 2, 9, TRUE } } },
{"3-9*", "",
0, { { 0, 0, FALSE } },
1, { { 2, 9, FALSE } },
0, { { 0, 0, FALSE } },
1, { { 2, 9, FALSE } } },
{"", "3-9",
1, { { 2, 9, TRUE } },
0, { { 0, 0, FALSE } },
1, { { 2, 9, TRUE } },
0, { { 0, 0, FALSE } } },
{"", "3-9*",
1, { { 2, 9, FALSE } },
0, { { 0, 0, FALSE } },
1, { { 2, 9, FALSE } },
0, { { 0, 0, FALSE } } },
/* Empty range no diff */
{"", "",
0, { { 0, 0, FALSE } },
0, { { 0, 0, FALSE } },
0, { { 0, 0, FALSE } },
0, { { 0, 0, FALSE } } },
};
err = child_err = SVN_NO_ERROR;
for (i = 0; i < SIZE_OF_RANGE_DIFF_TEST_ARRAY; i++)
{
SVN_ERR(svn_rangelist__parse(&to, test_data[i].to, pool));
SVN_ERR(svn_rangelist__parse(&from, test_data[i].from, pool));
/* Represent empty mergeinfo with an empty rangelist. */
if (to == NULL)
to = apr_array_make(pool, 0, sizeof(*to));
if (from == NULL)
from = apr_array_make(pool, 0, sizeof(*from));
/* First diff the ranges while considering
differences in inheritance. */
SVN_ERR(svn_rangelist_diff(&deleted, &added, from, to, TRUE, pool));
child_err = verify_ranges_match(added,
(test_data[i]).expected_adds,
(test_data[i]).expected_add_ranges,
apr_psprintf(pool,
"svn_rangelist_diff"
"case %i", i),
"diff", pool);
if (!child_err)
child_err = verify_ranges_match(deleted,
(test_data[i]).expected_dels,
(test_data[i]).expected_del_ranges,
apr_psprintf(pool,
"svn_rangelist_diff"
"case %i", i),
"diff", pool);
if (!child_err)
{
/* Now do the diff while ignoring differences in inheritance. */
SVN_ERR(svn_rangelist_diff(&deleted, &added, from, to, FALSE,
pool));
child_err = verify_ranges_match(
added,
(test_data[i]).expected_adds_ignore_inheritance,
(test_data[i]).expected_add_ranges_ignore_inheritance,
apr_psprintf(pool, "svn_rangelist_diff case %i", i),
"diff", pool);
if (!child_err)
child_err = verify_ranges_match(
deleted,
(test_data[i]).expected_dels_ignore_inheritance,
(test_data[i]).expected_del_ranges_ignore_inheritance,
apr_psprintf(pool, "svn_rangelist_diff case %i", i),
"diff", pool);
}
/* Collect all the errors rather than returning on the first. */
if (child_err)
{
if (err)
svn_error_compose(err, child_err);
else
err = child_err;
}
}
return err;
}
/* Test data structure for test_remove_prefix_from_catalog(). */
struct catalog_bits
{
const char *orig_path;
const char *new_path;
const char *mergeinfo;
};
/* Helper for test_remove_prefix_from_catalog(). */
static svn_error_t *
remove_prefix_helper(struct catalog_bits *test_data,
const char *prefix_path,
apr_pool_t *pool)
{
svn_mergeinfo_catalog_t in_catalog, out_catalog, exp_out_catalog;
apr_hash_index_t *hi;
int i = 0;
in_catalog = apr_hash_make(pool);
exp_out_catalog = apr_hash_make(pool);
while (test_data[i].orig_path)
{
struct catalog_bits data = test_data[i];
const char *orig_path = apr_pstrdup(pool, data.orig_path);
const char *new_path = apr_pstrdup(pool, data.new_path);
svn_mergeinfo_t mergeinfo;
SVN_ERR(svn_mergeinfo_parse(&mergeinfo, data.mergeinfo, pool));
apr_hash_set(in_catalog, orig_path, APR_HASH_KEY_STRING, mergeinfo);
apr_hash_set(exp_out_catalog, new_path, APR_HASH_KEY_STRING, mergeinfo);
i++;
}
SVN_ERR(svn_mergeinfo__remove_prefix_from_catalog(&out_catalog, in_catalog,
prefix_path, pool));
if (apr_hash_count(exp_out_catalog) != apr_hash_count(out_catalog))
return svn_error_create(SVN_ERR_TEST_FAILED, 0,
"Got unexpected number of catalog entries");
for (hi = apr_hash_first(pool, out_catalog); hi; hi = apr_hash_next(hi))
{
const void *path;
apr_ssize_t path_len;
void *out_mergeinfo, *exp_out_mergeinfo;
apr_hash_this(hi, &path, &path_len, &out_mergeinfo);
exp_out_mergeinfo = apr_hash_get(exp_out_catalog, path, path_len);
if (! exp_out_mergeinfo)
return svn_error_createf(SVN_ERR_TEST_FAILED, 0,
"Found unexpected key '%s' in catalog",
(const char *)path);
if (exp_out_mergeinfo != out_mergeinfo)
return svn_error_create(SVN_ERR_TEST_FAILED, 0,
"Detected value tampering in catalog");
}
return SVN_NO_ERROR;
}
static svn_error_t *
test_remove_prefix_from_catalog(apr_pool_t *pool)
{
apr_pool_t *subpool = svn_pool_create(pool);
/* For testing the remove of the prefix "/trunk" */
struct catalog_bits test_data_1[] =
{
{ "/trunk", "", "/A:1" },
{ "/trunk/foo", "foo", "/A/foo:1,3*" },
{ "/trunk/foo/bar", "foo/bar", "/A/foo:1-4" },
{ "/trunk/baz", "baz", "/A/baz:2" },
{ NULL, NULL, NULL }
};
/* For testing the remove of the prefix "/" */
struct catalog_bits test_data_2[] =
{
{ "/", "", "/:2" },
{ "/trunk", "trunk", "/A:1" },
{ "/trunk/foo", "trunk/foo", "/A/foo:1,3*" },
{ "/trunk/foo/bar", "trunk/foo/bar", "/A/foo:1-4" },
{ "/trunk/baz", "trunk/baz", "/A/baz:2" },
{ NULL, NULL, NULL }
};
svn_pool_clear(subpool);
SVN_ERR(remove_prefix_helper(test_data_1, "/trunk", subpool));
svn_pool_clear(subpool);
SVN_ERR(remove_prefix_helper(test_data_2, "/", subpool));
svn_pool_destroy(subpool);
return SVN_NO_ERROR;
}
/* The test table. */
struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_parse_single_line_mergeinfo,
"parse single line mergeinfo"),
SVN_TEST_PASS2(test_mergeinfo_dup,
"copy a mergeinfo data structure"),
SVN_TEST_PASS2(test_parse_combine_rangeinfo,
"parse single line mergeinfo and combine ranges"),
SVN_TEST_PASS2(test_parse_broken_mergeinfo,
"parse broken single line mergeinfo"),
SVN_TEST_PASS2(test_remove_rangelist,
"remove rangelists"),
SVN_TEST_PASS2(test_rangelist_remove_randomly,
"test rangelist remove with random data"),
SVN_TEST_PASS2(test_remove_mergeinfo,
"remove of mergeinfo"),
SVN_TEST_PASS2(test_rangelist_reverse,
"reversal of rangelist"),
SVN_TEST_PASS2(test_rangelist_intersect,
"intersection of rangelists"),
SVN_TEST_PASS2(test_rangelist_intersect_randomly,
"test rangelist intersect with random data"),
SVN_TEST_PASS2(test_diff_mergeinfo,
"diff of mergeinfo"),
SVN_TEST_PASS2(test_merge_mergeinfo,
"merging of mergeinfo hashes"),
SVN_TEST_PASS2(test_mergeinfo_intersect,
"intersection of mergeinfo"),
SVN_TEST_PASS2(test_rangelist_to_string,
"turning rangelist back into a string"),
SVN_TEST_PASS2(test_mergeinfo_to_string,
"turning mergeinfo back into a string"),
SVN_TEST_PASS2(test_rangelist_merge,
"merge of rangelists"),
SVN_TEST_PASS2(test_rangelist_diff,
"diff of rangelists"),
SVN_TEST_PASS2(test_remove_prefix_from_catalog,
"removal of prefix paths from catalog keys"),
SVN_TEST_NULL
};
|