cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix unit tests, add shadow for WorkerManager

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-06-15 13:02:33 +02:00
parent 8bf71b893c
commit f22c761376
13 changed files with 117 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/test/java/org/sufficientlysecure/keychain/KeychainTestRunner.java
View File

@@ -3,6 +3,8 @@ package org.sufficientlysecure.keychain;
import org.junit.runners.model.InitializationError;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.sufficientlysecure.keychain.shadows.ShadowWorkManager;
public class KeychainTestRunner extends RobolectricTestRunner {
@@ -15,6 +17,7 @@ public class KeychainTestRunner extends RobolectricTestRunner {
return new Config.Builder()
.setSdk(27)
.setConstants(WorkaroundBuildConfig.class)
.setShadows(new Class[] { ShadowWorkManager.class })
.build();
}
}

43
OpenKeychain/src/test/java/org/sufficientlysecure/keychain/TestHelpers.java Normal file
View File

@@ -0,0 +1,43 @@
package org.sufficientlysecure.keychain;
import android.content.ContentValues;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.mockito.Matchers;
public class TestHelpers {
public static ContentValues cvContains(ContentValues value) {
return Matchers.argThat(new BaseMatcher<ContentValues>() {
@Override
public boolean matches(Object item) {
if (item instanceof ContentValues) {
ContentValues cv = (ContentValues) item;
for (String key : value.keySet()) {
if (!cv.containsKey(key)) {
return false;
}
Object ours = value.get(key);
Object theirs = cv.get(key);
if (ours == null && theirs == null) {
continue;
}
if (ours == null || !ours.equals(theirs)) {
return false;
}
}
return true;
}
return false;
}
@Override
public void describeTo(Description description) {
description.appendValue(value);
}
});
}
}

43
OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/InputDataOperationTest.java
View File

