mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2026-11-21 01:21:34 -08:00
Refactor database import
This commit is contained in:
1 parent
9e79da0efc
commit
e460a4fe4f
13 files changed
+93
-402
No files matched your search
@@ -19,22 +19,12 @@
|
||||
*/
|
||||
package com.kunzisoft.keepass.tests.database;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.AssetManager;
|
||||
import android.net.Uri;
|
||||
import android.os.Environment;
|
||||
import android.test.AndroidTestCase;
|
||||
|
||||
import com.kunzisoft.keepass.database.load.ImporterV3;
|
||||
import com.kunzisoft.keepass.tests.TestUtil;
|
||||
import com.kunzisoft.keepass.utils.UriUtil;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.io.File;
|
||||
|
||||
public class Kdb3 extends AndroidTestCase {
|
||||
|
||||
private void testKeyfile(String dbAsset, String keyAsset, String password) throws Exception {
|
||||
/*
|
||||
Context ctx = getContext();
|
||||
|
||||
File sdcard = Environment.getExternalStorageDirectory();
|
||||
@@ -49,6 +39,7 @@ public class Kdb3 extends AndroidTestCase {
|
||||
importer.openDatabase(is, password, TestUtil.getKeyFileInputStream(ctx, keyPath));
|
||||
|
||||
is.close();
|
||||
*/
|
||||
}
|
||||
|
||||
public void testXMLKeyFile() throws Exception {
|
||||
|
||||
@@ -19,18 +19,11 @@
|
||||
*/
|
||||
package com.kunzisoft.keepass.tests.database;
|
||||
|
||||
import java.io.InputStream;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.AssetManager;
|
||||
import android.test.AndroidTestCase;
|
||||
|
||||
import com.kunzisoft.keepass.database.element.PwDatabaseV3;
|
||||
import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm;
|
||||
import com.kunzisoft.keepass.database.load.ImporterV3;
|
||||
|
||||
public class Kdb3Twofish extends AndroidTestCase {
|
||||
public void testReadTwofish() throws Exception {
|
||||
/*
|
||||
Context ctx = getContext();
|
||||
|
||||
AssetManager am = ctx.getAssets();
|
||||
@@ -43,6 +36,6 @@ public class Kdb3Twofish extends AndroidTestCase {
|
||||
assertTrue(db.getEncryptionAlgorithm() == PwEncryptionAlgorithm.Twofish);
|
||||
|
||||
is.close();
|
||||
|
||||
*/
|
||||
}
|
||||
}
|
||||
@@ -19,16 +19,7 @@
|
||||
*/
|
||||
package com.kunzisoft.keepass.tests.database;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.AssetManager;
|
||||
import android.net.Uri;
|
||||
|
||||
import com.kunzisoft.keepass.database.element.Database;
|
||||
import com.kunzisoft.keepass.database.element.PwDatabaseV3Debug;
|
||||
import com.kunzisoft.keepass.database.load.Importer;
|
||||
import com.kunzisoft.keepass.tests.TestUtil;
|
||||
|
||||
import java.io.InputStream;
|
||||
|
||||
public class TestData {
|
||||
private static final String TEST1_KEYFILE = "";
|
||||
@@ -37,6 +28,7 @@ public class TestData {
|
||||
|
||||
private static Database mDb1;
|
||||
|
||||
/*
|
||||
|
||||
public static Database GetDb1(Context ctx) throws Exception {
|
||||
return GetDb1(ctx, false);
|
||||
@@ -75,4 +67,5 @@ public class TestData {
|
||||
//return (PwDatabaseV3Debug) mDb1.getPwDatabase();
|
||||
return null;
|
||||
}
|
||||
*/
|
||||
}
|
||||
+4
-24
@@ -19,33 +19,12 @@
|
||||
*/
|
||||
package com.kunzisoft.keepass.tests.output;
|
||||
|
||||
import static org.junit.Assert.assertArrayEquals;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.security.DigestOutputStream;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
|
||||
import android.content.res.AssetManager;
|
||||
import android.test.AndroidTestCase;
|
||||
|
||||
import com.kunzisoft.keepass.database.element.PwDatabaseV3Debug;
|
||||
import com.kunzisoft.keepass.database.element.PwDbHeader;
|
||||
import com.kunzisoft.keepass.database.element.PwDbHeaderV3;
|
||||
import com.kunzisoft.keepass.database.exception.PwDbOutputException;
|
||||
import com.kunzisoft.keepass.database.save.PwDbHeaderOutputV3;
|
||||
import com.kunzisoft.keepass.database.save.PwDbV3Output;
|
||||
import com.kunzisoft.keepass.database.save.PwDbV3OutputDebug;
|
||||
import com.kunzisoft.keepass.stream.NullOutputStream;
|
||||
import com.kunzisoft.keepass.tests.TestUtil;
|
||||
import com.kunzisoft.keepass.tests.database.TestData;
|
||||
|
||||
public class PwManagerOutputTest extends AndroidTestCase {
|
||||
PwDatabaseV3Debug mPM;
|
||||
|
||||
// PwDatabaseV3Debug mPM;
|
||||
|
||||
/*
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
@@ -143,4 +122,5 @@ public class PwManagerOutputTest extends AndroidTestCase {
|
||||
assertArrayEquals("Databases do not match.", bExpected.toByteArray(), bActual.toByteArray());
|
||||
|
||||
}
|
||||
*/
|
||||
}
|
||||
Reference in new issue
Block a user