Merge "ADT: fix unittests."

1 files changed, 6 insertions, 5 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java
index 2c53bea..04dc8ec 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java
@@ -22,6 +22,7 @@ import com.android.ide.eclipse.adt.internal.resources.manager.ProjectResources;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFile;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolder;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager;
+import com.android.ide.eclipse.adt.internal.resources.manager.ResourceRepository;
 import com.android.ide.eclipse.adt.internal.resources.manager.SingleResourceFile;
 import com.android.ide.eclipse.adt.io.IFileWrapper;
 import com.android.ide.eclipse.adt.io.IFolderWrapper;
@@ -253,11 +254,11 @@ public class ConfigMatchTest extends TestCase {
     /**
      * Adds a folder to the given {@link ProjectResources} with the given
      * {@link FolderConfiguration}. The folder is filled with files from the provided list.
-     * @param resources the {@link ProjectResources} in which to add the folder.
+     * @param resources the {@link ResourceRepository} in which to add the folder.
      * @param config the {@link FolderConfiguration} for the created folder.
      * @param memberList the list of files for the folder.
      */
-    private void addFolder(ProjectResources resources, FolderConfiguration config,
+    private void addFolder(ResourceRepository resources, FolderConfiguration config,
             IFile[] memberList) throws Exception {
 
         // figure out the folder name based on the configuration
@@ -275,15 +276,15 @@ public class ConfigMatchTest extends TestCase {
         }
     }
 
-    /** Calls ProjectResource.add method via reflection to circumvent access
+    /** Calls ResourceRepository.add() method via reflection to circumvent access
      * restrictions that are enforced when running in the plug-in environment
      * ie cannot access package or protected members in a different plug-in, even
      * if they are in the same declared package as the accessor
      */
-    private ResourceFolder _addProjectResourceFolder(ProjectResources resources,
+    private ResourceFolder _addProjectResourceFolder(ResourceRepository resources,
             FolderConfiguration config, IFolder folder) throws Exception {
 
-        Method addMethod = ProjectResources.class.getDeclaredMethod("add",
+        Method addMethod = ResourceRepository.class.getDeclaredMethod("add",
                 ResourceFolderType.class, FolderConfiguration.class,
                 IAbstractFolder.class);
         addMethod.setAccessible(true);