Skip to content

Commit 43a257f

Browse files
Add test for nested transactions
1 parent 7528954 commit 43a257f

File tree

6 files changed

+161
-108
lines changed

6 files changed

+161
-108
lines changed

net.zetetic.sqlcipher.test.iml

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" />
1111
<option name="COMPILE_CUSTOM_GENERATED_SOURCES" value="false" />
1212
<includeAssetsFromLibraries>true</includeAssetsFromLibraries>
13+
<resOverlayFolders>
14+
<path>/res-overlay</path>
15+
</resOverlayFolders>
1316
</configuration>
1417
</facet>
1518
</component>
@@ -25,18 +28,42 @@
2528
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/extracted-dependencies" />
2629
</content>
2730
<orderEntry type="sourceFolder" forTests="false" />
28-
<orderEntry type="jdk" jdkName="Maven Android 2.1 Platform" jdkType="Android SDK" />
31+
<orderEntry type="jdk" jdkName="Maven Android API 7 Platform" jdkType="Android SDK" />
2932
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:2.1.2" level="project" />
3033
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
3134
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
3235
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
33-
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.0" level="project" />
36+
<orderEntry type="module-library">
37+
<library name="Maven: commons-codec:commons-codec:1.0">
38+
<CLASSES>
39+
<root url="jar://$MODULE_DIR$/libs/commons-codec.jar!/" />
40+
</CLASSES>
41+
<JAVADOC />
42+
<SOURCES />
43+
</library>
44+
</orderEntry>
3445
<orderEntry type="library" scope="PROVIDED" name="Maven: org.khronos:opengl-api:gl1.1-android-2.1_r1" level="project" />
3546
<orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
3647
<orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
3748
<orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
38-
<orderEntry type="library" name="Maven: sqlcipher:sqlcipher:1.0" level="project" />
39-
<orderEntry type="library" name="Maven: guava:guava:1.0" level="project" />
49+
<orderEntry type="module-library">
50+
<library name="Maven: sqlcipher:sqlcipher:1.0">
51+
<CLASSES>
52+
<root url="jar://$MODULE_DIR$/libs/sqlcipher.jar!/" />
53+
</CLASSES>
54+
<JAVADOC />
55+
<SOURCES />
56+
</library>
57+
</orderEntry>
58+
<orderEntry type="module-library">
59+
<library name="Maven: guava:guava:1.0">
60+
<CLASSES>
61+
<root url="jar://$MODULE_DIR$/libs/guava-r09.jar!/" />
62+
</CLASSES>
63+
<JAVADOC />
64+
<SOURCES />
65+
</library>
66+
</orderEntry>
4067
</component>
4168
</module>
4269

net.zetetic.sqlcipher.test.ipr

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
<component name="ProjectResources">
206206
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
207207
</component>
208-
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
208+
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 19 Platform" project-jdk-type="Android SDK">
209209
<output url="file://$PROJECT_DIR$/classes" />
210210
</component>
211211
<component name="VcsDirectoryMappings">
@@ -223,13 +223,6 @@
223223
<root url="jar://$MAVEN_REPOSITORY$/com/google/android/android/2.1.2/android-2.1.2-sources.jar!/" />
224224
</SOURCES>
225225
</library>
226-
<library name="Maven: commons-codec:commons-codec:1.0">
227-
<CLASSES>
228-
<root url="jar://$PROJECT_DIR$/libs/commons-codec.jar!/" />
229-
</CLASSES>
230-
<JAVADOC />
231-
<SOURCES />
232-
</library>
233226
<library name="Maven: commons-logging:commons-logging:1.1.1">
234227
<CLASSES>
235228
<root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
@@ -241,13 +234,6 @@
241234
<root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar!/" />
242235
</SOURCES>
243236
</library>
244-
<library name="Maven: guava:guava:1.0">
245-
<CLASSES>
246-
<root url="jar://$PROJECT_DIR$/libs/guava-r09.jar!/" />
247-
</CLASSES>
248-
<JAVADOC />
249-
<SOURCES />
250-
</library>
251237
<library name="Maven: org.apache.httpcomponents:httpclient:4.0.1">
252238
<CLASSES>
253239
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar!/" />
@@ -292,13 +278,6 @@
292278
<root url="jar://$MAVEN_REPOSITORY$/org/khronos/opengl-api/gl1.1-android-2.1_r1/opengl-api-gl1.1-android-2.1_r1-sources.jar!/" />
293279
</SOURCES>
294280
</library>
295-
<library name="Maven: sqlcipher:sqlcipher:1.0">
296-
<CLASSES>
297-
<root url="jar://$PROJECT_DIR$/libs/sqlcipher.jar!/" />
298-
</CLASSES>
299-
<JAVADOC />
300-
<SOURCES />
301-
</library>
302281
<library name="Maven: xerces:xmlParserAPIs:2.6.2">
303282
<CLASSES>
304283
<root url="jar://$MAVEN_REPOSITORY$/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar!/" />

0 commit comments

Comments
 (0)