Commit 990ff0c8 authored by Per Cederqvist's avatar Per Cederqvist
Browse files

Renumber and extend.

(do_restart): Set to 1.
parent bc579b19
......@@ -38,7 +38,7 @@ set mark_as_read_atomic 1
# can save and restore the information about read texts. Set to 0 to
# speed up the test, at the cost of not testing everything that needs
# to be tested.
set do_restart 0
set do_restart 1
if {$do_restart == 0} {
untested "saving read-ranges to disk (Bug 52)"
......@@ -318,13 +318,13 @@ checkit 3 3 100 9 7 "{ 11 12 13 14 15 16 18 }" "3 { 1 9 11 16 18 18 }"
checkit 4 4 100 3 0 "\\*" "1 { 1 3 }"
# Subtract text 3 from conference 2.
send "1042 31 3 2\n"
simple_expect "=1042"
send "1040 31 3 2\n"
simple_expect "=1040"
send "1040 27 5 2 { 19 21 }\n"
simple_expect "%1040 16 1"
send "1041 27 1 2 { 21 19 }\n"
simple_expect "%1041 16 0"
send "1041 27 5 2 { 19 21 }\n"
simple_expect "%1041 16 1"
send "1042 27 1 2 { 21 19 }\n"
simple_expect "%1042 16 0"
send "1043 27 2 0 { }\n"
simple_expect "=1043"
send "1044 27 3 1 { 10 }\n"
......@@ -357,31 +357,31 @@ checkit 3 3 100 16 1 "{ 18 }" "2 { 1 16 18 18 }"
checkit 4 4 100 3 1 "{ 18 }" "2 { 1 3 18 18 }"
# Subtract texts 10-12, 14-15 from conference 1.
send "1047 31 10 1\n"
send "1046 31 10 1\n"
simple_expect "=1046"
send "1047 31 11 1\n"
simple_expect "=1047"
send "1048 31 11 1\n"
send "1048 31 12 1\n"
simple_expect "=1048"
send "1049 31 12 1\n"
send "1049 31 14 1\n"
simple_expect "=1049"
send "1050 31 14 1\n"
send "1050 31 15 1\n"
simple_expect "=1050"
send "1051 31 15 1\n"
simple_expect "=1051"
# Subtract text 4 from conference 2.
send "1053 31 4 2\n"
simple_expect "=1053"
send "1051 31 4 2\n"
simple_expect "=1051"
send "1046 27 5 1 { 19 }\n"
simple_expect "=1046"
send "1052 27 1 1 { 8 }\n"
send "1052 27 5 1 { 19 }\n"
simple_expect "=1052"
send "1055 27 2 0 { }\n"
send "1053 27 1 1 { 8 }\n"
simple_expect "=1053"
send "1054 27 2 0 { }\n"
simple_expect "=1054"
send "1055 27 3 1 { 17 }\n"
simple_expect "=1055"
send "1056 27 3 1 { 17 }\n"
send "1056 27 4 1 { 17 }\n"
simple_expect "=1056"
send "1057 27 4 1 { 17 }\n"
simple_expect "=1057"
checkit 0 5 255 7 2 "{ 19 20 }" "2 { 1 7 19 20 }"
checkit 1 1 100 2 1 "{ 8 }" "2 { 1 2 8 8 }"
......@@ -397,16 +397,28 @@ checkit 2 2 100 4 0 "\\*" "1 { 1 4 }"
checkit 3 3 100 18 0 "\\*" "1 { 1 18 }"
checkit 4 4 100 3 2 "{ 17 18 }" "2 { 1 3 17 18 }"
send "1046 27 5 1 { 18 }\n"
simple_expect "=1046"
send "1052 27 1 1 { 9 }\n"
simple_expect "=1052"
send "1055 27 2 1 { 4 }\n"
simple_expect "=1055"
send "1056 27 3 1 { 20 }\n"
simple_expect "=1056"
send "1057 27 4 1 { 19 }\n"
send "1057 27 5 1 { 18 }\n"
simple_expect "=1057"
send "1058 27 1 1 { 9 }\n"
simple_expect "=1058"
send "1059 27 2 1 { 4 }\n"
simple_expect "=1059"
send "1060 27 3 1 { 20 }\n"
simple_expect "=1060"
send "1061 27 4 1 { 19 }\n"
simple_expect "=1061"
checkit 0 5 255 7 3 "{ 18 19 20 }" "2 { 1 7 18 20 }"
if {$lazy_expand} {
checkit 1 1 100 2 2 "{ 8 9 }" "2 { 1 2 8 9 }"
} else {
checkit 1 1 100 2 5 "{ 8 9 10 11 12 }" "2 { 1 2 8 12 }"
}
checkit 2 2 100 4 0 "\\*" "1 { 1 4 }"
checkit 3 3 100 18 1 "{ 20 }" "2 { 1 18 20 20 }"
checkit 4 4 100 3 3 "{ 17 18 19 }" "2 { 1 3 17 19 }"
restart
checkit 0 5 255 7 3 "{ 18 19 20 }" "2 { 1 7 18 20 }"
if {$lazy_expand} {
......@@ -418,6 +430,441 @@ checkit 2 2 100 4 0 "\\*" "1 { 1 4 }"
checkit 3 3 100 18 1 "{ 20 }" "2 { 1 18 20 20 }"
checkit 4 4 100 3 3 "{ 17 18 19 }" "2 { 1 3 17 19 }"
send "1062 27 5 4 { 9 16 12 13 }\n"
simple_expect "=1062"
send "1063 27 1 1 { 4 }\n"
simple_expect "=1063"
send "1064 27 2 1 { 5 }\n"
simple_expect "=1064"
send "1065 27 3 1 { 19 }\n"
simple_expect "=1065"
send "1066 27 4 1 { 20 }\n"
simple_expect "=1066"
checkit 0 5 255 7 7 "{ 9 12 13 16 18 19 20 }" "5 { 1 7 9 9 12 13 16 16 18 20 }"
if {$lazy_expand} {
checkit 1 1 100 2 3 "{ 4 8 9 }" "3 { 1 2 4 4 8 9 }"
} else {
checkit 1 1 100 2 6 "{ 4 8 9 10 11 12 }" "3 { 1 2 4 4 8 12 }"
}
checkit 2 2 100 5 0 "\\*" "1 { 1 5 }"
checkit 3 3 100 20 0 "\\*" "1 { 1 20 }"
checkit 4 4 100 3 4 "{ 17 18 19 20 }" "2 { 1 3 17 20 }"
restart
checkit 0 5 255 7 7 "{ 9 12 13 16 18 19 20 }" "5 { 1 7 9 9 12 13 16 16 18 20 }"
if {$lazy_expand} {
checkit 1 1 100 2 3 "{ 4 8 9 }" "3 { 1 2 4 4 8 9 }"
} else {
checkit 1 1 100 2 6 "{ 4 8 9 10 11 12 }" "3 { 1 2 4 4 8 12 }"
}
checkit 2 2 100 5 0 "\\*" "1 { 1 5 }"
checkit 3 3 100 20 0 "\\*" "1 { 1 20 }"
checkit 4 4 100 3 4 "{ 17 18 19 20 }" "2 { 1 3 17 20 }"
send "1067 27 5 6 { 8 10 11 14 17 15 }\n"
simple_expect "=1067"
send "1068 27 1 1 { 16 }\n"
simple_expect "=1068"
send "1069 27 2 1 { 6 }\n"
simple_expect "=1069"
send "1070 27 4 1 { 4 }\n"
simple_expect "=1070"
checkit 0 5 255 20 0 "\\*" "1 { 1 20 }"
if {$lazy_expand} {
checkit 1 1 100 2 4 "{ 4 8 9 16 }" "4 { 1 2 4 4 8 9 16 16 }"
} else {
checkit 1 1 100 2 9 "{ 4 8 9 10 11 12 14 15 16 }" \
"4 { 1 2 4 4 8 12 14 16 }"
}
checkit 2 2 100 6 0 "\\*" "1 { 1 6 }"
checkit 4 4 100 4 4 "{ 17 18 19 20 }" "2 { 1 4 17 20 }"
restart
checkit 0 5 255 20 0 "\\*" "1 { 1 20 }"
if {$lazy_expand} {
checkit 1 1 100 2 4 "{ 4 8 9 16 }" "4 { 1 2 4 4 8 9 16 16 }"
} else {
checkit 1 1 100 2 9 "{ 4 8 9 10 11 12 14 15 16 }" \
"4 { 1 2 4 4 8 12 14 16 }"
}
checkit 2 2 100 6 0 "\\*" "1 { 1 6 }"
checkit 4 4 100 4 4 "{ 17 18 19 20 }" "2 { 1 4 17 20 }"
send "1071 27 1 1 { 3 }\n"
simple_expect "=1071"
send "1072 27 2 1 { 8 }\n"
simple_expect "=1072"
send "1073 27 4 1 { 16 }\n"
simple_expect "=1073"
if {$lazy_expand} {
checkit 1 1 100 4 3 "{ 8 9 16 }" "3 { 1 4 8 9 16 16 }"
} else {
checkit 1 1 100 4 8 "{ 8 9 10 11 12 14 15 16 }" "3 { 1 4 8 12 14 16 }"
}
checkit 2 2 100 6 1 "{ 8 }" "2 { 1 6 8 8 }"
checkit 4 4 100 4 5 "{ 16 17 18 19 20 }" "2 { 1 4 16 20 }"
restart
if {$lazy_expand} {
checkit 1 1 100 4 3 "{ 8 9 16 }" "3 { 1 4 8 9 16 16 }"
} else {
checkit 1 1 100 4 8 "{ 8 9 10 11 12 14 15 16 }" "3 { 1 4 8 12 14 16 }"
}
checkit 2 2 100 6 1 "{ 8 }" "2 { 1 6 8 8 }"
checkit 4 4 100 4 5 "{ 16 17 18 19 20 }" "2 { 1 4 16 20 }"
send "1074 27 1 1 { 5 }\n"
simple_expect "=1074"
send "1075 27 2 1 { 7 }\n"
simple_expect "=1075"
send "1076 27 4 1 { 5 }\n"
simple_expect "=1076"
if {$lazy_expand} {
checkit 1 1 100 5 3 "{ 8 9 16 }" "3 { 1 5 8 9 16 16 }"
} else {
checkit 1 1 100 5 8 "{ 8 9 10 11 12 14 15 16 }" "3 { 1 5 8 12 14 16 }"
}
checkit 2 2 100 8 0 "\\*" "1 { 1 8 }"
checkit 4 4 100 5 5 "{ 16 17 18 19 20 }" "2 { 1 5 16 20 }"
restart
if {$lazy_expand} {
checkit 1 1 100 5 3 "{ 8 9 16 }" "3 { 1 5 8 9 16 16 }"
} else {
checkit 1 1 100 5 8 "{ 8 9 10 11 12 14 15 16 }" "3 { 1 5 8 12 14 16 }"
}
checkit 2 2 100 8 0 "\\*" "1 { 1 8 }"
checkit 4 4 100 5 5 "{ 16 17 18 19 20 }" "2 { 1 5 16 20 }"
send "1077 27 1 1 { 6 }\n"
simple_expect "=1077"
send "1078 27 2 1 { 9 }\n"
simple_expect "=1078"
send "1079 27 4 1 { 6 }\n"
simple_expect "=1079"
if {$lazy_expand} {
checkit 1 1 100 6 3 "{ 8 9 16 }" "3 { 1 6 8 9 16 16 }"
} else {
checkit 1 1 100 6 8 "{ 8 9 10 11 12 14 15 16 }" "3 { 1 6 8 12 14 16 }"
}
checkit 2 2 100 9 0 "\\*" "1 { 1 9 }"
checkit 4 4 100 6 5 "{ 16 17 18 19 20 }" "2 { 1 6 16 20 }"
restart
if {$lazy_expand} {
checkit 1 1 100 6 3 "{ 8 9 16 }" "3 { 1 6 8 9 16 16 }"
} else {
checkit 1 1 100 6 8 "{ 8 9 10 11 12 14 15 16 }" "3 { 1 6 8 12 14 16 }"
}
checkit 2 2 100 9 0 "\\*" "1 { 1 9 }"
checkit 4 4 100 6 5 "{ 16 17 18 19 20 }" "2 { 1 6 16 20 }"
send "1080 27 1 1 { 7 }\n"
simple_expect "=1080"
send "1081 27 2 1 { 10 }\n"
simple_expect "=1081"
send "1082 27 4 1 { 7 }\n"
simple_expect "=1082"
if {$lazy_expand} {
checkit 1 1 100 12 1 "{ 16 }" "2 { 1 12 16 16 }"
} else {
checkit 1 1 100 12 3 "{ 14 15 16 }" "2 { 1 12 14 16 }"
}
checkit 2 2 100 10 0 "\\*" "1 { 1 10 }"
checkit 4 4 100 7 5 "{ 16 17 18 19 20 }" "2 { 1 7 16 20 }"
restart
if {$lazy_expand} {
checkit 1 1 100 12 1 "{ 16 }" "2 { 1 12 16 16 }"
} else {
checkit 1 1 100 12 3 "{ 14 15 16 }" "2 { 1 12 14 16 }"
}
checkit 2 2 100 10 0 "\\*" "1 { 1 10 }"
checkit 4 4 100 7 5 "{ 16 17 18 19 20 }" "2 { 1 7 16 20 }"
send "1083 27 1 1 { 13 }\n"
simple_expect "=1083"
send "1084 27 2 1 { 11 }\n"
simple_expect "=1084"
send "1085 27 4 1 { 8 }\n"
simple_expect "=1085"
checkit 1 1 100 16 0 "\\*" "1 { 1 16 }"
checkit 2 2 100 11 0 "\\*" "1 { 1 11 }"
checkit 4 4 100 8 5 "{ 16 17 18 19 20 }" "2 { 1 8 16 20 }"
restart
checkit 1 1 100 16 0 "\\*" "1 { 1 16 }"
checkit 2 2 100 11 0 "\\*" "1 { 1 11 }"
checkit 4 4 100 8 5 "{ 16 17 18 19 20 }" "2 { 1 8 16 20 }"
send "1086 27 1 1 { 17 }\n"
simple_expect "=1086"
send "1087 27 1 1 { 18 }\n"
simple_expect "=1087"
send "1088 27 1 1 { 19 }\n"
simple_expect "=1088"
send "1089 27 1 1 { 20 }\n"
simple_expect "=1089"
send "1090 27 2 1 { 12 }\n"
simple_expect "=1090"
send "1091 27 2 1 { 13 }\n"
simple_expect "=1091"
send "1092 27 2 1 { 14 }\n"
simple_expect "=1092"
send "1093 27 2 1 { 15 }\n"
simple_expect "=1093"
send "1094 27 2 1 { 16 }\n"
simple_expect "=1094"
send "1095 27 2 1 { 17 }\n"
simple_expect "=1095"
send "1096 27 2 1 { 18 }\n"
simple_expect "=1096"
send "1097 27 2 1 { 19 }\n"
simple_expect "=1097"
send "1098 27 2 1 { 20 }\n"
simple_expect "=1098"
send "1099 27 4 1 { 9 }\n"
simple_expect "=1099"
send "1100 27 4 1 { 10 }\n"
simple_expect "=1100"
send "1101 27 4 1 { 11 }\n"
simple_expect "=1101"
send "1102 27 4 1 { 12 }\n"
simple_expect "=1102"
send "1103 27 4 1 { 13 }\n"
simple_expect "=1103"
send "1104 27 4 1 { 14 }\n"
simple_expect "=1104"
send "1105 27 4 1 { 15 }\n"
simple_expect "=1105"
checkit 0 5 255 20 0 "\\*" "1 { 1 20 }"
checkit 1 1 100 20 0 "\\*" "1 { 1 20 }"
checkit 2 2 100 20 0 "\\*" "1 { 1 20 }"
checkit 3 3 100 20 0 "\\*" "1 { 1 20 }"
checkit 4 4 100 20 0 "\\*" "1 { 1 20 }"
restart
checkit 0 5 255 20 0 "\\*" "1 { 1 20 }"
checkit 1 1 100 20 0 "\\*" "1 { 1 20 }"
checkit 2 2 100 20 0 "\\*" "1 { 1 20 }"
checkit 3 3 100 20 0 "\\*" "1 { 1 20 }"
checkit 4 4 100 20 0 "\\*" "1 { 1 20 }"
# Make everything unread once again.
send "1106 77 5 0\n"
simple_expect "=1106"
send "1107 77 1 0\n"
simple_expect "=1107"
send "1108 77 2 0\n"
simple_expect "=1108"
send "1109 77 3 0\n"
simple_expect "=1109"
send "1110 77 4 0\n"
simple_expect "=1110"
checkit 0 5 255 0 0 "\\*" "0 \\*"
checkit 1 1 100 0 0 "\\*" "0 \\*"
checkit 2 2 100 0 0 "\\*" "0 \\*"
checkit 3 3 100 0 0 "\\*" "0 \\*"
checkit 4 4 100 0 0 "\\*" "0 \\*"
# Subtract text 1, 3, 5-18, 20 from conference 5.
foreach lno {1 3 5 6 7 8 9 10 11 12 13 14 15 16 17 18 20} {
send "101 31 $lno 5\n"
simple_expect "=101"
}
# Subtract text 1-2 (10-12, 14-15) from conference 1.
send "1111 31 1 1\n"
simple_expect "=1111"
send "1112 31 2 1\n"
simple_expect "=1112"
# Subtract text (3-4), 5-8, 10-18 from conference 2.
foreach lno {5 6 7 8 10 11 12 13 14 15 16 17 18} {
send "101 31 $lno 2\n"
simple_expect "=101"
}
# Subtract text 1-20 from conference 3.
foreach lno {1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20} {
send "101 31 $lno 3\n"
simple_expect "=101"
}
# Subtract text 10-20 from conference 4.
foreach lno {10 11 12 13 14 15 16 17 18 19 20} {
send "101 31 $lno 4\n"
simple_expect "=101"
}
checkit 0 5 255 0 0 "\\*" "0 \\*"
checkit 1 1 100 0 0 "\\*" "0 \\*"
checkit 2 2 100 0 0 "\\*" "0 \\*"
checkit 3 3 100 0 0 "\\*" "0 \\*"
checkit 4 4 100 0 0 "\\*" "0 \\*"
restart
checkit 0 5 255 0 0 "\\*" "0 \\*"
checkit 1 1 100 0 0 "\\*" "0 \\*"
checkit 2 2 100 0 0 "\\*" "0 \\*"
checkit 3 3 100 0 0 "\\*" "0 \\*"
checkit 4 4 100 0 0 "\\*" "0 \\*"
send "1113 27 5 1 { 2 }\n"
simple_expect "=1113"
send "1114 27 1 1 { 3 }\n"
simple_expect "=1114"
send "1115 27 2 1 { 1 }\n"
simple_expect "=1115"
send "1116 27 3 1 { 10 }\n"
simple_expect "=1116"
send "1117 27 4 1 { 1 }\n"
simple_expect "=1117"
checkit 0 5 255 3 0 "\\*" "1 { 1 3 }"
checkit 1 1 100 3 0 "\\*" "1 { 1 3 }"
checkit 2 2 100 1 0 "\\*" "1 { 1 1 }"
checkit 3 3 100 20 0 "\\*" "1 { 1 20 }"
checkit 4 4 100 1 0 "\\*" "1 { 1 1 }"
restart
checkit 0 5 255 3 0 "\\*" "1 { 1 3 }"
checkit 1 1 100 3 0 "\\*" "1 { 1 3 }"
checkit 2 2 100 1 0 "\\*" "1 { 1 1 }"
checkit 3 3 100 20 0 "\\*" "1 { 1 20 }"
checkit 4 4 100 1 0 "\\*" "1 { 1 1 }"
send "1118 27 5 1 { 19 }\n"
simple_expect "=1118"
send "1119 27 1 1 { 4 }\n"
simple_expect "=1119"
send "1120 27 2 1 { 2 }\n"
simple_expect "=1120"
send "1121 27 4 1 { 2 }\n"
simple_expect "=1121"
if {$lazy_expand} {
checkit 0 5 255 3 1 "{ 19 }" "2 { 1 3 19 19 }"
} else {
checkit 0 5 255 3 16 "{ 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 }" "2 { 1 3 5 20 }"
}
checkit 1 1 100 4 0 "\\*" "1 { 1 4 }"
checkit 2 2 100 8 0 "\\*" "1 { 1 8 }"
checkit 4 4 100 2 0 "\\*" "1 { 1 2 }"
restart
if {$lazy_expand} {
checkit 0 5 255 3 1 "{ 19 }" "2 { 1 3 19 19 }"
} else {
checkit 0 5 255 3 16 "{ 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 }" "2 { 1 3 5 20 }"
}
checkit 1 1 100 4 0 "\\*" "1 { 1 4 }"
checkit 2 2 100 8 0 "\\*" "1 { 1 8 }"
checkit 4 4 100 2 0 "\\*" "1 { 1 2 }"
send "1122 27 5 1 { 4 }\n"
simple_expect "=1122"
send "1123 27 1 1 { 5 }\n"
simple_expect "=1123"
send "1124 27 2 1 { 9 }\n"
simple_expect "=1124"
send "1125 27 4 1 { 3 }\n"
simple_expect "=1125"
checkit 0 5 255 20 0 "\\*" "1 { 1 20 }"
checkit 1 1 100 5 0 "\\*" "1 { 1 5 }"
checkit 2 2 100 18 0 "\\*" "1 { 1 18 }"
checkit 4 4 100 3 0 "\\*" "1 { 1 3 }"
restart
checkit 0 5 255 20 0 "\\*" "1 { 1 20 }"
checkit 1 1 100 5 0 "\\*" "1 { 1 5 }"
checkit 2 2 100 18 0 "\\*" "1 { 1 18 }"
checkit 4 4 100 3 0 "\\*" "1 { 1 3 }"
send "1126 27 1 3 { 6 7 8 }\n"
simple_expect "=1126"
send "1127 27 2 1 { 19 }\n"
simple_expect "=1127"
send "1128 27 4 5 { 4 6 8 7 5 }\n"
simple_expect "=1128"
checkit 1 1 100 8 0 "\\*" "1 { 1 8 }"
checkit 2 2 100 19 0 "\\*" "1 { 1 19 }"
checkit 4 4 100 8 0 "\\*" "1 { 1 8 }"
restart
checkit 1 1 100 8 0 "\\*" "1 { 1 8 }"
checkit 2 2 100 19 0 "\\*" "1 { 1 19 }"
checkit 4 4 100 8 0 "\\*" "1 { 1 8 }"
send "1129 27 1 1 { 9 }\n"
simple_expect "=1129"
send "1130 27 2 1 { 20 }\n"
simple_expect "=1130"
send "1131 27 4 1 { 9 }\n"
simple_expect "=1131"
checkit 1 1 100 12 0 "\\*" "1 { 12 12 }"
checkit 2 2 100 20 0 "\\*" "1 { 1 20 }"
checkit 4 4 100 20 0 "\\*" "1 { 1 20 }"
restart
checkit 1 1 100 12 0 "\\*" "1 { 12 12 }"
checkit 2 2 100 20 0 "\\*" "1 { 1 20 }"
checkit 4 4 100 20 0 "\\*" "1 { 1 20 }"
send "1132 27 1 1 { 13 }\n"
simple_expect "=1132"
checkit 1 1 100 15 0 "\\*" "1 { 15 15 }"
restart
checkit 1 1 100 15 0 "\\*" "1 { 15 15 }"
send "1133 27 1 5 { 20 19 18 17 16 }\n"
simple_expect "=1133"
checkit 0 5 255 20 0 "\\*" "1 { 1 20 }"
checkit 1 1 100 20 0 "\\*" "1 { 1 20 }"
checkit 2 2 100 20 0 "\\*" "1 { 1 20 }"
checkit 3 3 100 20 0 "\\*" "1 { 1 20 }"
checkit 4 4 100 20 0 "\\*" "1 { 1 20 }"
restart
checkit 0 5 255 20 0 "\\*" "1 { 1 20 }"
checkit 1 1 100 20 0 "\\*" "1 { 1 20 }"
checkit 2 2 100 20 0 "\\*" "1 { 1 20 }"
checkit 3 3 100 20 0 "\\*" "1 { 1 20 }"
checkit 4 4 100 20 0 "\\*" "1 { 1 20 }"
stop
release_lock
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment