Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace streams with Lists in MtpStorageManager"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-25 06:16:27 +00:00
committed by Android (Google) Code Review
parent 12ba6bcc73 9a018747be
commit bd2a8811f3
3 changed files with 163 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
media/java/android/mtp/MtpDatabase.java
View File

@@ -52,11 +52,10 @@ import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.IntStream;
import java.util.stream.Stream;
/**
* MtpDatabase provides an interface for MTP operations that MtpServer can use. To do this, it uses
@@ -453,21 +452,25 @@ public class MtpDatabase implements AutoCloseable {
}
private int[] getObjectList(int storageID, int format, int parent) {
Stream<MtpStorageManager.MtpObject> objectStream = mManager.getObjects(parent,
List<MtpStorageManager.MtpObject> objs = mManager.getObjects(parent,
format, storageID);
if (objectStream == null) {
if (objs == null) {
return null;
}
return objectStream.mapToInt(MtpStorageManager.MtpObject::getId).toArray();
int[] ret = new int[objs.size()];
for (int i = 0; i < objs.size(); i++) {
ret[i] = objs.get(i).getId();
}
return ret;
}
private int getNumObjects(int storageID, int format, int parent) {
Stream<MtpStorageManager.MtpObject> objectStream = mManager.getObjects(parent,
List<MtpStorageManager.MtpObject> objs = mManager.getObjects(parent,
format, storageID);
if (objectStream == null) {
if (objs == null) {
return -1;
}
return (int) objectStream.count();
return objs.size();
}
private MtpPropertyList getObjectPropertyList(int handle, int format, int property,
@@ -489,11 +492,12 @@ public class MtpDatabase implements AutoCloseable {
// depth 0: single object, depth 1: immediate children
return new MtpPropertyList(MtpConstants.RESPONSE_SPECIFICATION_BY_DEPTH_UNSUPPORTED);
}
Stream<MtpStorageManager.MtpObject> objectStream = Stream.of();
List<MtpStorageManager.MtpObject> objs = null;
MtpStorageManager.MtpObject thisObj = null;
if (handle == 0xFFFFFFFF) {
// All objects are requested
objectStream = mManager.getObjects(0, format, 0xFFFFFFFF);
if (objectStream == null) {
objs = mManager.getObjects(0, format, 0xFFFFFFFF);
if (objs == null) {
return new MtpPropertyList(MtpConstants.RESPONSE_INVALID_OBJECT_HANDLE);
}
} else if (handle != 0) {
@@ -503,7 +507,7 @@ public class MtpDatabase implements AutoCloseable {
return new MtpPropertyList(MtpConstants.RESPONSE_INVALID_OBJECT_HANDLE);
}
if (obj.getFormat() == format || format == 0) {
objectStream = Stream.of(obj);
thisObj = obj;
}
}
if (handle == 0 || depth == 1) {
@@ -511,19 +515,22 @@ public class MtpDatabase implements AutoCloseable {
handle = 0xFFFFFFFF;
}
// Get the direct children of root or this object.
Stream<MtpStorageManager.MtpObject> childStream = mManager.getObjects(handle, format,
objs = mManager.getObjects(handle, format,
0xFFFFFFFF);
if (childStream == null) {
if (objs == null) {
return new MtpPropertyList(MtpConstants.RESPONSE_INVALID_OBJECT_HANDLE);
}
objectStream = Stream.concat(objectStream, childStream);
}
if (objs == null) {
objs = new ArrayList<>();
}
if (thisObj != null) {
objs.add(thisObj);
}
MtpPropertyList ret = new MtpPropertyList(MtpConstants.RESPONSE_OK);
MtpPropertyGroup propertyGroup;
Iterator<MtpStorageManager.MtpObject> iter = objectStream.iterator();
while (iter.hasNext()) {
MtpStorageManager.MtpObject obj = iter.next();
for (MtpStorageManager.MtpObject obj : objs) {
if (property == 0xffffffff) {
// Get all properties supported by this object
propertyGroup = mPropertyGroupsByFormat.get(obj.getFormat());

60
media/java/android/mtp/MtpStorageManager.java
View File

@@ -31,10 +31,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Objects;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;
/**
* MtpStorageManager provides functionality for listing, tracking, and notifying MtpServer of
@@ -358,13 +356,13 @@ public class MtpStorageManager {
* Clean up resources used by the storage manager.
*/
public synchronized void close() {
Stream<MtpObject> objs = Stream.concat(mRoots.values().stream(),
mObjects.values().stream());
Iterator<MtpObject> iter = objs.iterator();
while (iter.hasNext()) {
// Close all FileObservers.
MtpObject obj = iter.next();
for (MtpObject obj : mObjects.values()) {
if (obj.getObserver() != null) {
obj.getObserver().stopWatching();
obj.setObserver(null);
}
}
for (MtpObject obj : mRoots.values()) {
if (obj.getObserver() != null) {
obj.getObserver().stopWatching();
obj.setObserver(null);
@@ -495,49 +493,48 @@ public class MtpStorageManager {
* @param parent object id of the parent. 0 for all objects, 0xFFFFFFFF for all object in root
* @param format format of returned objects. 0 for any format
* @param storageId storage id to look in. 0xFFFFFFFF for all storages
* @return A stream of matched objects, or null if error
* @return A list of matched objects, or null if error
*/
public synchronized Stream<MtpObject> getObjects(int parent, int format, int storageId) {
public synchronized List<MtpObject> getObjects(int parent, int format, int storageId) {
boolean recursive = parent == 0;
ArrayList<MtpObject> objs = new ArrayList<>();
boolean ret = true;
if (parent == 0xFFFFFFFF)
parent = 0;
if (storageId == 0xFFFFFFFF) {
// query all stores
if (parent == 0) {
// Get the objects of this format and parent in each store.
ArrayList<Stream<MtpObject>> streamList = new ArrayList<>();
for (MtpObject root : mRoots.values()) {
streamList.add(getObjects(root, format, recursive));
ret &= getObjects(objs, root, format, recursive);
}
return Stream.of(streamList).flatMap(Collection::stream).reduce(Stream::concat)
.orElseGet(Stream::empty);
return ret ? objs : null;
}
}
MtpObject obj = parent == 0 ? getStorageRoot(storageId) : getObject(parent);
if (obj == null)
return null;
return getObjects(obj, format, recursive);
ret = getObjects(objs, obj, format, recursive);
return ret ? objs : null;
}
private synchronized Stream<MtpObject> getObjects(MtpObject parent, int format, boolean rec) {
private synchronized boolean getObjects(List<MtpObject> toAdd, MtpObject parent, int format, boolean rec) {
Collection<MtpObject> children = getChildren(parent);
if (children == null)
return null;
Stream<MtpObject> ret = Stream.of(children).flatMap(Collection::stream);
return false;
if (format != 0) {
ret = ret.filter(o -> o.getFormat() == format);
for (MtpObject o : children) {
if (format == 0 || o.getFormat() == format) {
toAdd.add(o);
}
}
boolean ret = true;
if (rec) {
// Get all objects recursively.
ArrayList<Stream<MtpObject>> streamList = new ArrayList<>();
streamList.add(ret);
for (MtpObject o : children) {
if (o.isDir())
streamList.add(getObjects(o, format, true));
ret &= getObjects(toAdd, o, format, true);
}
ret = Stream.of(streamList).filter(Objects::nonNull).flatMap(Collection::stream)
.reduce(Stream::concat).orElseGet(Stream::empty);
}
return ret;
}
@@ -767,12 +764,11 @@ public class MtpStorageManager {
* @return true iff cache is consistent
*/
public synchronized boolean checkConsistency() {
Stream<MtpObject> objs = Stream.concat(mRoots.values().stream(),
mObjects.values().stream());
Iterator<MtpObject> iter = objs.iterator();
List<MtpObject> objs = new ArrayList<>();
objs.addAll(mRoots.values());
objs.addAll(mObjects.values());
boolean ret = true;
while (iter.hasNext()) {
MtpObject obj = iter.next();
for (MtpObject obj : objs) {
if (!obj.exists()) {
Log.w(TAG, "Object doesn't exist " + obj.getPath() + " " + obj.getId());
ret = false;

220
media/tests/MtpTests/src/android/mtp/MtpStorageManagerTest.java
View File

@@ -37,6 +37,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.function.Predicate;
import java.util.stream.Stream;
@@ -149,9 +150,9 @@ public class MtpStorageManagerTest {
public void testMtpObjectGetNameNonRoot() {
logMethodName();
File newFile = createNewFile(mainStorageDir);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.findFirst().get().getName(), newFile.getName());
Assert.assertEquals(stream.get(0).getName(), newFile.getName());
}
@Test
@@ -167,9 +168,9 @@ public class MtpStorageManagerTest {
public void testMtpObjectGetIdNonRoot() {
logMethodName();
File newFile = createNewFile(mainStorageDir);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.findFirst().get().getId(), 1);
Assert.assertEquals(stream.get(0).getId(), 1);
}
@Test
@@ -185,9 +186,9 @@ public class MtpStorageManagerTest {
public void testMtpObjectIsDirFalse() {
logMethodName();
File newFile = createNewFile(mainStorageDir, "TEST123.mp3");
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertFalse(stream.findFirst().get().isDir());
Assert.assertFalse(stream.get(0).isDir());
}
@Test
@@ -195,9 +196,9 @@ public class MtpStorageManagerTest {
public void testMtpObjectGetFormatDir() {
logMethodName();
File newFile = createNewDir(mainStorageDir);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.findFirst().get().getFormat(), MtpConstants.FORMAT_ASSOCIATION);
Assert.assertEquals(stream.get(0).getFormat(), MtpConstants.FORMAT_ASSOCIATION);
}
@Test
@@ -205,9 +206,9 @@ public class MtpStorageManagerTest {
public void testMtpObjectGetFormatNonDir() {
logMethodName();
File newFile = createNewFile(mainStorageDir, "TEST123.mp3");
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.findFirst().get().getFormat(), MtpConstants.FORMAT_MP3);
Assert.assertEquals(stream.get(0).getFormat(), MtpConstants.FORMAT_MP3);
}
@Test
@@ -215,9 +216,9 @@ public class MtpStorageManagerTest {
public void testMtpObjectGetStorageId() {
logMethodName();
File newFile = createNewFile(mainStorageDir);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.findFirst().get().getStorageId(), mainMtpStorage.getStorageId());
Assert.assertEquals(stream.get(0).getStorageId(), mainMtpStorage.getStorageId());
}
@Test
@@ -225,10 +226,9 @@ public class MtpStorageManagerTest {
public void testMtpObjectGetLastModified() {
logMethodName();
File newFile = createNewFile(mainStorageDir);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.findFirst().get().getModifiedTime(),
newFile.lastModified() / 1000);
Assert.assertEquals(stream.get(0).getModifiedTime(), newFile.lastModified() / 1000);
}
@Test
@@ -236,9 +236,9 @@ public class MtpStorageManagerTest {
public void testMtpObjectGetParent() {
logMethodName();
File newFile = createNewFile(mainStorageDir);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.findFirst().get().getParent(),
Assert.assertEquals(stream.get(0).getParent(),
manager.getStorageRoot(mainMtpStorage.getStorageId()));
}
@@ -247,9 +247,9 @@ public class MtpStorageManagerTest {
public void testMtpObjectGetRoot() {
logMethodName();
File newFile = createNewFile(mainStorageDir);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.findFirst().get().getRoot(),
Assert.assertEquals(stream.get(0).getRoot(),
manager.getStorageRoot(mainMtpStorage.getStorageId()));
}
@@ -258,9 +258,9 @@ public class MtpStorageManagerTest {
public void testMtpObjectGetPath() {
logMethodName();
File newFile = createNewFile(mainStorageDir);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.findFirst().get().getPath().toString(), newFile.getPath());
Assert.assertEquals(stream.get(0).getPath().toString(), newFile.getPath());
}
@Test
@@ -273,9 +273,9 @@ public class MtpStorageManagerTest {
} catch (IOException e) {
Assert.fail();
}
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.findFirst().get().getSize(), 8);
Assert.assertEquals(stream.get(0).getSize(), 8);
}
@Test
@@ -283,9 +283,9 @@ public class MtpStorageManagerTest {
public void testMtpObjectGetSizeDir() {
logMethodName();
File newDir = createNewDir(mainStorageDir);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.findFirst().get().getSize(), 0);
Assert.assertEquals(stream.get(0).getSize(), 0);
}
/** MtpStorageManager cache access tests. **/
@@ -304,9 +304,9 @@ public class MtpStorageManagerTest {
public void testRemoveMtpStorage() {
logMethodName();
File newFile = createNewFile(secondaryStorageDir);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
secondaryMtpStorage.getStorageId());
Assert.assertEquals(stream.count(), 1);
Assert.assertEquals(stream.size(), 1);
manager.removeMtpStorage(secondaryMtpStorage);
Assert.assertNull(manager.getStorageRoot(secondaryMtpStorage.getStorageId()));
@@ -377,9 +377,9 @@ public class MtpStorageManagerTest {
MtpStorageManager.MtpObject parent = manager.getByPath(newDir.getPath());
Assert.assertNotNull(parent);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(parent.getId(), 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(parent.getId(), 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.count(), 2);
Assert.assertEquals(stream.size(), 2);
Assert.assertTrue(manager.checkConsistency());
}
@@ -393,9 +393,9 @@ public class MtpStorageManagerTest {
MtpStorageManager.MtpObject parent = manager.getByPath(newDir.getPath());
Assert.assertNotNull(parent);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(parent.getId(),
List<MtpStorageManager.MtpObject> stream = manager.getObjects(parent.getId(),
MtpConstants.FORMAT_MP3, mainMtpStorage.getStorageId());
Assert.assertEquals(stream.findFirst().get().getPath().toString(), newMP3File.toString());
Assert.assertEquals(stream.get(0).getPath().toString(), newMP3File.toString());
Assert.assertTrue(manager.checkConsistency());
}
@@ -407,9 +407,9 @@ public class MtpStorageManagerTest {
File newFile = createNewFile(mainStorageDir);
File newMP3File = createNewFile(newDir, "lalala.mp3");
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.count(), 2);
Assert.assertEquals(stream.size(), 2);
Assert.assertTrue(manager.checkConsistency());
}
@@ -421,9 +421,9 @@ public class MtpStorageManagerTest {
File newFile = createNewFile(mainStorageDir);
File newMP3File = createNewFile(newDir, "lalala.mp3");
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.count(), 3);
Assert.assertEquals(stream.size(), 3);
Assert.assertTrue(manager.checkConsistency());
}
@@ -438,8 +438,8 @@ public class MtpStorageManagerTest {
createNewFile(secondaryStorageDir);
createNewFile(newDir2, "lalala.mp3");
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0, 0, 0xFFFFFFFF);
Assert.assertEquals(stream.count(), 6);
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0, 0, 0xFFFFFFFF);
Assert.assertEquals(stream.size(), 6);
Assert.assertTrue(manager.checkConsistency());
}
@@ -454,8 +454,8 @@ public class MtpStorageManagerTest {
createNewFile(secondaryStorageDir);
createNewFile(newDir2, "lalala.mp3");
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0, 0xFFFFFFFF);
Assert.assertEquals(stream.count(), 4);
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0, 0xFFFFFFFF);
Assert.assertEquals(stream.size(), 4);
Assert.assertTrue(manager.checkConsistency());
}
@@ -465,9 +465,9 @@ public class MtpStorageManagerTest {
@SmallTest
public void testObjectAdded() {
logMethodName();
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.count(), 0);
Assert.assertEquals(stream.size(), 0);
File newFile = createNewFile(mainStorageDir);
manager.flushEvents();
@@ -481,9 +481,9 @@ public class MtpStorageManagerTest {
@SmallTest
public void testObjectAddedDir() {
logMethodName();
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.count(), 0);
Assert.assertEquals(stream.size(), 0);
File newDir = createNewDir(mainStorageDir);
manager.flushEvents();
@@ -498,9 +498,9 @@ public class MtpStorageManagerTest {
@SmallTest
public void testObjectAddedRecursiveDir() {
logMethodName();
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.count(), 0);
Assert.assertEquals(stream.size(), 0);
File newDir = createNewDir(createNewDir(createNewDir(mainStorageDir)));
manager.flushEvents();
@@ -516,9 +516,9 @@ public class MtpStorageManagerTest {
public void testObjectRemoved() {
logMethodName();
File newFile = createNewFile(mainStorageDir);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.count(), 1);
Assert.assertEquals(stream.size(), 1);
Assert.assertTrue(newFile.delete());
manager.flushEvents();
@@ -532,9 +532,9 @@ public class MtpStorageManagerTest {
public void testObjectMoved() {
logMethodName();
File newFile = createNewFile(mainStorageDir);
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
Assert.assertEquals(stream.count(), 1);
Assert.assertEquals(stream.size(), 1);
File toFile = new File(mainStorageDir, "to" + newFile.getName());
Assert.assertTrue(newFile.renameTo(toFile));
@@ -555,7 +555,7 @@ public class MtpStorageManagerTest {
@SmallTest
public void testSendObjectSuccess() {
logMethodName();
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
int id = manager.beginSendObject(manager.getStorageRoot(mainMtpStorage.getStorageId()),
"newFile", MtpConstants.FORMAT_UNDEFINED);
@@ -574,7 +574,7 @@ public class MtpStorageManagerTest {
@SmallTest
public void testSendObjectSuccessDir() {
logMethodName();
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
int id = manager.beginSendObject(manager.getStorageRoot(mainMtpStorage.getStorageId()),
"newDir", MtpConstants.FORMAT_ASSOCIATION);
@@ -601,7 +601,7 @@ public class MtpStorageManagerTest {
@SmallTest
public void testSendObjectSuccessDelayed() {
logMethodName();
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
int id = manager.beginSendObject(manager.getStorageRoot(mainMtpStorage.getStorageId()),
"newFile", MtpConstants.FORMAT_UNDEFINED);
@@ -620,7 +620,7 @@ public class MtpStorageManagerTest {
@SmallTest
public void testSendObjectSuccessDirDelayed() {
logMethodName();
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
int id = manager.beginSendObject(manager.getStorageRoot(mainMtpStorage.getStorageId()),
"newDir", MtpConstants.FORMAT_ASSOCIATION);
@@ -647,7 +647,7 @@ public class MtpStorageManagerTest {
@SmallTest
public void testSendObjectSuccessDeleted() {
logMethodName();
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
int id = manager.beginSendObject(manager.getStorageRoot(mainMtpStorage.getStorageId()),
"newFile", MtpConstants.FORMAT_UNDEFINED);
@@ -667,7 +667,7 @@ public class MtpStorageManagerTest {
@SmallTest
public void testSendObjectFailed() {
logMethodName();
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
int id = manager.beginSendObject(manager.getStorageRoot(mainMtpStorage.getStorageId()),
"newFile", MtpConstants.FORMAT_UNDEFINED);
@@ -682,7 +682,7 @@ public class MtpStorageManagerTest {
@SmallTest
public void testSendObjectFailedDeleted() {
logMethodName();
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
int id = manager.beginSendObject(manager.getStorageRoot(mainMtpStorage.getStorageId()),
"newFile", MtpConstants.FORMAT_UNDEFINED);
@@ -702,7 +702,7 @@ public class MtpStorageManagerTest {
@SmallTest
public void testSendObjectFailedAdded() {
logMethodName();
Stream<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
List<MtpStorageManager.MtpObject> stream = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId());
int id = manager.beginSendObject(manager.getStorageRoot(mainMtpStorage.getStorageId()),
"newFile", MtpConstants.FORMAT_UNDEFINED);
@@ -731,7 +731,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginRemoveObject(obj));
Assert.assertTrue(newFile.delete());
@@ -748,7 +748,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginRemoveObject(obj));
Assert.assertTrue(manager.endRemoveObject(obj, true));
@@ -766,7 +766,7 @@ public class MtpStorageManagerTest {
File newDir = createNewDir(mainStorageDir);
createNewFile(createNewDir(newDir));
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
manager.getObjects(obj.getId(), 0, mainMtpStorage.getStorageId());
Assert.assertTrue(manager.beginRemoveObject(obj));
@@ -776,7 +776,7 @@ public class MtpStorageManagerTest {
Assert.assertTrue(manager.endRemoveObject(obj, true));
Assert.assertEquals(objectsAdded.size(), 1);
Assert.assertEquals(objectsRemoved.size(), 1);
Assert.assertEquals(manager.getObjects(0, 0, mainMtpStorage.getStorageId()).count(), 0);
Assert.assertEquals(manager.getObjects(0, 0, mainMtpStorage.getStorageId()).size(), 0);
Assert.assertNull(manager.getObject(obj.getId()));
Assert.assertTrue(manager.checkConsistency());
}
@@ -788,14 +788,14 @@ public class MtpStorageManagerTest {
File newDir = createNewDir(mainStorageDir);
createNewFile(createNewDir(newDir));
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginRemoveObject(obj));
Assert.assertTrue(manager.endRemoveObject(obj, true));
Assert.assertTrue(FileUtils.deleteContentsAndDir(newDir));
manager.flushEvents();
Assert.assertEquals(objectsRemoved.size(), 0);
Assert.assertEquals(manager.getObjects(0, 0, mainMtpStorage.getStorageId()).count(), 0);
Assert.assertEquals(manager.getObjects(0, 0, mainMtpStorage.getStorageId()).size(), 0);
Assert.assertNull(manager.getObject(obj.getId()));
Assert.assertTrue(manager.checkConsistency());
}
@@ -806,7 +806,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
int id = obj.getId();
Assert.assertTrue(manager.beginRemoveObject(obj));
@@ -827,7 +827,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginRemoveObject(obj));
Assert.assertTrue(manager.endRemoveObject(obj, false));
@@ -841,7 +841,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
manager.getObjects(obj.getId(), 0, mainMtpStorage.getStorageId());
Assert.assertTrue(manager.beginRemoveObject(obj));
@@ -859,7 +859,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginRemoveObject(obj));
Assert.assertTrue(newFile.delete());
@@ -879,9 +879,9 @@ public class MtpStorageManagerTest {
File newDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject dirObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
.filter(MtpStorageManager.MtpObject::isDir).findFirst().get();
.stream().filter(MtpStorageManager.MtpObject::isDir).findFirst().get();
MtpStorageManager.MtpObject fileObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> !o.isDir()).findFirst().get();
int id = manager.beginCopyObject(fileObj, dirObj);
@@ -905,10 +905,10 @@ public class MtpStorageManagerTest {
File deletedFile = createNewFile(newDirFrom);
File newDirTo = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject toObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> o.getName().equals(newDirTo.getName())).findFirst().get();
MtpStorageManager.MtpObject fromObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> o.getName().equals(newDirFrom.getName())).findFirst().get();
manager.getObjects(fromObj.getId(), 0, mainMtpStorage.getStorageId());
@@ -939,7 +939,7 @@ public class MtpStorageManagerTest {
Assert.assertEquals(objectsAdded.size(), 2);
// Number of files/dirs created, minus the one that was deleted.
Assert.assertEquals(manager.getObjects(0, 0, mainMtpStorage.getStorageId()).count(), 13);
Assert.assertEquals(manager.getObjects(0, 0, mainMtpStorage.getStorageId()).size(), 13);
Assert.assertTrue(manager.checkConsistency());
}
@@ -950,10 +950,10 @@ public class MtpStorageManagerTest {
File newFile = createNewFile(mainStorageDir);
File newDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject dirObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(MtpStorageManager.MtpObject::isDir).findFirst().get();
MtpStorageManager.MtpObject fileObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> !o.isDir()).findFirst().get();
int id = manager.beginCopyObject(fileObj, dirObj);
@@ -972,10 +972,10 @@ public class MtpStorageManagerTest {
File newFile = createNewFile(mainStorageDir);
File newDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject dirObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(MtpStorageManager.MtpObject::isDir).findFirst().get();
MtpStorageManager.MtpObject fileObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> !o.isDir()).findFirst().get();
int id = manager.beginCopyObject(fileObj, dirObj);
@@ -1002,10 +1002,10 @@ public class MtpStorageManagerTest {
File newFile = createNewFile(mainStorageDir);
File newDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject dirObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(MtpStorageManager.MtpObject::isDir).findFirst().get();
MtpStorageManager.MtpObject fileObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> !o.isDir()).findFirst().get();
int id = manager.beginCopyObject(fileObj, dirObj);
@@ -1024,7 +1024,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginRenameObject(obj, "renamed"));
File renamed = new File(mainStorageDir, "renamed");
@@ -1045,7 +1045,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginRenameObject(obj, "renamed"));
File renamed = new File(mainStorageDir, "renamed");
@@ -1072,7 +1072,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
manager.getObjects(obj.getId(), 0, mainMtpStorage.getStorageId());
Assert.assertTrue(manager.beginRenameObject(obj, "renamed"));
@@ -1100,7 +1100,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginRenameObject(obj, "renamed"));
Assert.assertTrue(manager.endRenameObject(obj, newFile.getName(), true));
@@ -1121,7 +1121,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
manager.getObjects(obj.getId(), 0, mainMtpStorage.getStorageId());
Assert.assertTrue(manager.beginRenameObject(obj, "renamed"));
@@ -1149,7 +1149,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginRenameObject(obj, "renamed"));
Assert.assertTrue(manager.endRenameObject(obj, newFile.getName(), false));
@@ -1166,7 +1166,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginRenameObject(obj, "renamed"));
Assert.assertTrue(newFile.delete());
@@ -1185,7 +1185,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject obj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginRenameObject(obj, "renamed"));
createNewFile(mainStorageDir, "renamed");
@@ -1205,10 +1205,10 @@ public class MtpStorageManagerTest {
File newFile = createNewFile(mainStorageDir);
File dir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject dirObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(MtpStorageManager.MtpObject::isDir).findFirst().get();
MtpStorageManager.MtpObject fileObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> !o.isDir()).findFirst().get();
Assert.assertTrue(manager.beginMoveObject(fileObj, dirObj));
@@ -1233,10 +1233,10 @@ public class MtpStorageManagerTest {
File newDir = createNewDir(mainStorageDir);
File movedDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject dirObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> o.getName().equals(newDir.getName())).findFirst().get();
MtpStorageManager.MtpObject movedObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> o.getName().equals(movedDir.getName())).findFirst().get();
Assert.assertTrue(manager.beginMoveObject(movedObj, dirObj));
@@ -1267,10 +1267,10 @@ public class MtpStorageManagerTest {
File newDir = createNewDir(mainStorageDir);
File movedDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject dirObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> o.getName().equals(newDir.getName())).findFirst().get();
MtpStorageManager.MtpObject movedObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> o.getName().equals(movedDir.getName())).findFirst().get();
manager.getObjects(movedObj.getId(), 0, mainMtpStorage.getStorageId());
Assert.assertTrue(manager.beginMoveObject(movedObj, dirObj));
@@ -1302,10 +1302,10 @@ public class MtpStorageManagerTest {
File newFile = createNewFile(mainStorageDir);
File dir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject dirObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(MtpStorageManager.MtpObject::isDir).findFirst().get();
MtpStorageManager.MtpObject fileObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> !o.isDir()).findFirst().get();
Assert.assertTrue(manager.beginMoveObject(fileObj, dirObj));
@@ -1331,10 +1331,10 @@ public class MtpStorageManagerTest {
File newDir = createNewDir(mainStorageDir);
File movedDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject dirObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> o.getName().equals(newDir.getName())).findFirst().get();
MtpStorageManager.MtpObject movedObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> o.getName().equals(movedDir.getName())).findFirst().get();
manager.getObjects(movedObj.getId(), 0, mainMtpStorage.getStorageId());
Assert.assertTrue(manager.beginMoveObject(movedObj, dirObj));
@@ -1367,10 +1367,10 @@ public class MtpStorageManagerTest {
File newFile = createNewFile(mainStorageDir);
File dir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject dirObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(MtpStorageManager.MtpObject::isDir).findFirst().get();
MtpStorageManager.MtpObject fileObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> !o.isDir()).findFirst().get();
Assert.assertTrue(manager.beginMoveObject(fileObj, dirObj));
@@ -1391,10 +1391,10 @@ public class MtpStorageManagerTest {
File newFile = createNewFile(mainStorageDir);
File dir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject dirObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(MtpStorageManager.MtpObject::isDir).findFirst().get();
MtpStorageManager.MtpObject fileObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> !o.isDir()).findFirst().get();
Assert.assertTrue(manager.beginMoveObject(fileObj, dirObj));
@@ -1417,10 +1417,10 @@ public class MtpStorageManagerTest {
File newFile = createNewFile(mainStorageDir);
File dir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject dirObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(MtpStorageManager.MtpObject::isDir).findFirst().get();
MtpStorageManager.MtpObject fileObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId())
mainMtpStorage.getStorageId()).stream()
.filter(o -> !o.isDir()).findFirst().get();
Assert.assertTrue(manager.beginMoveObject(fileObj, dirObj));
@@ -1442,7 +1442,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject fileObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginMoveObject(fileObj,
manager.getStorageRoot(secondaryMtpStorage.getStorageId())));
@@ -1468,7 +1468,7 @@ public class MtpStorageManagerTest {
logMethodName();
File movedDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject movedObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginMoveObject(movedObj,
manager.getStorageRoot(secondaryMtpStorage.getStorageId())));
@@ -1500,7 +1500,7 @@ public class MtpStorageManagerTest {
logMethodName();
File movedDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject movedObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
manager.getObjects(movedObj.getId(), 0, mainMtpStorage.getStorageId());
Assert.assertTrue(manager.beginMoveObject(movedObj,
manager.getStorageRoot(secondaryMtpStorage.getStorageId())));
@@ -1533,7 +1533,7 @@ public class MtpStorageManagerTest {
logMethodName();
File movedFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject movedObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginMoveObject(movedObj,
manager.getStorageRoot(secondaryMtpStorage.getStorageId())));
@@ -1560,7 +1560,7 @@ public class MtpStorageManagerTest {
logMethodName();
File movedDir = createNewDir(mainStorageDir);
MtpStorageManager.MtpObject movedObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
manager.getObjects(movedObj.getId(), 0, mainMtpStorage.getStorageId());
Assert.assertTrue(manager.beginMoveObject(movedObj,
manager.getStorageRoot(secondaryMtpStorage.getStorageId())));
@@ -1594,7 +1594,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject fileObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginMoveObject(fileObj,
manager.getStorageRoot(secondaryMtpStorage.getStorageId())));
@@ -1615,7 +1615,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject fileObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginMoveObject(fileObj,
manager.getStorageRoot(secondaryMtpStorage.getStorageId())));
@@ -1638,7 +1638,7 @@ public class MtpStorageManagerTest {
logMethodName();
File newFile = createNewFile(mainStorageDir);
MtpStorageManager.MtpObject fileObj = manager.getObjects(0xFFFFFFFF, 0,
mainMtpStorage.getStorageId()).findFirst().get();
mainMtpStorage.getStorageId()).get(0);
Assert.assertTrue(manager.beginMoveObject(fileObj,
manager.getStorageRoot(secondaryMtpStorage.getStorageId())));