-
Notifications
You must be signed in to change notification settings - Fork 24.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Omit all line terminators for ImageStore.getBase64ForTag
Summary: FIX #11142 This fixes #11142 and supersedes #11155 as I was unsure how to add/change commits in that PR. Wrote up a bunch of unit tests for the ImageStore module. The added tests showed that there was indeed a problem with the flags used for the Base64OutputStream, and they also show that that has been fixed now. Closes #13856 Differential Revision: D6017764 Pulled By: shergin fbshipit-source-id: adf667dc722ddfe31449afd8cd20a0a192eacff6
- Loading branch information
1 parent
7c89cf3
commit 7a7bdee
Showing
3 changed files
with
104 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
/** | ||
* Copyright (c) 2015-present, Facebook, Inc. | ||
* All rights reserved. | ||
* | ||
* This source code is licensed under the BSD-style license found in the | ||
* LICENSE file in the root directory of this source tree. An additional grant | ||
* of patent rights can be found in the PATENTS file in the same directory. | ||
*/ | ||
package com.facebook.react.modules.camera; | ||
|
||
import android.util.Base64; | ||
import android.util.Base64InputStream; | ||
|
||
import com.facebook.react.bridge.ReactApplicationContext; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
import org.powermock.core.classloader.annotations.PowerMockIgnore; | ||
import org.robolectric.RobolectricTestRunner; | ||
|
||
import java.io.ByteArrayInputStream; | ||
import java.io.IOException; | ||
import java.io.InputStream; | ||
import java.util.Random; | ||
|
||
import static org.junit.Assert.assertEquals; | ||
import static org.junit.Assert.assertFalse; | ||
import static org.mockito.Mockito.mock; | ||
|
||
@RunWith(RobolectricTestRunner.class) | ||
@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "android.*"}) | ||
public class ImageStoreManagerTest { | ||
|
||
@Test | ||
public void itDoesNotAddLineBreaks_whenBasicStringProvided() throws IOException { | ||
byte[] exampleString = "test".getBytes(); | ||
assertEquals("dGVzdA==", invokeConversion(new ByteArrayInputStream(exampleString))); | ||
} | ||
|
||
@Test | ||
public void itDoesNotAddLineBreaks_whenEmptyStringProvided() throws IOException { | ||
byte[] exampleString = "".getBytes(); | ||
assertEquals("", invokeConversion(new ByteArrayInputStream(exampleString))); | ||
} | ||
|
||
@Test | ||
public void itDoesNotAddLineBreaks_whenStringWithSpecialCharsProvided() throws IOException { | ||
byte[] exampleString = "sdfsdf\nasdfsdfsdfsd\r\nasdas".getBytes(); | ||
ByteArrayInputStream inputStream = new ByteArrayInputStream(exampleString); | ||
assertFalse(invokeConversion(inputStream).contains("\n")); | ||
} | ||
|
||
/** | ||
* This test tries to test the conversion when going beyond the current buffer size (8192 bytes) | ||
*/ | ||
@Test | ||
public void itDoesNotAddLineBreaks_whenStringBiggerThanBuffer() throws IOException { | ||
ByteArrayInputStream inputStream = new ByteArrayInputStream(generateRandomByteString(10000)); | ||
assertFalse(invokeConversion(inputStream).contains("\n")); | ||
} | ||
|
||
/** | ||
* Just to test if using the ByteArrayInputStream isn't missing something | ||
*/ | ||
@Test | ||
public void itDoesNotAddLineBreaks_whenBase64InputStream() throws IOException { | ||
byte[] exampleString = "dGVzdA==".getBytes(); | ||
Base64InputStream inputStream = | ||
new Base64InputStream(new ByteArrayInputStream(exampleString), Base64.NO_WRAP); | ||
assertEquals("dGVzdA==", invokeConversion(inputStream)); | ||
} | ||
|
||
private String invokeConversion(InputStream inputStream) throws IOException { | ||
return new ImageStoreManager(mock(ReactApplicationContext.class)) | ||
.convertInputStreamToBase64OutputStream(inputStream); | ||
} | ||
|
||
private byte[] generateRandomByteString(final int length) { | ||
Random r = new Random(); | ||
StringBuilder sb = new StringBuilder(); | ||
for (int i = 0; i < length; i++) { | ||
char c = (char) (r.nextInt((int) (Character.MAX_VALUE))); | ||
sb.append(c); | ||
} | ||
return sb.toString().getBytes(); | ||
} | ||
} |