Skip to content

Commit a33358e

Browse files
developernotesdevelopernotes
committed
Merge remote-tracking branch 'brodybits/icu-unicode-test'
Conflicts: src/main/java/net/zetetic/tests/TestSuiteRunner.java
2 parents 265629c + d9aca04 commit a33358e

File tree

10 files changed

+62
-36
lines changed

10 files changed

+62
-36
lines changed

‎libs/armeabi-v7a/libdatabase_sqlcipher.so‎

0 Bytes
Binary file not shown.

‎libs/armeabi-v7a/libsqlcipher_android.so‎

96 KB
Binary file not shown.

‎libs/armeabi/libdatabase_sqlcipher.so‎

0 Bytes
Binary file not shown.

‎libs/armeabi/libsqlcipher_android.so‎

100 KB
Binary file not shown.

‎libs/sqlcipher.jar‎

0 Bytes
Binary file not shown.

‎libs/x86/libdatabase_sqlcipher.so‎

-172 KB
Binary file not shown.

‎libs/x86/libsqlcipher_android.so‎

196 KB
Binary file not shown.

‎net.zetetic.sqlcipher.test.iws‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,6 @@
9292
</component>
9393
<component name="FileEditorManager">
9494
<leaf>
95-
<file leaf-file-name="CursorAccessTest.java" pinned="false" current="false" current-in-tab="false">
96-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/CursorAccessTest.java">
97-
<provider selected="true" editor-type-id="text-editor">
98-
<state vertical-scroll-proportion="0.0" vertical-offset="468" max-vertical-offset="1152">
99-
<caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
100-
<folding />
101-
</state>
102-
</provider>
103-
</entry>
104-
</file>
10595
<file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
10696
<entry file="file://$PROJECT_DIR$/pom.xml">
10797
<provider selected="true" editor-type-id="text-editor">
@@ -125,18 +115,18 @@
125115
<file leaf-file-name="ComputeKDFTest.java" pinned="false" current="false" current-in-tab="false">
126116
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/ComputeKDFTest.java">
127117
<provider selected="true" editor-type-id="text-editor">
128-
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="414">
118+
<state vertical-scroll-proportion="0.0" vertical-offset="270" max-vertical-offset="486">
129119
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
130120
<folding />
131121
</state>
132122
</provider>
133123
</entry>
134124
</file>
135-
<file leaf-file-name="AverageOpenTimeTest.java" pinned="false" current="true" current-in-tab="true">
125+
<file leaf-file-name="AverageOpenTimeTest.java" pinned="false" current="false" current-in-tab="false">
136126
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AverageOpenTimeTest.java">
137127
<provider selected="true" editor-type-id="text-editor">
138-
<state vertical-scroll-proportion="0.45173746" vertical-offset="18" max-vertical-offset="1062">
139-
<caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
128+
<state vertical-scroll-proportion="0.0" vertical-offset="18" max-vertical-offset="1062">
129+
<caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
140130
<folding>
141131
<element signature="imports" expanded="true" />
142132
</folding>
@@ -157,8 +147,18 @@
157147
<file leaf-file-name="TestSuiteRunner.java" pinned="false" current="false" current-in-tab="false">
158148
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
159149
<provider selected="true" editor-type-id="text-editor">
160-
<state vertical-scroll-proportion="0.0" vertical-offset="322" max-vertical-offset="1350">
161-
<caret line="75" column="35" selection-start-line="75" selection-start-column="35" selection-end-line="75" selection-end-column="35" />
150+
<state vertical-scroll-proportion="0.0" vertical-offset="430" max-vertical-offset="1368">
151+
<caret line="74" column="28" selection-start-line="74" selection-start-column="28" selection-end-line="74" selection-end-column="28" />
152+
<folding />
153+
</state>
154+
</provider>
155+
</entry>
156+
</file>
157+
<file leaf-file-name="UnicodeTest.java" pinned="false" current="true" current-in-tab="true">
158+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/UnicodeTest.java">
159+
<provider selected="true" editor-type-id="text-editor">
160+
<state vertical-scroll-proportion="0.7297297" vertical-offset="0" max-vertical-offset="518">
161+
<caret line="24" column="1" selection-start-line="24" selection-start-column="1" selection-end-line="24" selection-end-column="1" />
162162
<folding />
163163
</state>
164164
</provider>
@@ -454,7 +454,7 @@
454454
<recent name="net.zetetic.tests" />
455455
</key>
456456
</component>
457-
<component name="RunManager" selected="Android Application.emulator-4.4.2 (x86)">
457+
<component name="RunManager" selected="Android Application.emulator-4.4.2">
458458
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
459459
<module name="" />
460460
<option name="TESTING_TYPE" value="0" />
@@ -979,7 +979,7 @@
979979
</component>
980980
<component name="ToolWindowManager">
981981
<frame x="0" y="22" width="1916" height="1058" extended-state="6" />
982-
<editor active="false" />
982+
<editor active="true" />
983983
<layout>
984984
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3296875" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
985985
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -1040,13 +1040,6 @@
10401040
<option name="FILTER_TARGETS" value="false" />
10411041
</component>
10421042
<component name="editorHistoryManager">
1043-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrateDatabaseFrom1xFormatToCurrentFormat.java">
1044-
<provider selected="true" editor-type-id="text-editor">
1045-
<state vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="954">
1046-
<caret line="17" column="55" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1047-
</state>
1048-
</provider>
1049-
</entry>
10501043
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/QueryHelper.java">
10511044
<provider selected="true" editor-type-id="text-editor">
10521045
<state vertical-scroll-proportion="0.0" vertical-offset="234" max-vertical-offset="432">
@@ -1390,14 +1383,6 @@
13901383
</state>
13911384
</provider>
13921385
</entry>
1393-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
1394-
<provider selected="true" editor-type-id="text-editor">
1395-
<state vertical-scroll-proportion="0.0" vertical-offset="322" max-vertical-offset="1350">
1396-
<caret line="75" column="35" selection-start-line="75" selection-start-column="35" selection-end-line="75" selection-end-column="35" />
1397-
<folding />
1398-
</state>
1399-
</provider>
1400-
</entry>
14011386
<entry file="file://$PROJECT_DIR$/pom.xml">
14021387
<provider selected="true" editor-type-id="text-editor">
14031388
<state vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="1422">
@@ -1408,14 +1393,30 @@
14081393
</entry>
14091394
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AverageOpenTimeTest.java">
14101395
<provider selected="true" editor-type-id="text-editor">
1411-
<state vertical-scroll-proportion="0.45173746" vertical-offset="18" max-vertical-offset="1062">
1412-
<caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
1396+
<state vertical-scroll-proportion="0.0" vertical-offset="18" max-vertical-offset="1062">
1397+
<caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
14131398
<folding>
14141399
<element signature="imports" expanded="true" />
14151400
</folding>
14161401
</state>
14171402
</provider>
14181403
</entry>
1404+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
1405+
<provider selected="true" editor-type-id="text-editor">
1406+
<state vertical-scroll-proportion="0.0" vertical-offset="430" max-vertical-offset="1368">
1407+
<caret line="74" column="28" selection-start-line="74" selection-start-column="28" selection-end-line="74" selection-end-column="28" />
1408+
<folding />
1409+
</state>
1410+
</provider>
1411+
</entry>
1412+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/UnicodeTest.java">
1413+
<provider selected="true" editor-type-id="text-editor">
1414+
<state vertical-scroll-proportion="0.7297297" vertical-offset="0" max-vertical-offset="518">
1415+
<caret line="24" column="1" selection-start-line="24" selection-start-column="1" selection-end-line="24" selection-end-column="1" />
1416+
<folding />
1417+
</state>
1418+
</provider>
1419+
</entry>
14191420
</component>
14201421
<component name="masterDetails">
14211422
<states>
@@ -1473,7 +1474,6 @@
14731474
<option name="proportions">
14741475
<list>
14751476
<option value="0.39421967" />
1476-
<option value="0.6" />
14771477
</list>
14781478
</option>
14791479
</splitter-proportions>