@@ -34,6 +34,7 @@ import org.openintents.openpgp.OpenPgpMetadata;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowLog;
import org.sufficientlysecure.keychain.KeychainTestRunner;
import org.sufficientlysecure.keychain.TestHelpers;
import org.sufficientlysecure.keychain.operations.InputDataOperation;
import org.sufficientlysecure.keychain.operations.results.InputDataResult;
import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType;
@@ -49,12 +50,16 @@ import java.io.PrintStream;
import java.security.Security;
import java.util.ArrayList;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.sufficientlysecure.keychain.TestHelpers.cvContains;
@RunWith(KeychainTestRunner.class)
public class InputDataOperationTest {
@@ -137,33 +142,33 @@ public class InputDataOperationTest {
Assert.assertNull(result.mDecryptVerifyResult);
ArrayList<Uri> outUris = result.getOutputUris();
Assert.assertEquals("must have two output URIs", 2, outUris.size());
Assert.assertEquals("first uri must be the one we provided", fakeOutputUri1, outUris.get(0));
assertEquals("must have two output URIs", 2, outUris.size());
assertEquals("first uri must be the one we provided", fakeOutputUri1, outUris.get(0));
verify(mockResolver).openOutputStream(result.getOutputUris().get(0), "w");
Assert.assertEquals("second uri must be the one we provided", fakeOutputUri2, outUris.get(1));
assertEquals("second uri must be the one we provided", fakeOutputUri2, outUris.get(1));
verify(mockResolver).openOutputStream(result.getOutputUris().get(1), "w");
ContentValues contentValues = new ContentValues();
contentValues.put("name", "data.txt");
contentValues.put("mimetype", "text/plain");
verify(mockResolver).insert(TemporaryFileProvider.CONTENT_URI, contentValues);
verify(mockResolver).insert(eq(TemporaryFileProvider.CONTENT_URI), cvContains(contentValues));
contentValues.put("name", (String) null);
contentValues.put("mimetype", "text/testvalue");
verify(mockResolver).insert(TemporaryFileProvider.CONTENT_URI, contentValues);
verify(mockResolver).insert(eq(TemporaryFileProvider.CONTENT_URI), cvContains(contentValues));
// quoted-printable returns windows style line endings for some reason?
Assert.assertEquals("first part must have expected content",
assertEquals("first part must have expected content",
"message part 1\r\n", new String(outStream1.toByteArray()));
Assert.assertEquals("second part must have expected content",
assertEquals("second part must have expected content",
"message part 2.1\nmessage part 2.2\n", new String(outStream2.toByteArray()));
OpenPgpMetadata metadata = result.mMetadata.get(0);
Assert.assertEquals("text/plain", metadata.getMimeType());
Assert.assertEquals("utf-8", metadata.getCharset());
assertEquals("text/plain", metadata.getMimeType());
assertEquals("utf-8", metadata.getCharset());
metadata = result.mMetadata.get(1);
Assert.assertEquals("text/testvalue", metadata.getMimeType());
Assert.assertEquals("iso-8859-1", metadata.getCharset());
assertEquals("text/testvalue", metadata.getMimeType());
assertEquals("iso-8859-1", metadata.getCharset());
}
@Test
@@ -184,9 +189,9 @@ public class InputDataOperationTest {
Assert.assertNull(result.mDecryptVerifyResult);
OpenPgpMetadata metadata = result.mMetadata.get(0);
Assert.assertEquals("text/plain", metadata.getMimeType());
assertEquals("text/plain", metadata.getMimeType());
Assert.assertEquals("charset should be set since it was explicitly specified",
assertEquals("charset should be set since it was explicitly specified",
"utf-8", metadata.getCharset());
Assert.assertTrue("faulty charset should have been detected",
result.getLog().containsType(LogType.MSG_DATA_MIME_CHARSET_FAULTY));
@@ -210,7 +215,7 @@ public class InputDataOperationTest {
Assert.assertNull(result.mDecryptVerifyResult);
OpenPgpMetadata metadata = result.mMetadata.get(0);
Assert.assertEquals("text/plain", metadata.getMimeType());
assertEquals("text/plain", metadata.getMimeType());
Assert.assertNull("charset was bad so it should not be set", metadata.getCharset());
Assert.assertTrue("faulty charset should have been detected",
@@ -231,9 +236,9 @@ public class InputDataOperationTest {
Assert.assertNull(result.mDecryptVerifyResult);
OpenPgpMetadata metadata = result.mMetadata.get(0);
Assert.assertEquals("text/plain", metadata.getMimeType());
assertEquals("text/plain", metadata.getMimeType());
Assert.assertEquals("charset should be set since it was guessed and not faulty",
assertEquals("charset should be set since it was guessed and not faulty",
"utf-8", metadata.getCharset());
Assert.assertTrue("charset should have been guessed",
result.getLog().containsType(LogType.MSG_DATA_MIME_CHARSET_GUESS));
@@ -253,9 +258,9 @@ public class InputDataOperationTest {
Assert.assertNull(result.mDecryptVerifyResult);
OpenPgpMetadata metadata = result.mMetadata.get(0);
Assert.assertEquals("text/plain", metadata.getMimeType());
assertEquals("text/plain", metadata.getMimeType());
Assert.assertEquals("charset should be set since it was guessed and not faulty",
assertEquals("charset should be set since it was guessed and not faulty",
"utf-8", metadata.getCharset());
Assert.assertTrue("charset should have been guessed",
result.getLog().containsType(LogType.MSG_DATA_MIME_CHARSET_GUESS));
@@ -280,7 +285,7 @@ public class InputDataOperationTest {
Assert.assertTrue("should not be mime parsed",
result.getLog().containsType(LogType.MSG_DATA_MIME_NONE));
Assert.assertEquals("output uri should simply be passed-through input uri",
assertEquals("output uri should simply be passed-through input uri",
result.getOutputUris().get(0), FAKE_CONTENT_INPUT_URI_1);
}

19
OpenKeychain/src/test/java/org/sufficientlysecure/keychain/shadows/ShadowWorkManager.java Normal file
View File

@@ -0,0 +1,19 @@
package org.sufficientlysecure.keychain.shadows;
import androidx.work.WorkManager;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import static org.mockito.Mockito.mock;
@Implements(WorkManager.class)
public class ShadowWorkManager {
@Implementation
public static WorkManager getInstance() {
return mock(WorkManager.class);
}
}