Re-gen'ed website using new Sputnik directory names.

tools/misc/FixPathsAndIds.py

@@ -25,7 +25,7 @@ import sys
 import re
 
 #--Globals---------------------------------------------------------------------
-PRE_PATH = "TestCases/"
+PRE_PATH = ""
 
 #------------------------------------------------------------------------------
 def getAllJSFiles(dirName):
@@ -46,19 +46,16 @@ def getAllJSFiles(dirName):
 #------------------------------------------------------------------------------
 def handleFile(filePath, partialPath):
     global PRE_PATH
-    
     tempPath = filePath.replace(partialPath + os.path.sep, "", 1)
     tempPath = tempPath.replace(os.path.sep, "/")
-    tempId   = tempPath.rsplit("/", 1)[1][:-3]
     
     with open(filePath, "r") as f:
         origLines = f.readlines()
     
-    with open(filePath, "w") as f:
+    with open(filePath, "wb") as f:
         pathHit = False
-        idHit = False
-        testHit = False
-        descriptHit = False
+        #testHit = False
+        #descriptHit = False
         
         for line in origLines:
             #TODO?
@@ -68,15 +65,10 @@ def handleFile(filePath, partialPath):
             #elif (not testHit) and re.search("test\s*:\s*function\s+testcase\(\)", line)!=None:
             #    testHit = True
             #    line = line.rstrip() + os.linesep
-            if (not pathHit) and re.search("path\s*:\s*\"", line)!=None:
+            if (not pathHit) and re.search(r"\* @path\s[^$]", line)!=None:
                 pathHit = True
