Skip to content

Commit ac94ca9

Browse files
authored
add rare string check for release-3.6.0 (#822)
1 parent 5c5d1a2 commit ac94ca9

2 files changed

Lines changed: 127 additions & 0 deletions

File tree

.ci/check_rare_string.sh

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
#!/bin/bash
2+
3+
concatenatedString=$1
4+
5+
function LOG_ERROR()
6+
{
7+
local content=${1}
8+
echo -e "\033[31m"${content}"\033[0m"
9+
}
10+
11+
function LOG_INFO()
12+
{
13+
local content=${1}
14+
echo -e "\033[32m"${content}"\033[0m"
15+
}
16+
17+
get_md5sum_cmd() {
18+
local md5sum_cmd="md5sum"
19+
if [ "$(uname)" == "Darwin" ]; then
20+
md5sum_cmd="md5"
21+
fi
22+
echo "$md5sum_cmd"
23+
}
24+
25+
function checkConcatenatedRareString() {
26+
local contract_address=${1}
27+
md5sum_cmd=$(get_md5sum_cmd)
28+
29+
md5_concatenatedString=$(echo -n "$concatenatedString" | $md5sum_cmd | awk '{print $1}')
30+
31+
local set_output=$(./dist/console.sh call HelloWorld "${contract_address}" set "${concatenatedString}")
32+
eventLogsFromSet=$(echo "set_output" | grep -o 'Event: {}' | sed 's/Event: {\(.*\)}/\1/')
33+
if [ ! -z "$eventLogsFromSet" ]; then
34+
echo "eventLogsFromSet=${eventLogsFromSet}"
35+
md5_eventLogsFromSet=$(echo -n "$eventLogsFromSet" | $md5sum_cmd | awk '{print $1}')
36+
if [ "$md5_concatenatedString" != "$md5_eventLogsFromSet" ]; then
37+
LOG_ERROR "error: check failed, the md5 values of rareString and eventLogsFromSet are not equal, fail concatenatedString: ${concatenatedString}"
38+
exit 1
39+
fi
40+
fi
41+
42+
# compare rare string and stringFromGet
43+
get_output=$(./dist/console.sh call HelloWorld "${contract_address}" get)
44+
stringFromGet=$(echo "$get_output" | grep "Return values" | sed 's/Return values:\(.*\)/\1/' | tr -d '()')
45+
md5_stringFromGet=$(echo -n "$stringFromGet" | $md5sum_cmd | awk '{print $1}')
46+
if [ "$md5_concatenatedString" != "$md5_stringFromGet" ]; then
47+
LOG_ERROR "error: check failed, the md5 values of rareString and stringFromGet are not equal, fail concatenatedString: ${concatenatedString}"
48+
exit 1
49+
else
50+
LOG_INFO "check success, concatenatedString: ${concatenatedString}"
51+
fi
52+
}
53+
54+
main() {
55+
LOG_INFO "check rare string start, concatenatedString: ${concatenatedString}"
56+
57+
# deploy HelloWorld contract
58+
console_output=$(./dist/console.sh deploy HelloWorld)
59+
contract_address=$(echo "$console_output" | grep -oE 'contract address: 0x[0-9a-fA-F]+' | sed 's/contract address: //')
60+
if [ -z "$contract_address" ]; then
61+
LOG_ERROR "deploy HelloWorld contract failed, contract_address: ${contract_address}"
62+
exit 1
63+
fi
64+
65+
checkConcatenatedRareString $contract_address
66+
LOG_INFO "check rare string finished!"
67+
}
68+
69+
main "$@"

.ci/ci_check.sh

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#!/bin/bash
22

33
set -e
4+
5+
rare_str_range_names=("CJKUnifiedIdeographs" "CJKCompatibilityIdeographs" "CJKCompatibilityIdeographsSupplement" "KangxiRadicals" "CJKRadicalsSupplement" "IdeographicDescriptionCharacters" "Bopomofo" "BopomofoExtended" "CJKStrokes" "CJKSymbolsandPunctuation" "CJKCompatibilityForms" "CJKCompatibility" "EnclosedCJKLettersandMonths" "CJKUnifiedIdeographsExtensionA" "CJKUnifiedIdeographsExtensionB" "CJKUnifiedIdeographsExtensionC" "CJKUnifiedIdeographsExtensionD" "CJKUnifiedIdeographsExtensionE" "CJKUnifiedIdeographsExtensionF")
6+
rare_str_range_values=("19968,40959" "63744,64255" "194560,195103" "12032,12255" "11904,12031" "12272,12287" "12544,12591" "12704,12735" "12736,12783" "12288,12351" "65072,65103" "13056,13311" "12800,13055" "13312,19903" "131072,173791" "173824,177977" "177984,178205" "178208,183969" "183984,191456")
7+
48
LOG_INFO() {
59
local content=${1}
610
echo -e "\033[32m ${content}\033[0m"
@@ -28,6 +32,11 @@ get_sed_cmd()
2832
echo "$sed_cmd"
2933
}
3034

35+
download_rare_string_jar() {
36+
LOG_INFO "----- Downloading get-rare-string-with-unicode.jar -------"
37+
curl -LO "https://github.com/FISCO-BCOS/LargeFiles/raw/master/binaries/jar/get-rare-string-with-unicode.jar"
38+
}
39+
3140
download_build_chain()
3241
{
3342
local tag="${1}"
@@ -83,13 +92,60 @@ clean_node()
8392
fi
8493
}
8594

95+
getRangeValues() {
96+
local rangeValue=$1
97+
IFS=',' read -r startValue endValue <<<"$rangeValue"
98+
99+
echo "$startValue $endValue"
100+
}
101+
102+
getConcatenatedRareStringWithRange() {
103+
local startUnicode=${1}
104+
local endUnicode=${2}
105+
106+
# concatenate strings with begin middle end
107+
local concatenatedString=$(java -cp './get-rare-string-with-unicode.jar' org.example.Main ${startUnicode})
108+
local midUnicode=$((($startUnicode + $endUnicode) / 2))
109+
for ((i = midUnicode; i <= midUnicode + 5; i++)); do
110+
local currentRareString=$(java -cp './get-rare-string-with-unicode.jar' org.example.Main ${i})
111+
concatenatedString+="$currentRareString"
112+
done
113+
local endRareString=$(java -cp './get-rare-string-with-unicode.jar' org.example.Main ${endUnicode})
114+
concatenatedString+="$endRareString"
115+
echo "$concatenatedString"
116+
}
117+
118+
check_rare_string() {
119+
download_rare_string_jar
120+
bash gradlew assemble
121+
cp ./src/integration-test/resources/config.toml ./dist/conf/config.toml
122+
cp -r ./nodes/127.0.0.1/sdk/* ./dist/conf/
123+
export LC_ALL=en_US.UTF-8
124+
export LANG=en_US.UTF-8
125+
export LANGUAGE=en_US.UTF-8
126+
127+
finalConcatenatedInputString=""
128+
for ((i = 0; i < ${#rare_str_range_names[@]}; i++)); do
129+
rangeName="${rare_str_range_names[$i]}"
130+
rangeValue="${rare_str_range_values[$i]}"
131+
132+
read -r startValue endValue <<<$(getRangeValues "$rangeValue")
133+
concatenatedString=$(getConcatenatedRareStringWithRange $startValue $endValue)
134+
finalConcatenatedInputString+="$concatenatedString"
135+
done
136+
137+
bash -x .ci/check_rare_string.sh ${finalConcatenatedInputString}
138+
}
139+
86140
check_standard_node()
87141
{
88142
build_node ${@:2}
89143
prepare_environment
90144
## run integration test
91145
bash gradlew test --info
92146
bash gradlew integrationTest --info
147+
LOG_INFO "------ standard_node check_rare_string---------"
148+
check_rare_string
93149
clean_node "${1}"
94150
}
95151

@@ -100,6 +156,8 @@ check_sm_node()
100156
## run integration test
101157
bash gradlew test --info
102158
bash gradlew integrationTest --info
159+
LOG_INFO "------ standard_node check_rare_string---------"
160+
check_rare_string
103161
clean_node "${1}"
104162
}
105163

0 commit comments

Comments
 (0)