Merge change If5b2f9df into eclair

* changes:
  Fix ADT test data references.

2 files changed, 278 insertions, 4 deletions

diff --git a/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java b/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java
index 7f1d967..de50b6e 100755
--- a/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java
+++ b/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java
@@ -16,8 +16,6 @@
 

 package com.android.sdklib.repository;

 

-import com.android.ide.eclipse.tests.AdtTestData;

-

 import org.xml.sax.ErrorHandler;

 import org.xml.sax.SAXException;

 import org.xml.sax.SAXParseException;

@@ -125,8 +123,9 @@ public class TestSdkRepository extends TestCase {
 

     /** Validate a valid sample using an InputStream */

     public void testValidateLocalRepositoryFile() throws Exception {

-        InputStream xmlStream = AdtTestData.getInstance().getTestFileStream(

-                "repository_sample.xml");

+        InputStream xmlStream =

+            this.getClass().getClassLoader().getResourceAsStream(

+                             "com/android/sdklib/testdata/repository_sample.xml");

         Source source = new StreamSource(xmlStream);

 

         CaptureErrorHandler handler = new CaptureErrorHandler();

diff --git a/sdkmanager/libs/sdklib/tests/com/android/sdklib/testdata/repository_sample.xml b/sdkmanager/libs/sdklib/tests/com/android/sdklib/testdata/repository_sample.xml
new file mode 100755
index 0000000..c90e18d
--- /dev/null
+++ b/sdkmanager/libs/sdklib/tests/com/android/sdklib/testdata/repository_sample.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0"?>

+<!--

+ * Copyright (C) 2009 The Android Open Source Project

+ *

+ * Licensed under the Apache License, version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+-->

+<sdk:sdk-repository

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:sdk="http://schemas.android.com/sdk/android/repository/1">

+

+    <!-- Define a couple of licenses. These will be referenced by uses-license later. -->

+

+    <sdk:license type="text" id="license1">

+        This is the license

+        for this platform.

+    </sdk:license>

+

+    <sdk:license id="license2">

+        Licenses are only of type 'text' right now, so this is implied.

+    </sdk:license>

+

+    <!-- Inner elements must be either platform, add-on, doc or tool.

+         There can be 0 or more of each, in any order. -->

+

+    <sdk:platform>

+        <sdk:version>1.0</sdk:version>

+        <sdk:api-level>1</sdk:api-level>

+        <sdk:revision>3</sdk:revision>

+        <sdk:uses-license ref="license1" />

+        <sdk:description>Some optional description</sdk:description>

+        <sdk:desc-url>http://www.example.com/platform1.html</sdk:desc-url>

+        <sdk:release-note>This is an optional release note

+            for this package. It's a free multi-line text.

+        </sdk:release-note>

+        <sdk:release-url>http://some/url/for/the/release/note.html</sdk:release-url>

+        <sdk:min-tools-rev>2</sdk:min-tools-rev>

+        <!-- The archives node is mandatory and it cannot be empty. -->

+        <sdk:archives>

+            <sdk:archive os="any">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>http://www.example.com/files/plat1.zip</sdk:url>

+            </sdk:archive>

+        </sdk:archives>

+    </sdk:platform>

+

+    <sdk:doc>

+        <sdk:api-level>1</sdk:api-level>

+        <sdk:revision>1</sdk:revision>

+        <!-- the license element is not mandatory. -->

+        <sdk:description>Some optional description</sdk:description>

+        <sdk:desc-url>http://www.example.com/docs.html</sdk:desc-url>

+        <sdk:archives>

+            <sdk:archive os="any">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>http://www.example.com/docs/docs1.zip</sdk:url>

+            </sdk:archive>

+        </sdk:archives>

+    </sdk:doc>

+

+    <sdk:add-on>

+        <sdk:name>My First add-on</sdk:name>

+        <sdk:api-level>1</sdk:api-level>

+        <sdk:vendor>John Doe</sdk:vendor>

+        <sdk:revision>1</sdk:revision>

+        <sdk:uses-license ref="license2" />

+        <sdk:description>Some optional description</sdk:description>

+        <sdk:desc-url>http://www.example.com/myfirstaddon</sdk:desc-url>

+        <sdk:archives>

+            <sdk:archive os="any">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>http://www.example.com/add-ons/first.zip</sdk:url>

+            </sdk:archive>

+        </sdk:archives>

+        <!-- The libs node is mandatory, however it can be empty. -->

+        <sdk:libs>

+            <sdk:lib>

+                <sdk:name>android.blah.somelib</sdk:name>

+                <sdk:description>The description for this library.</sdk:description>

+            </sdk:lib>

+            <sdk:lib>

+                <!-- sdk:description is optional, name is not -->

+                <sdk:name>com.android.mymaps</sdk:name>

+            </sdk:lib>

+        </sdk:libs>

+    </sdk:add-on>

+

+    <sdk:platform>

+        <sdk:version>1.1</sdk:version>

+        <sdk:api-level>2</sdk:api-level>

+        <sdk:revision>12</sdk:revision>

+        <sdk:uses-license ref="license1" />

+        <!-- sdk:description and sdk:desc-url are optional -->

+        <sdk:archives>

+            <sdk:archive os="windows">

+                <!--  arch attribute is optional -->

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/platform-2-12-win.zip</sdk:url>

+            </sdk:archive>

+            <sdk:archive os="macosx" arch="any">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/platform-2-12-mac.zip</sdk:url>

+            </sdk:archive>

+            <sdk:archive os="macosx" arch="ppc">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/platform-2-12-mac.zip</sdk:url>

+            </sdk:archive>

+            <sdk:archive os="linux" arch="x86">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/platform-2-12-linux.tar.bz2</sdk:url>

+            </sdk:archive>

+            <sdk:archive os="linux" arch="x86_64">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/platform-2-12-linux.tar.bz2</sdk:url>

+            </sdk:archive>

+        </sdk:archives>

+    </sdk:platform>

+

+    <sdk:add-on>

+        <sdk:name>My Second add-on</sdk:name>

+        <sdk:api-level>2</sdk:api-level>

+        <sdk:vendor>John Deer</sdk:vendor>

+        <sdk:revision>42</sdk:revision>

+        <sdk:archives>

+            <sdk:archive os="windows">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/second-42-win.zip</sdk:url>

+            </sdk:archive>

+            <sdk:archive os="linux">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/second-42-linux.tar.bz2</sdk:url>

+            </sdk:archive>

+        </sdk:archives>

+        <sdk:libs>

+            <sdk:lib>

+                <sdk:name>android.blah.somelib</sdk:name>

+                <sdk:description>The description for this library.</sdk:description>

+            </sdk:lib>

+            <sdk:lib>

+                <sdk:name>com.android.mymaps</sdk:name>

+            </sdk:lib>

+        </sdk:libs>

+        <sdk:uses-license ref="license2" />

+    </sdk:add-on>

+
+   <sdk:platform>
+        <sdk:version>Pastry</sdk:version>
+        <sdk:api-level>5</sdk:api-level>
+        <sdk:codename>Pastry</sdk:codename>
+        <sdk:revision>3</sdk:revision>
+        <sdk:uses-license ref="license1" />
+        <sdk:description>Preview version for Pastry</sdk:description>
+        <sdk:desc-url>http://www.example.com/platform1.html</sdk:desc-url>
+        <!-- The archives node is mandatory and it cannot be empty. -->
+        <sdk:archives>
+            <sdk:archive os="any">
+                <sdk:size>65536</sdk:size>
+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>
+                <sdk:url>http://www.example.com/files/plat1.zip</sdk:url>
+            </sdk:archive>
+        </sdk:archives>
+    </sdk:platform>
+

+    <sdk:tool>

+        <sdk:revision>1</sdk:revision>

+        <sdk:description>Some optional description</sdk:description>

+        <sdk:desc-url>http://www.example.com/tools.html</sdk:desc-url>

+        <sdk:uses-license ref="license1" />

+        <sdk:archives>

+            <sdk:archive os="any">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>http://www.example.com/files/tools1.zip</sdk:url>

+            </sdk:archive>

+        </sdk:archives>

+    </sdk:tool>

+

+    <sdk:doc>

+        <sdk:api-level>2</sdk:api-level>

+        <sdk:revision>42</sdk:revision>

+        <sdk:uses-license ref="license2" />

+        <sdk:archives>

+            <sdk:archive os="windows">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/docs/2.zip</sdk:url>

+            </sdk:archive>

+            <sdk:archive os="linux">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/docs2-linux.tar.bz2</sdk:url>

+            </sdk:archive>

+            <sdk:archive os="macosx">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/docs2-mac.tar.bz2</sdk:url>

+            </sdk:archive>

+        </sdk:archives>

+    </sdk:doc>

+

+    <sdk:tool>

+        <sdk:revision>42</sdk:revision>

+        <sdk:uses-license ref="license1" />

+        <sdk:archives>

+            <sdk:archive os="windows">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/tools/2.zip</sdk:url>

+            </sdk:archive>

+            <sdk:archive os="linux">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/tools2-linux.tar.bz2</sdk:url>

+            </sdk:archive>

+            <sdk:archive os="macosx">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/tools2-mac.tar.bz2</sdk:url>

+            </sdk:archive>

+        </sdk:archives>

+    </sdk:tool>

+

+    <sdk:add-on>

+        <sdk:uses-license ref="license2" />

+        <sdk:name>This add-on has no libraries</sdk:name>

+        <sdk:api-level>4</sdk:api-level>

+        <sdk:vendor>Joe Bar</sdk:vendor>

+        <sdk:revision>3</sdk:revision>

+        <sdk:archives>

+            <sdk:archive os="any" arch="any">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/imnotanarchiveimadoctorjim.zip</sdk:url>

+            </sdk:archive>

+        </sdk:archives>

+        <!-- The libs node is mandatory, however it can be empty. -->

+        <sdk:libs />

+    </sdk:add-on>

+

+    <sdk:extra>

+        <sdk:path>usb_driver</sdk:path>

+        <sdk:uses-license ref="license2" />

+        <sdk:revision>43</sdk:revision>

+        <sdk:archives>

+            <sdk:archive os="any" arch="any">

+                <sdk:size>65536</sdk:size>

+                <sdk:checksum type="sha1">2822ae37115ebf13412bbef91339ee0d9454525e</sdk:checksum>

+                <sdk:url>distrib/extraduff.zip</sdk:url>

+            </sdk:archive>

+        </sdk:archives>

+        <sdk:description>An Extra package for the USB driver, it will install in $SDK/usb_driver</sdk:description>

+        <sdk:desc-url>http://www.example.com/extra.html</sdk:desc-url>

+        <sdk:min-tools-rev>3</sdk:min-tools-rev>

+    </sdk:extra>

+

+</sdk:sdk-repository>