Skip to content

Commit 11bd6f3

Browse files
Guard setExtras test with build version check
1 parent 81572c7 commit 11bd6f3

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

sqlcipher/src/androidTest/java/net/zetetic/database/database_cts/CursorWrapperTest.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424
import android.database.CursorWrapper;
2525
import android.database.DataSetObserver;
2626
import android.database.StaleDataException;
27-
import net.zetetic.database.sqlcipher.SQLiteDatabase;
2827
import android.os.Bundle;
2928
import android.os.Handler;
3029
import android.test.AndroidTestCase;
3130

31+
import net.zetetic.database.sqlcipher.SQLiteDatabase;
32+
3233
import java.io.File;
3334
import java.util.Arrays;
3435

@@ -439,14 +440,16 @@ public void testContentObserverOperations() throws IllegalStateException {
439440
}
440441

441442
public void testSetExtras() {
442-
Cursor cursor = getCursor();
443-
CursorWrapper cursorWrapper = new CursorWrapper(cursor);
444-
try {
445-
Bundle b = new Bundle();
446-
cursorWrapper.setExtras(b);
447-
assertSame(b, cursor.getExtras());
448-
} finally {
449-
cursorWrapper.close();
443+
if(android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M){
444+
Cursor cursor = getCursor();
445+
CursorWrapper cursorWrapper = new CursorWrapper(cursor);
446+
try {
447+
Bundle b = new Bundle();
448+
cursorWrapper.setExtras(b);
449+
assertSame(b, cursor.getExtras());
450+
} finally {
451+
cursorWrapper.close();
452+
}
450453
}
451454
}
452455

0 commit comments

Comments
 (0)