‎src/main/java/net/zetetic/tests/TestSuiteRunner.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ private List<SQLCipherTest> getTestsToRun(){
7272
tests.add(new AverageOpenTimeTest());
7373
tests.add(new RawRekeyTest());
7474
tests.add(new NestedTransactionsTest());
75+
tests.add(new UnicodeTest());
7576
//tests.add(new MultiThreadReadWriteTest());
7677
//tests.add(new ComputeKDFTest());
7778
return tests;

‎src/main/java/net/zetetic/tests/UnicodeTest.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package net.zetetic.tests;
2+
3+
import android.database.Cursor;
4+
import net.sqlcipher.database.SQLiteDatabase;
5+
6+
public class UnicodeTest extends SQLCipherTest {
7+
@Override
8+
public boolean execute(SQLiteDatabase database) {
9+
10+
String expected = "КАКОЙ-ТО КИРИЛЛИЧЕСКИЙ ТЕКСТ"; // SOME Cyrillic TEXT
11+
String actual = "";
12+
Cursor result = database.rawQuery("select UPPER('Какой-то кириллический текст') as u1", new String[]{});
13+
if(result != null){
14+
result.moveToFirst();
15+
actual = result.getString(0);
16+
result.close();
17+
}
18+
return actual.equals(expected);
19+
}
20+
21+
@Override
22+
public String getName() {
23+
return "Unicode (ICU) Test";
24+
}
25+
}

0 commit comments

Comments
 (0)