-                line = re.sub("\"[^\"]*\"", 
-                              "\"%s\"" % (PRE_PATH + tempPath), 
-                              line)
-            elif (not idHit) and re.search("id\s*:\s*\"", line)!=None:
-                idHit = True
-                line = re.sub("\"[^\"]*\"", 
-                              "\"%s\"" % tempId, 
+                line = re.sub(r"@path\s+[^$]+$", #"\"[^\"]*\"", 
+                              r"@path %s\n" % (PRE_PATH + tempPath), 
                               line)
             #TODO?
             #elif (not descriptHit) and re.search("description\s*:\s*\"", line)!=None:
@@ -86,7 +78,7 @@ def handleFile(filePath, partialPath):
 
 #--Main------------------------------------------------------------------------
 if __name__=="__main__":
-    __parser = argparse.ArgumentParser(description='Tool used to fix the id and path properties of test case objects')
+    __parser = argparse.ArgumentParser(description='Tool used to fix the path properties of test case objects')
     __parser.add_argument('tpath', action='store',
                           help='Full path to test cases. E.g., C:\repos\test262-msft\test\suite\ietestcenter')
     ARGS = __parser.parse_args()

website/json/15.12_The_JSON_Object.json

@@ -1 +0,0 @@
-{"testsCollection":{"name":"Chapter - 15.12_The_JSON_Object","numTests":"1","tests":[{"code":"Ly8gQ29weXJpZ2h0IDIwMTEgdGhlIFNwdXRuaWsgYXV0aG9ycy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi8vIFRoaXMgY29kZSBpcyBnb3Zlcm5lZCBieSB0aGUgQlNEIGxpY2Vuc2UgZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZS4KCi8qKgogKiBKU09OLnBhcnNlIG11c3QgY3JlYXRlIGEgcHJvcGVydHkgd2l0aCB0aGUgZ2l2ZW4gcHJvcGVydHkgbmFtZQogKgogKiBAcGF0aCAxNV9OYXRpdmUvMTUuMTJfVGhlX0pTT05fT2JqZWN0LzE1LjEyLjJfSlNPTi5wYXJzZS9TMTUuMTIuMl9BMS5qcwogKiBAZGVzY3JpcHRpb24gVGVzdHMgdGhhdCBKU09OLnBhcnNlIHRyZWF0cyAiX19wcm90b19fIiBhcyBhIHJlZ3VsYXIgcHJvcGVydHkgbmFtZQogKi8KCnZhciB4ID0gSlNPTi5wYXJzZSgneyJfX3Byb3RvX18iOltdfScpOwppZiAoT2JqZWN0LmdldFByb3RvdHlwZU9mKHgpICE9PSBPYmplY3QucHJvdG90eXBlKSB7CiAgJEZBSUwoJyMxOiBKU09OLnBhcnNlIGNvbmZ1c2VkIGJ5ICJfX3Byb3RvX18iJyk7Cn0KaWYgKCFBcnJheS5pc0FycmF5KHguX19wcm90b19fKSkgewogICRGQUlMKCcjMjogSlNPTi5wYXJzZSBkaWQgbm90IHNldCAiX19wcm90b19fIiBhcyBhIHJlZ3VsYXIgcHJvcGVydHknKTsKfQoK","commentary":"JSON.parse must create a property with the given property name","description":"Tests that JSON.parse treats \"__proto__\" as a regular property name","path":"TestCases/15_Native/15.12_The_JSON_Object/15.12.2_JSON.parse/S15.12.2_A1.js"}]}}

website/json/default.json

@@ -1 +1 @@
-{"date":"2011-10-03","numTests":11028,"testSuite":["json/07_Lexical_Conventions.json","json/08_Types.json","json/09_Type_Conversion.json","json/10_Execution_Contexts.json","json/11.10_Binary_Bitwise_Operators.json","json/11.11_Binary_Logical_Operators.json","json/11.12_Conditional_Operator.json","json/11.13_Assignment_Operators.json","json/11.14_Comma_Operator.json","json/11.1_Primary_Expressions.json","json/11.2_Left_Hand_Side_Expressions.json","json/11.3_PostfixExpressions.json","json/11.4_Unary_Operators.json","json/11.5_Multiplicative_Operators.json","json/11.6_Additive_Operators.json","json/11.7_Bitwise_Shift_Operators.json","json/11.8_Relational_Operators.json","json/11.9_Equality_Operators.json","json/12_Statement.json","json/13_Function_Definition.json","json/14_Program.json","json/15.10_RegExp_Objects.json","json/15.11_Error_Objects.json","json/15.12_The_JSON_Object.json","json/15.1_The_Global_Object.json","json/15.2_Object_Objects.json","json/15.3_Function_Objects.json","json/15.4_Array_Objects.json","json/15.5_String_Objects.json","json/15.6_Boolean_Objects.json","json/15.7_Number_Objects.json","json/15.8_The_Math_Object.json","json/15.9_Date_Objects.json","json/chapter07.json","json/chapter08.json","json/chapter10.json","json/chapter11.json","json/chapter12.json","json/chapter13.json","json/chapter14.json","json/15.1.json","json/15.10.json","json/15.11.json","json/15.12.json","json/15.2.3.1.json","json/15.2.3.10.json","json/15.2.3.11.json","json/15.2.3.12.json","json/15.2.3.13.json","json/15.2.3.14.json","json/15.2.3.2.json","json/15.2.3.3.json","json/15.2.3.4.json","json/15.2.3.5.json","json/15.2.3.6.json","json/15.2.3.7.json","json/15.2.3.8.json","json/15.2.3.9.json","json/15.2.4.json","json/15.3.json","json/15.4.3.json","json/15.4.4.10.json","json/15.4.4.12.json","json/15.4.4.14.json","json/15.4.4.15.json","json/15.4.4.16.json","json/15.4.4.17.json","json/15.4.4.18.json","json/15.4.4.19.json","json/15.4.4.20.json","json/15.4.4.21.json","json/15.4.4.22.json","json/15.4.4.4.json","json/15.4.5.json","json/15.5.json","json/15.7.json","json/15.9.json"],"version":"ES5"}
+{"date":"2011-10-03","numTests":11029,"testSuite":["json/ch07.json","json/ch08.json","json/ch09.json","json/ch10.json","json/11.1.json","json/11.10.json","json/11.11.json","json/11.12.json","json/11.13.json","json/11.14.json","json/11.2.json","json/11.3.json","json/11.4.json","json/11.5.json","json/11.6.json","json/11.7.json","json/11.8.json","json/11.9.json","json/ch12.json","json/ch13.json","json/ch14.json","json/15.1.json","json/15.10.json","json/15.11.json","json/15.12.json","json/15.2.json","json/15.3.json","json/15.4.json","json/15.5.json","json/15.6.json","json/15.7.json","json/15.8.json","json/15.9.json","json/chapter07.json","json/chapter08.json","json/chapter10.json","json/chapter11.json","json/chapter12.json","json/chapter13.json","json/chapter14.json","json/15.1.json","json/15.10.json","json/15.11.json","json/15.12.json","json/15.2.3.1.json","json/15.2.3.10.json","json/15.2.3.11.json","json/15.2.3.12.json","json/15.2.3.13.json","json/15.2.3.14.json","json/15.2.3.2.json","json/15.2.3.3.json","json/15.2.3.4.json","json/15.2.3.5.json","json/15.2.3.6.json","json/15.2.3.7.json","json/15.2.3.8.json","json/15.2.3.9.json","json/15.2.4.json","json/15.3.json","json/15.4.3.json","json/15.4.4.10.json","json/15.4.4.12.json","json/15.4.4.14.json","json/15.4.4.15.json","json/15.4.4.16.json","json/15.4.4.17.json","json/15.4.4.18.json","json/15.4.4.19.json","json/15.4.4.20.json","json/15.4.4.21.json","json/15.4.4.22.json","json/15.4.4.4.json","json/15.4.5.json","json/15.5.json","json/15.7.json","json/15.9.json"],"version":"ES5"}