Commit b57bef0a authored by Per Cederqvist's avatar Per Cederqvist
Browse files

Expect range-begin and range-end in Text-Mappings.

parent 4b621942
......@@ -69,7 +69,7 @@ send "1011 34 1 1 50\n"
simple_expect "=1011 1 1 { 1 }" "one map (old-style)"
send "1012 103 1 1 50\n"
simple_expect "=1012 0 1 1 1 { 1 }" "one map (new-style)"
simple_expect "=1012 1 2 0 1 1 1 { 1 }" "one map (new-style)"
send "1013 34 1 2 50\n"
simple_expect "%1013 16 2" "one map (old-style 2)"
......@@ -99,7 +99,7 @@ send "1019 34 1 1 50\n"
simple_expect "=1019 1 2 { 1 3 }" "one map (old-style)"
send "1020 103 1 1 50\n"
simple_expect "=1020 0 1 1 2 { 1 3 }" "one map (new-style)"
simple_expect "=1020 1 3 0 1 1 2 { 1 3 }" "one map (new-style)"
send "1021 34 1 3 50\n"
simple_expect "%1021 16 3" "one map (old-style 3)"
......@@ -111,25 +111,25 @@ send "1023 34 1 2 50\n"
simple_expect "=1023 2 1 { 3 }" "one map (old-style 2)"
send "1024 103 1 2 50\n"
simple_expect "=1024 0 1 2 1 { 3 }" "one map (new-style 2)"
simple_expect "=1024 2 3 0 1 2 1 { 3 }" "one map (new-style 2)"
send "1025 34 1 1 2\n"
simple_expect "=1025 1 2 { 1 3 }" "one map (old-style)"
send "1026 103 1 1 2\n"
simple_expect "=1026 0 1 1 2 { 1 3 }" "one map (new-style)"
simple_expect "=1026 1 3 0 1 1 2 { 1 3 }" "one map (new-style)"
send "1027 34 1 1 1\n"
simple_expect "=1027 1 1 { 1 }" "one map (old-style)"
send "1028 103 1 1 1\n"
simple_expect "=1028 1 1 1 1 { 1 }" "one map (new-style)"
simple_expect "=1028 1 2 1 1 1 1 { 1 }" "one map (new-style)"
send "1029 34 1 1 0\n"
simple_expect "=1029 1 0 \\*" "one map (old-style)"
send "1030 103 1 1 0\n"
simple_expect "=1030 1 0 0 \\*" "one map (new-style)"
simple_expect "=1030 1 1 1 0 0 \\*" "one map (new-style)"
# Connect a second client that is aux-info-aware
client_start 1
......@@ -202,7 +202,7 @@ send "1045 34 1 1 50\n"
simple_expect "=1045 1 3 { 1 3 4 }" "one map (old-style)"
send "1046 103 1 1 50\n"
simple_expect "=1046 0 1 1 3 { 1 3 4 }" "one map (new-style)"
simple_expect "=1046 1 4 0 1 1 3 { 1 3 4 }" "one map (new-style)"
send "1047 34 1 4 50\n"
simple_expect "%1047 16 4" "one map (old-style 3)"
......@@ -214,25 +214,25 @@ send "1049 34 1 2 50\n"
simple_expect "=1049 2 2 { 3 4 }" "one map (old-style 2)"
send "1050 103 1 2 50\n"
simple_expect "=1050 0 1 2 2 { 3 4 }" "one map (new-style 2)"
simple_expect "=1050 2 4 0 1 2 2 { 3 4 }" "one map (new-style 2)"
send "1051 34 1 1 2\n"
simple_expect "=1051 1 2 { 1 3 }" "one map (old-style)"
send "1052 103 1 1 2\n"
simple_expect "=1052 1 1 1 2 { 1 3 }" "one map (new-style)"
simple_expect "=1052 1 3 1 1 1 2 { 1 3 }" "one map (new-style)"
send "1053 34 1 1 1\n"
simple_expect "=1053 1 1 { 1 }" "one map (old-style)"
send "1054 103 1 1 1\n"
simple_expect "=1054 1 1 1 1 { 1 }" "one map (new-style)"
simple_expect "=1054 1 2 1 1 1 1 { 1 }" "one map (new-style)"
send "1055 34 1 3 0\n"
simple_expect "=1055 3 0 \\*" "one map (old-style)"
send "1056 103 1 3 0\n"
simple_expect "=1056 1 0 0 \\*" "one map (new-style)"
simple_expect "=1056 3 3 1 0 0 \\*" "one map (new-style)"
talk_to client 1
......@@ -345,31 +345,31 @@ send "1083 103 1 0 50\n"
simple_expect "%1083 17 0"
send "1084 103 1 1 50\n"
simple_expect "=1084 0 1 1 9 { 1 3 4 5 6 7 8 9 10 }"
simple_expect "=1084 1 10 0 1 1 9 { 1 3 4 5 6 7 8 9 10 }"
send "1085 103 1 2 50\n"
simple_expect "=1085 0 1 2 8 { 3 4 5 6 7 8 9 10 }"
simple_expect "=1085 2 10 0 1 2 8 { 3 4 5 6 7 8 9 10 }"
send "1086 103 1 3 50\n"
simple_expect "=1086 0 1 3 7 { 4 5 6 7 8 9 10 }"
simple_expect "=1086 3 10 0 1 3 7 { 4 5 6 7 8 9 10 }"
send "1087 103 1 4 50\n"
simple_expect "=1087 0 1 4 6 { 5 6 7 8 9 10 }"
simple_expect "=1087 4 10 0 1 4 6 { 5 6 7 8 9 10 }"
send "1088 103 1 5 50\n"
simple_expect "=1088 0 1 5 5 { 6 7 8 9 10 }"
simple_expect "=1088 5 10 0 1 5 5 { 6 7 8 9 10 }"
send "1089 103 1 6 50\n"
simple_expect "=1089 0 1 6 4 { 7 8 9 10 }"
simple_expect "=1089 6 10 0 1 6 4 { 7 8 9 10 }"
send "1090 103 1 7 50\n"
simple_expect "=1090 0 1 7 3 { 8 9 10 }"
simple_expect "=1090 7 10 0 1 7 3 { 8 9 10 }"
send "1091 103 1 8 50\n"
simple_expect "=1091 0 1 8 2 { 9 10 }"
simple_expect "=1091 8 10 0 1 8 2 { 9 10 }"
send "1092 103 1 9 50\n"
simple_expect "=1092 0 1 9 1 { 10 }"
simple_expect "=1092 9 10 0 1 9 1 { 10 }"
send "1093 103 1 10 50\n"
simple_expect "%1093 16 10"
......@@ -384,22 +384,22 @@ send "1096 103 1 0 9\n"
simple_expect "%1096 17 0"
send "1097 103 1 1 10\n"
simple_expect "=1097 0 1 1 9 { 1 3 4 5 6 7 8 9 10 }"
simple_expect "=1097 1 10 0 1 1 9 { 1 3 4 5 6 7 8 9 10 }"
send "1098 103 1 1 9\n"
simple_expect "=1098 0 1 1 9 { 1 3 4 5 6 7 8 9 10 }"
simple_expect "=1098 1 10 0 1 1 9 { 1 3 4 5 6 7 8 9 10 }"
send "1099 103 1 1 8\n"
simple_expect "=1099 1 1 1 8 { 1 3 4 5 6 7 8 9 }"
simple_expect "=1099 1 9 1 1 1 8 { 1 3 4 5 6 7 8 9 }"
send "1100 103 1 3 5\n"
simple_expect "=1100 1 1 3 5 { 4 5 6 7 8 }"
simple_expect "=1100 3 8 1 1 3 5 { 4 5 6 7 8 }"
send "1101 103 1 8 2\n"
simple_expect "=1101 0 1 8 2 { 9 10 }"
simple_expect "=1101 8 10 0 1 8 2 { 9 10 }"
send "1102 103 1 9 1\n"
simple_expect "=1102 0 1 9 1 { 10 }"
simple_expect "=1102 9 10 0 1 9 1 { 10 }"
# Remove a few texts to provoke sparse maps.
......@@ -433,22 +433,22 @@ send "1110 34 1 6 50\n"
simple_expect "=1110 6 4 { 7 8 9 10 }"
send "1111 103 1 3 1\n"
simple_expect "=1111 1 1 5 1 { 6 }"
simple_expect "=1111 3 6 1 1 5 1 { 6 }"
send "1112 103 1 4 1\n"
simple_expect "=1112 1 1 5 1 { 6 }"
simple_expect "=1112 4 6 1 1 5 1 { 6 }"
send "1113 103 1 5 1\n"
simple_expect "=1113 1 1 5 1 { 6 }"
simple_expect "=1113 5 6 1 1 5 1 { 6 }"
send "1114 103 1 2 1\n"
simple_expect "=1114 1 1 2 1 { 3 }"
simple_expect "=1114 2 3 1 1 2 1 { 3 }"
send "1115 103 1 2 2\n"
simple_expect "=1115 1 0 2 { 2 3 5 6 }"
simple_expect "=1115 2 6 1 0 2 { 2 3 5 6 }"
send "1116 103 1 2 3\n"
simple_expect "=1116 1 1 2 5 { 3 0 0 6 7 }"
simple_expect "=1116 2 7 1 1 2 5 { 3 0 0 6 7 }"
# Texts written by person 5:
# ano: 1 2 3 4 5 6 7 8
......@@ -501,28 +501,28 @@ send "1130 47 6 1 10\n"
simple_expect "=1130 2 1 { 5 }"
send "1131 104 5 1 50\n"
simple_expect "=1131 0 1 1 8 { 1 2 3 6 7 8 9 10 }"
simple_expect "=1131 1 9 0 1 1 8 { 1 2 3 6 7 8 9 10 }"
send "1132 104 5 1 9\n"
simple_expect "=1132 0 1 1 8 { 1 2 3 6 7 8 9 10 }"
simple_expect "=1132 1 9 0 1 1 8 { 1 2 3 6 7 8 9 10 }"
send "1133 104 5 1 8\n"
simple_expect "=1133 0 1 1 8 { 1 2 3 6 7 8 9 10 }"
simple_expect "=1133 1 9 0 1 1 8 { 1 2 3 6 7 8 9 10 }"
send "1134 104 5 1 7\n"
simple_expect "=1134 1 1 1 7 { 1 2 3 6 7 8 9 }"
simple_expect "=1134 1 8 1 1 1 7 { 1 2 3 6 7 8 9 }"
send "1135 104 5 1 6\n"
simple_expect "=1135 1 1 1 6 { 1 2 3 6 7 8 }"
simple_expect "=1135 1 7 1 1 1 6 { 1 2 3 6 7 8 }"
send "1136 104 5 1 2\n"
simple_expect "=1136 1 1 1 2 { 1 2 }"
simple_expect "=1136 1 3 1 1 1 2 { 1 2 }"
send "1137 104 5 1 1\n"
simple_expect "=1137 1 1 1 1 { 1 }"
simple_expect "=1137 1 2 1 1 1 1 { 1 }"
send "1138 104 5 1 0\n"
simple_expect "=1138 1 0 0 \\*"
simple_expect "=1138 1 1 1 0 0 \\*"
send "1139 104 5 0 0\n"
simple_expect "%1139 17 0"
......@@ -534,7 +534,7 @@ send "1141 104 5 0 50\n"
simple_expect "%1141 17 0"
send "1142 104 6 1 10\n"
simple_expect "=1142 0 1 2 1 { 5 }"
simple_expect "=1142 1 3 0 1 2 1 { 5 }"
# Remove some more
......@@ -562,25 +562,25 @@ simple_expect ":18 14 9 $any_time 5 0 8 0 2 { 0 1 6 8 } 0 \\*"
# tno: 1 3 . . . . . . 10
send "1147 103 1 1 2\n"
simple_expect "=1147 1 1 1 2 { 1 3 }"
simple_expect "=1147 1 3 1 1 1 2 { 1 3 }"
send "1148 103 1 2 2\n"
simple_expect "=1148 0 0 2 { 2 3 9 10 }"
simple_expect "=1148 2 10 0 0 2 { 2 3 9 10 }"
send "1149 103 1 2 3\n"
simple_expect "=1149 0 0 2 { 2 3 9 10 }"
simple_expect "=1149 2 10 0 0 2 { 2 3 9 10 }"
send "1150 103 1 1 3\n"
simple_expect "=1150 0 0 3 { 1 1 2 3 9 10 }"
simple_expect "=1150 1 10 0 0 3 { 1 1 2 3 9 10 }"
send "1151 103 1 1 4\n"
simple_expect "=1151 0 0 3 { 1 1 2 3 9 10 }"
simple_expect "=1151 1 10 0 0 3 { 1 1 2 3 9 10 }"
send "1152 103 1 1 50\n"
simple_expect "=1152 0 0 3 { 1 1 2 3 9 10 }"
simple_expect "=1152 1 10 0 0 3 { 1 1 2 3 9 10 }"
send "1153 103 1 6 50\n"
simple_expect "=1153 0 1 9 1 { 10 }"
simple_expect "=1153 6 10 0 1 9 1 { 10 }"
send "1154 34 1 6 50\n"
simple_expect "=1154 6 4 { 0 0 0 10 }"
......@@ -593,14 +593,14 @@ send "1156 103 1 3 256\n"
simple_expect "%1156 46 255"
send "1157 103 1 3 255\n"
simple_expect "=1157 0 1 9 1 { 10 }"
simple_expect "=1157 3 10 0 1 9 1 { 10 }"
# Test to get the map from a conference we are not a member of
send "1158 34 3 1 10\n"
simple_expect "=1158 1 1 { 3 }"
send "1159 103 3 1 10\n"
simple_expect "=1159 0 1 1 1 { 3 }"
simple_expect "=1159 1 2 0 1 1 1 { 3 }"
# Texts written by person 5:
# ano: 1 2 3 . . . . 8
......@@ -611,28 +611,28 @@ simple_expect "=1159 0 1 1 1 { 3 }"
# tno: . 5
send "1160 104 5 1 3\n"
simple_expect "=1160 1 1 1 3 { 1 2 3 }"
simple_expect "=1160 1 4 1 1 1 3 { 1 2 3 }"
send "1161 104 5 2 2\n"
simple_expect "=1161 1 1 2 2 { 2 3 }"
simple_expect "=1161 2 4 1 1 2 2 { 2 3 }"
send "1162 104 5 1 4\n"
simple_expect "=1162 0 0 4 { 1 1 2 2 3 3 8 10 }"
simple_expect "=1162 1 9 0 0 4 { 1 1 2 2 3 3 8 10 }"
send "1163 104 5 4 50\n"
simple_expect "=1163 0 1 8 1 { 10 }"
simple_expect "=1163 4 9 0 1 8 1 { 10 }"
send "1164 104 5 1 50\n"
simple_expect "=1164 0 0 4 { 1 1 2 2 3 3 8 10 }"
simple_expect "=1164 1 9 0 0 4 { 1 1 2 2 3 3 8 10 }"
send "1165 104 5 3 50\n"
simple_expect "=1165 0 0 2 { 3 3 8 10 }"
simple_expect "=1165 3 9 0 0 2 { 3 3 8 10 }"
send "1166 104 5 3 2\n"
simple_expect "=1166 0 0 2 { 3 3 8 10 }"
simple_expect "=1166 3 9 0 0 2 { 3 3 8 10 }"
send "1167 104 5 3 1\n"
simple_expect "=1167 1 1 3 1 { 3 }"
simple_expect "=1167 3 4 1 1 3 1 { 3 }"
send "1168 47 5 1 3\n"
simple_expect "=1168 1 3 { 1 2 3 }"
......@@ -677,7 +677,7 @@ send "1181 47 5 8 4\n"
simple_expect "=1181 8 1 { 10 }"
send "1182 104 6 1 50\n"
simple_expect "=1182 0 1 2 1 { 5 }"
simple_expect "=1182 1 3 0 1 2 1 { 5 }"
send "1183 47 6 1 50\n"
simple_expect "=1183 2 1 { 5 }"
......@@ -751,11 +751,12 @@ send "1198 34 1 9 13\n"
simple_expect "=1198 9 4 { 10 0 12 13 }"
# Test to get the map from a completely empty conference
# Text 5 was a member of this conference.
send "1199 34 3 1 10\n"
simple_expect "=1199 2 0 \\*"
send "1200 103 3 1 10\n"
simple_expect "=1200 0 0 0 \\*"
simple_expect "=1200 1 2 0 0 0 \\*"
# Texts written by person 5:
# ano: . 2 . . . . . 8
......@@ -766,55 +767,55 @@ simple_expect "=1200 0 0 0 \\*"
# tno: . 5 . 12 13
send "1201 104 5 1 50\n"
simple_expect "=1201 0 0 2 { 2 2 8 10 }"
simple_expect "=1201 1 9 0 0 2 { 2 2 8 10 }"
send "1202 104 5 1 2\n"
simple_expect "=1202 0 0 2 { 2 2 8 10 }"
simple_expect "=1202 1 9 0 0 2 { 2 2 8 10 }"
send "1203 104 5 8 50\n"
simple_expect "=1203 0 1 8 1 { 10 }"
simple_expect "=1203 8 9 0 1 8 1 { 10 }"
send "1204 104 5 9 50\n"
simple_expect "%1204 16 9"
send "1205 104 5 1 1\n"
simple_expect "=1205 1 1 2 1 { 2 }"
simple_expect "=1205 1 3 1 1 2 1 { 2 }"
send "1206 104 6 1 1\n"
simple_expect "=1206 1 1 2 1 { 5 }"
simple_expect "=1206 1 3 1 1 2 1 { 5 }"
send "1207 104 6 1 2\n"
simple_expect "=1207 1 1 2 3 { 5 0 12 }"
simple_expect "=1207 1 5 1 1 2 3 { 5 0 12 }"
send "1208 104 6 1 3\n"
simple_expect "=1208 0 1 2 4 { 5 0 12 13 }"
simple_expect "=1208 1 6 0 1 2 4 { 5 0 12 13 }"
send "1209 104 6 2 1\n"
simple_expect "=1209 1 1 2 1 { 5 }"
simple_expect "=1209 2 3 1 1 2 1 { 5 }"
send "1210 104 6 2 2\n"
simple_expect "=1210 1 1 2 3 { 5 0 12 }"
simple_expect "=1210 2 5 1 1 2 3 { 5 0 12 }"
send "1211 104 6 2 3\n"
simple_expect "=1211 0 1 2 4 { 5 0 12 13 }"
simple_expect "=1211 2 6 0 1 2 4 { 5 0 12 13 }"
send "1212 104 6 3 1\n"
simple_expect "=1212 1 1 4 1 { 12 }"
simple_expect "=1212 3 5 1 1 4 1 { 12 }"
send "1213 104 6 3 2\n"
simple_expect "=1213 0 1 4 2 { 12 13 }"
simple_expect "=1213 3 6 0 1 4 2 { 12 13 }"
send "1214 104 6 3 3\n"
simple_expect "=1214 0 1 4 2 { 12 13 }"
simple_expect "=1214 3 6 0 1 4 2 { 12 13 }"
send "1215 104 6 4 1\n"
simple_expect "=1215 1 1 4 1 { 12 }"
simple_expect "=1215 4 5 1 1 4 1 { 12 }"
send "1216 104 6 4 2\n"
simple_expect "=1216 0 1 4 2 { 12 13 }"
simple_expect "=1216 4 6 0 1 4 2 { 12 13 }"
send "1217 104 6 4 3\n"
simple_expect "=1217 0 1 4 2 { 12 13 }"
simple_expect "=1217 4 6 0 1 4 2 { 12 13 }"
send "1218 47 5 0 7\n"
simple_expect "=1218 2 7 { 2 0 0 0 0 0 10 }"
......@@ -894,10 +895,10 @@ simple_expect "=1239"
# tno: . . . 12 13
send "1240 104 6 1 2\n"
simple_expect "=1240 0 1 4 2 { 12 13 }"
simple_expect "=1240 1 6 0 1 4 2 { 12 13 }"
send "1241 104 6 1 1\n"
simple_expect "=1241 1 1 4 1 { 12 }"
simple_expect "=1241 1 5 1 1 4 1 { 12 }"
send "1242 47 6 1 2\n"
simple_expect "=1242 4 2 { 12 13 }"
......@@ -927,22 +928,22 @@ simple_expect ":18 14 10 $any_time 5 0 8 0 2 { 0 1 6 9 } 0 \\*"
# tno: . . . 12 13
send "1246 104 5 1 2\n"
simple_expect "=1246 0 0 0 \\*"
simple_expect "=1246 1 9 0 0 0 \\*"
send "1247 104 5 1 1\n"
simple_expect "=1247 0 0 0 \\*"
simple_expect "=1247 1 9 0 0 0 \\*"
send "1248 104 5 1 50\n"
simple_expect "=1248 0 0 0 \\*"
simple_expect "=1248 1 9 0 0 0 \\*"
send "1249 104 5 7 1\n"
simple_expect "=1249 0 0 0 \\*"
simple_expect "=1249 7 9 0 0 0 \\*"
send "1250 104 5 8 1\n"
simple_expect "=1250 0 0 0 \\*"
simple_expect "=1250 8 9 0 0 0 \\*"
send "1251 104 5 8 2\n"
simple_expect "=1251 0 0 0 \\*"
simple_expect "=1251 8 9 0 0 0 \\*"
send "1252 104 5 9 1\n"
simple_expect "%1252 16 9"
......
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