From 7c343cef7e7cd56aafb7b8a602ceb6462a6bbb71 Mon Sep 17 00:00:00 2001
From: Phil Dubach <phillipd@google.com>
Date: Thu, 21 May 2009 16:35:22 -0700
Subject: [PATCH] Add XML Schema for runtest's test_defs.xml file

---
 testrunner/test_defs.xml |  6 ++++--
 testrunner/test_defs.xsd | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 testrunner/test_defs.xsd

diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index 34366ab3a..ae02f52cf 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -56,7 +56,7 @@ Native tests:
 =============
   The <test-native> element has the following attributes
 
-  name build_path [continuous description]
+  name build_path [continuous description extra_make_args]
 
   Where:
   name: Self-descriptive name used to uniquely identify the test
@@ -83,7 +83,9 @@ Native tests:
     done
 -->
 
-<test-definitions version="1">
+<test-definitions xmlns="http://schemas.android.com/testrunner/test_defs/1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://schemas.android.com/testrunner/test_defs/1.0 test_defs.xsd">
 
 <!-- system-wide tests -->
 <test name="framework"
diff --git a/testrunner/test_defs.xsd b/testrunner/test_defs.xsd
new file mode 100644
index 000000000..5387a2801
--- /dev/null
+++ b/testrunner/test_defs.xsd
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        targetNamespace="http://schemas.android.com/testrunner/test_defs/1.0"
+        xmlns="http://schemas.android.com/testrunner/test_defs/1.0"
+        elementFormDefault="qualified">
+
+    <xs:element name="test-definitions">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:choice minOccurs="0" maxOccurs="unbounded">
+                    <xs:element name="test" type="javaTestType"/>
+                    <xs:element name="test-native" type="nativeTestType"/>
+                </xs:choice>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:complexType name="javaTestType">
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="package" type="xs:string" use="required"/>
+        <xs:attribute name="build_path" type="xs:string" use="optional"/>
+        <xs:attribute name="class" type="xs:string" use="optional"/>
+        <xs:attribute name="runner" type="xs:string" use="optional"
+                      default="android.test.InstrumentationTestRunner"/>
+        <xs:attribute name="coverage_target" type="xs:string" use="optional"/>
+        <xs:attribute name="continuous" type="xs:boolean" use="optional" default="false"/>
+    </xs:complexType>
+
+    <xs:complexType name="nativeTestType">
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="build_path" type="xs:string" use="required"/>
+        <xs:attribute name="extra_make_args" type="xs:string" use="optional"/>
+        <xs:attribute name="description" type="xs:string" use="optional"/>
+        <xs:attribute name="continuous" type="xs:boolean" use="optional" default="false"/>
+    </xs:complexType>
+</xs:schema>