diff --git a/tools/SputnikConverter/App.config b/tools/SputnikConverter/App.config deleted file mode 100644 index 7551afef46..0000000000 --- a/tools/SputnikConverter/App.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tools/SputnikConverter/ClassDiagram1.cd b/tools/SputnikConverter/ClassDiagram1.cd deleted file mode 100644 index 85c53c1a52..0000000000 --- a/tools/SputnikConverter/ClassDiagram1.cd +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAA= - Program.cs - - - - - - AAAAgAAAAAAgiAAAAgAAAAAAAAAAAAAAAAAAAAAAAAA= - SputnikTestCase.cs - - - - - - AAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - ES5TestCase.cs - - - - \ No newline at end of file diff --git a/tools/SputnikConverter/ES5TestCase.cs b/tools/SputnikConverter/ES5TestCase.cs deleted file mode 100644 index bbe4ba0463..0000000000 --- a/tools/SputnikConverter/ES5TestCase.cs +++ /dev/null @@ -1,228 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Configuration; -using System.IO; -using System.Runtime.Serialization.Json; -using System.Runtime.Serialization.Formatters; - -//this version has been modified to not split each #check into an individual test - -namespace Microsoft.Sputnik.Interop.ParserEngine -{ - public static class ES5TestScript - { - private static int fileCounter; - private static StringBuilder negativeTestCases; - private static string globalScopeFileName = "\\SputnikGlobalScope.js"; - - - private static string[] templates = { - - - ES5TestScript.GetTemplateFile(ResourceClass.BasicTemplate_FileName), - ES5TestScript.GetTemplateFile(ResourceClass.BasicPrereqTemplate_FileName), - ES5TestScript.GetTemplateFile(ResourceClass.BasicNegativeTemplate_FileName), - ES5TestScript.GetTemplateFile(ResourceClass.BasicNegativePrereqTemplate_FileName) - }; - - /// - /// Output files counter - /// - public static int OutputFileCounter - { - get - { - return fileCounter; - } - set - { - fileCounter = value; - } - } - /// - /// Method to save the sputnik scripts in ES5 format - /// - /// SputnikTestScript Object which will have all the details to be written to the file - /// Is the destination folder path - public static void Save(SputnikTestScript script, string root, string destinationPath) - { - string destDir = Path.Combine(destinationPath, Path.GetDirectoryName(script.pathFromRoot)); - string buildContent = string.Empty; - string destFullPath = string.Empty; - string preCondition = string.IsNullOrEmpty(script.PreConditionCode) ? String.Empty : script.PreConditionCode; - int templateIndex = string.IsNullOrEmpty(preCondition) ? 0 : 1; - string body = script.Body; - if (script.IsNegative) - { - templateIndex += 2; - } - string template = templates[templateIndex]; - Logger.WriteToLog("====================================================================================="); - Logger.WriteToLog("Source file={0}\n", script.FullPath); - Logger.WriteToLog("Destination(s)="); - if (script.id == "") - { - Console.Write(script.Header); - Console.WriteLine(); - } - - string[] args = { script.Header, script.id, script.path.Replace("\\", "/"), InsertStringEscapes(script.assertion), InsertStringEscapes(script.description), script.ReplicationCode, body, preCondition, script.InitialComment }; - destFullPath = Path.Combine(destDir, string.Format(@"{0}.js", script.id)); - - try - { - buildContent = string.Format(template, args); - string dirPath = Path.GetDirectoryName(destFullPath); - if (!Directory.Exists(dirPath)) - Directory.CreateDirectory(dirPath); - using (TextWriter writeTestCase = File.CreateText(destFullPath)) - { - writeTestCase.WriteLine(buildContent); - writeTestCase.Flush(); - writeTestCase.Close(); - OutputFileCounter++; - } - - if (script.IsNegative) - { - //Add details in stringbuilder. - StringBuilder sb = new StringBuilder(); - //sb.Append("GlobalScopeTests[script.pathFromRoot.Replace("\\", "/") + "\"]"); - sb.Append("GlobalScopeTests[\"" + script.id + "\"]"); - sb.Append("="); - string s = GetSerializedSputnikTestScript(new SputnikTestScript() - { - id = script.id, - path = script.path, - description = script.description, - assertion = script.assertion, - }); - sb.Append(s.Substring(0, s.LastIndexOf('}')) + ",\"negative\":\".\"};"); - - if (negativeTestCases == null) - { - negativeTestCases = new StringBuilder(); - } - else - { - negativeTestCases.Append("\n"); - } - negativeTestCases.Append(sb.ToString()); - } - - Logger.WriteToLog(destFullPath); - } - catch (ArgumentException ex) - { - Logger.WriteToLog(ResourceClass.IOException, ex.Message); - } - catch (IOException ex) - { - Logger.WriteToLog(ResourceClass.IOException, ex.Message); - } - // } - } - - /// - /// Method to initialize the negative test record. - /// - /// Is the destination folder path - public static void InitGlobals(string destination) - { - //Insert inital var name in Globals.js file. - if (!Directory.Exists(destination)) - { - Directory.CreateDirectory(destination); - } - FileStream fs = new FileStream(destination.Remove(destination.LastIndexOf("\\")) + globalScopeFileName, FileMode.Create, FileAccess.Write); - StreamWriter sw = new StreamWriter(fs); - sw.Write("this.GlobalScopeTests = this.GlobalScopeTests || {};\n"); - sw.Flush(); - sw.Close(); - fs.Close(); - } - - /// - /// Method to update the SputnikGlobalScope.js - /// - /// Is the destination folder path - public static void UpdateGlobals(string destination) - { - //Replace the last comma by closing curly brace and semi-colon. - File.AppendAllText(destination.Remove(destination.LastIndexOf("\\")) + globalScopeFileName, negativeTestCases.ToString()); - negativeTestCases.Clear(); - } - - - private static string GetSerializedSputnikTestScript(SputnikTestScript sputnikTestScript) - { - MemoryStream stream = new MemoryStream(); - DataContractJsonSerializer ser = new DataContractJsonSerializer(typeof(SputnikTestScript)); - ser.WriteObject(stream, sputnikTestScript); - - stream.Position = 0; - StreamReader sr = new StreamReader(stream); - - return sr.ReadToEnd(); - } - - private static string WrapWithEval(string s) - { - return InsertStringEscapes(s, true); - } - - private static string InsertStringEscapes(string s, bool wrapWithEval = false) - { - StringReader rdr = new StringReader(s); - StringWriter wtr = new StringWriter(); - int intChar; - char nextChar; - if (wrapWithEval) wtr.Write("eval(\""); - while (true) - { - intChar = rdr.Read(); - if (intChar == -1) break; - nextChar = Convert.ToChar(intChar); - switch (nextChar) - { - case '\\': - case '\'': - case '"': - wtr.Write('\\'); - wtr.Write(nextChar); - break; - case '\n': - wtr.Write("\\n"); - break; - case '\r': - wtr.Write("\\r"); - break; - case '\u2028': - wtr.Write("\\u2028"); - break; - case '\u2029': - wtr.Write("\\u2029"); - break; - default: - wtr.Write(nextChar); - break; - } - } - if (wrapWithEval) wtr.Write("\")"); - return wtr.ToString(); - } - - /// - /// Method to read the templates which are used to generate a ES5 format files. - /// - /// - private static string GetTemplateFile(string configSetting) - { - string inputTemplatePath = ConfigurationManager.AppSettings[configSetting].ToString(); - return (new StreamReader(inputTemplatePath)).ReadToEnd(); - } - } -} diff --git a/tools/SputnikConverter/Features Covered.txt b/tools/SputnikConverter/Features Covered.txt deleted file mode 100644 index 5b551e503d..0000000000 --- a/tools/SputnikConverter/Features Covered.txt +++ /dev/null @@ -1,3 +0,0 @@ -Initial Version covers the following features, -1. Conversion of Sputnik tests that are in the basic/common format to ES5 formats -2. Splitting multiple checks into individual files diff --git a/tools/SputnikConverter/InputFormats.xml b/tools/SputnikConverter/InputFormats.xml deleted file mode 100644 index 840952f2f4..0000000000 --- a/tools/SputnikConverter/InputFormats.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - \s*CHECK#[0-9]\r\n(.*(\r\n)?.)+ - diff --git a/tools/SputnikConverter/Logger.cs b/tools/SputnikConverter/Logger.cs deleted file mode 100644 index adae349f87..0000000000 --- a/tools/SputnikConverter/Logger.cs +++ /dev/null @@ -1,93 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.IO; -using System.Configuration; - -namespace Microsoft.Sputnik.Interop.ParserEngine -{ - public class Logger - { - private static string logFileDir = string.Empty; - private StreamWriter writer; - - private static Logger logger; - - private Logger() - { - logFileDir = ConfigurationManager.AppSettings[ResourceClass.LogFileDirectorySettingKey].ToString(); - string filename = Path.Combine(logFileDir, string.Concat(DateTime.Now.ToString("MM-dd-yyyy"), ".log")); - writer = File.CreateText(filename); - } - - private static Logger GetLoggerInstance() - { - if (logger == null) - { - logger = new Logger(); - } - return logger; - } - - public static void WriteToLog(string logText) - { - Logger logger = GetLoggerInstance(); - logger.Write(logText); - } - - private void Write(string logText) - { - try - { - writer.WriteLine(logText); - } - catch (IOException ex) - { - Console.WriteLine(ex.Message); - } - } - - - private void Write(string format, params string[] args) - { - try - { - writer.WriteLine(format, args); - } - catch (FormatException ex) - { - Console.WriteLine(ex.Message); - } - catch (IOException ex) - { - Console.WriteLine(ex.Message); - } - } - - /// - /// Method to write execution progress information to the log file - /// - /// The format. - /// The args. - public static void WriteToLog(string format, params string[] args) - { - Logger logger = GetLoggerInstance(); - logger.Write(format, args); - } - - public static void Dispose() - { - Logger logger = GetLoggerInstance(); - logger.DisposeWriter(); - } - - private void DisposeWriter() - { - if (writer != null) - { - writer.Dispose(); - } - } - } -} diff --git a/tools/SputnikConverter/Microsoft.Sputnik.Interop.ParserEngine.csproj b/tools/SputnikConverter/Microsoft.Sputnik.Interop.ParserEngine.csproj deleted file mode 100644 index 1c411f47aa..0000000000 --- a/tools/SputnikConverter/Microsoft.Sputnik.Interop.ParserEngine.csproj +++ /dev/null @@ -1,142 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {ECFBE9D7-6DA9-47CA-B196-DF5A74BAACD6} - Exe - Properties - Microsoft.Sputnik.Interop.ParserEngine - Microsoft.Sputnik.Interop.ParserEngine - v4.0 - Client - 512 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - Microsoft.Sputnik.Interop.ParserEngine.Program - - - - - - - - - - - - - - - - - - - True - True - ResourceClass.resx - - - - - - Designer - - - - - - Designer - Always - - - Always - - - Always - - - Always - - - Always - - - - - ResXFileCodeGenerator - ResourceClass.Designer.cs - Designer - - - - - False - Microsoft .NET Framework 4 Client Profile %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 3.1 - true - - - - - - - - - \ No newline at end of file diff --git a/tools/SputnikConverter/Microsoft.Sputnik.Interop.ParserEngine.csproj.user b/tools/SputnikConverter/Microsoft.Sputnik.Interop.ParserEngine.csproj.user deleted file mode 100644 index 83cf0b36ad..0000000000 --- a/tools/SputnikConverter/Microsoft.Sputnik.Interop.ParserEngine.csproj.user +++ /dev/null @@ -1,19 +0,0 @@ - - - - ProjectFiles - publish\ - - - - - - en-US - false - - - - - G:\262\test262\test\suite\sputnik\conformance G:\262\test262\test\suite\sputnik_new01 - - \ No newline at end of file diff --git a/tools/SputnikConverter/Microsoft.Sputnik.Interop.ParserEngine.sln b/tools/SputnikConverter/Microsoft.Sputnik.Interop.ParserEngine.sln deleted file mode 100644 index eae811d5c1..0000000000 --- a/tools/SputnikConverter/Microsoft.Sputnik.Interop.ParserEngine.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Sputnik.Interop.ParserEngine", "Microsoft.Sputnik.Interop.ParserEngine.csproj", "{ECFBE9D7-6DA9-47CA-B196-DF5A74BAACD6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {ECFBE9D7-6DA9-47CA-B196-DF5A74BAACD6}.Debug|x86.ActiveCfg = Debug|x86 - {ECFBE9D7-6DA9-47CA-B196-DF5A74BAACD6}.Debug|x86.Build.0 = Debug|x86 - {ECFBE9D7-6DA9-47CA-B196-DF5A74BAACD6}.Release|x86.ActiveCfg = Release|x86 - {ECFBE9D7-6DA9-47CA-B196-DF5A74BAACD6}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tools/SputnikConverter/Program.cs b/tools/SputnikConverter/Program.cs deleted file mode 100644 index 3414375bd5..0000000000 --- a/tools/SputnikConverter/Program.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.IO; - -namespace Microsoft.Sputnik.Interop.ParserEngine -{ - class Program - { - static void Main(string[] args) - { - string source = string.Empty; - string destination = string.Empty; - - if (args == null || args.Length < 2) - { - System.Console.WriteLine("You must specify the source directory and the destination directory!"); - return; - } - source = args[0]; - destination = args[1]; - - string root = "conformance"; - - int countInputFiles = 0; - try - { - Logger.WriteToLog("Start Time : {0}", DateTime.Now.ToString()); - if (Directory.Exists(source)) - { - string[] filePaths = Directory.GetFiles(source, "*.js", SearchOption.AllDirectories); - ES5TestScript.InitGlobals(destination); - - foreach (string filePath in filePaths) - { - SputnikTestScript testScript = new SputnikTestScript(); - testScript.Load(filePath, root); - ES5TestScript.Save(testScript, root, destination); - countInputFiles++; - } - - ES5TestScript.UpdateGlobals(destination); - } - Logger.WriteToLog(ResourceClass.Total_Input_Files, countInputFiles.ToString()); - Logger.WriteToLog(ResourceClass.Total_Output_Files, ES5TestScript.OutputFileCounter.ToString()); - Console.WriteLine(ResourceClass.Total_Input_Files, countInputFiles.ToString()); - Console.WriteLine(ResourceClass.Total_Output_Files, ES5TestScript.OutputFileCounter.ToString()); - Console.WriteLine(ResourceClass.PressExit); - Logger.WriteToLog("End Time : {0}", DateTime.Now.ToShortDateString()); - Console.ReadLine(); - } - finally - { - Logger.Dispose(); - } - - } - } -} diff --git a/tools/SputnikConverter/Properties/AssemblyInfo.cs b/tools/SputnikConverter/Properties/AssemblyInfo.cs deleted file mode 100644 index d224c5cc39..0000000000 --- a/tools/SputnikConverter/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Microsoft.Sputnik.Interop.ParserEngine")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Microsoft.Sputnik.Interop.ParserEngine")] -[assembly: AssemblyCopyright("Copyright © 2010")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("af57bfc6-48f2-4587-980e-1a0f82b94d1e")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tools/SputnikConverter/ResourceClass.Designer.cs b/tools/SputnikConverter/ResourceClass.Designer.cs deleted file mode 100644 index a50920e9df..0000000000 --- a/tools/SputnikConverter/ResourceClass.Designer.cs +++ /dev/null @@ -1,288 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.1 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Microsoft.Sputnik.Interop.ParserEngine { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class ResourceClass { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal ResourceClass() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Sputnik.Interop.ParserEngine.ResourceClass", typeof(ResourceClass).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to BasicNegativePrereqInputTemplate. - /// - internal static string BasicNegativePrereqTemplate_FileName { - get { - return ResourceManager.GetString("BasicNegativePrereqTemplate_FileName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to BasicNegativeInputTemplate. - /// - internal static string BasicNegativeTemplate_FileName { - get { - return ResourceManager.GetString("BasicNegativeTemplate_FileName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to BasicPrereqInputTemplate. - /// - internal static string BasicPrereqTemplate_FileName { - get { - return ResourceManager.GetString("BasicPrereqTemplate_FileName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to BasicInputTemplate. - /// - internal static string BasicTemplate_FileName { - get { - return ResourceManager.GetString("BasicTemplate_FileName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to ChecksRegex. - /// - internal static string ChecksRegexSettingKey { - get { - return ResourceManager.GetString("ChecksRegexSettingKey", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to CommentsRegex. - /// - internal static string CommentsRegexSettingKey { - get { - return ResourceManager.GetString("CommentsRegexSettingKey", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to File has been converted and saved at: {0}. - /// - internal static string FileConverted_Log { - get { - return ResourceManager.GetString("FileConverted_Log", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to GlobalCodeRegex. - /// - internal static string GlobalCodeRegexKey { - get { - return ResourceManager.GetString("GlobalCodeRegexKey", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to InputXMLPath. - /// - internal static string InputXMLPath { - get { - return ResourceManager.GetString("InputXMLPath", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Failed with exception, Message : {0}. - /// - internal static string IOException { - get { - return ResourceManager.GetString("IOException", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to LogFileDirectory. - /// - internal static string LogFileDirectorySettingKey { - get { - return ResourceManager.GetString("LogFileDirectorySettingKey", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to assertion. - /// - internal static string LookFor_Assertion { - get { - return ResourceManager.GetString("LookFor_Assertion", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to description. - /// - internal static string LookFor_Description { - get { - return ResourceManager.GetString("LookFor_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to name. - /// - internal static string LookFor_Name { - get { - return ResourceManager.GetString("LookFor_Name", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to negative. - /// - internal static string LookFor_Negative { - get { - return ResourceManager.GetString("LookFor_Negative", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to strict_mode_negative. - /// - internal static string LookFor_NegativeStrictMode { - get { - return ResourceManager.GetString("LookFor_NegativeStrictMode", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to section. - /// - internal static string LookFor_Section { - get { - return ResourceManager.GetString("LookFor_Section", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Matching regex is found for the file: {0}. - /// - internal static string Match_RegEx_Found { - get { - return ResourceManager.GetString("Match_RegEx_Found", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Could not find any matching regex format for the file: {0}. - /// - internal static string NoMatch_RegEex { - get { - return ResourceManager.GetString("NoMatch_RegEex", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Press enter key to exit.... - /// - internal static string PressExit { - get { - return ResourceManager.GetString("PressExit", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Regular expression used for the file: {0} is {1} and its seqence Id is {2}. - /// - internal static string RegEx_Used { - get { - return ResourceManager.GetString("RegEx_Used", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Total number of sputnik test case files before conversion: {0}. - /// - internal static string Total_Input_Files { - get { - return ResourceManager.GetString("Total_Input_Files", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Total number of test cases which actually got converted: {0}. - /// - internal static string Total_Output_Files { - get { - return ResourceManager.GetString("Total_Output_Files", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Unexpected error occured while converting files:. - /// - internal static string Unexpected_Error { - get { - return ResourceManager.GetString("Unexpected_Error", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Error occured while reading regex formats from InputFormats.xml files: {0}. - /// - internal static string XMLException_Log { - get { - return ResourceManager.GetString("XMLException_Log", resourceCulture); - } - } - } -} diff --git a/tools/SputnikConverter/ResourceClass.resx b/tools/SputnikConverter/ResourceClass.resx deleted file mode 100644 index f9d7525432..0000000000 --- a/tools/SputnikConverter/ResourceClass.resx +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ChecksRegex - - - CommentsRegex - - - File has been converted and saved at: {0} - - - GlobalCodeRegex - - - InputXMLPath - - - Failed with exception, Message : {0} - - - LogFileDirectory - - - description - - - name - - - section - - - Matching regex is found for the file: {0} - - - Could not find any matching regex format for the file: {0} - - - Press enter key to exit... - - - Regular expression used for the file: {0} is {1} and its seqence Id is {2} - - - BasicInputTemplate - - - Total number of sputnik test case files before conversion: {0} - - - Total number of test cases which actually got converted: {0} - - - Unexpected error occured while converting files: - - - Error occured while reading regex formats from InputFormats.xml files: {0} - - - BasicNegativePrereqInputTemplate - - - BasicNegativeInputTemplate - - - BasicPrereqInputTemplate - - - negative - - - strict_mode_negative - - - assertion - - \ No newline at end of file diff --git a/tools/SputnikConverter/SputnikTestCase.cs b/tools/SputnikConverter/SputnikTestCase.cs deleted file mode 100644 index 4f0f2e4c28..0000000000 --- a/tools/SputnikConverter/SputnikTestCase.cs +++ /dev/null @@ -1,327 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.IO; -using System.Text.RegularExpressions; -using System.Xml; -using System.Configuration; -using System.Xml.Linq; -using System.Runtime.Serialization; - -namespace Microsoft.Sputnik.Interop.ParserEngine -{ - [DataContract] - public class SputnikTestScript - { - private string testScriptID = string.Empty; - private string testScriptSection = string.Empty; - private string testScriptDescription = string.Empty; - private string testScriptAssertion = string.Empty; - private string replicationCode = string.Empty; - private int actualFileConvertedCount = 0; - public bool negativeTest = false; - private bool strictModeNegativeTest = false; - private const string xmlNode = "format"; - private const string xmlAttribute = "sequence"; - private string[] checkSections; - private SortedDictionary testScriptFormats = new SortedDictionary(); - - public string Header = string.Empty; - public string Body = string.Empty; - public string InitialComment = string.Empty; - public string pathFromRoot = string.Empty; - - /// - /// Gets or sets the ID. - /// - /// The ID. - [DataMember] - public string id - { - get - { - return testScriptID; - } - set - { - if (value != null) - testScriptID = value.Trim(); - } - } - public bool IsNegativeInStrictMode - { - get - { - return strictModeNegativeTest; - } - set - { - strictModeNegativeTest = value; - } - } - - - /// - /// Gets or sets the netative test flag. - /// - /// true if this is a @negative test - public bool IsNegative - { - get - { - return negativeTest; - } - set - { - negativeTest=value; - } - } - - /// - /// Gets or sets the testScriptSection - /// - [DataMember] - public string path - { - get - { - return testScriptSection; - } - set - { - if(value!=null) - testScriptSection = value.Trim(); - } - } - - /// - /// Actual number of input files which got converted - /// - public int ConvertedFileCount - { - get - { - return actualFileConvertedCount; - } - set - { - actualFileConvertedCount = value; - } - } - - - /// - /// Gets or sets the testScriptDescription - /// - [DataMember] - public string description - { - get - { - return testScriptDescription; - } - set - { - if (value != null) - testScriptDescription = value.Trim(); - } - } - - /// - /// Gets or sets the testScriptAssersion - /// - [DataMember] - public string assertion - { - get - { - return testScriptAssertion; - } - set - { - if (value != null) - testScriptAssertion = value.Trim(); - } - } - - /// - /// Gets or sets the value for checkSections - /// - public string[] Checks - { - get - { - return checkSections; - } - set - { - checkSections = value; - } - } - - /// - /// Gets or sets the full path. - /// - /// The full path. - public string FullPath { get; set; } - - /// - /// Gets or sets the replication code. - /// - /// The replication code. - public string ReplicationCode - { - get - { - return replicationCode; - } - set - { - if (value != null) - replicationCode = value.Trim(); - } - } - - /// - /// Gets or sets the possible checks count. - /// - /// The possible checks count. - public int PossibleChecksCount { get; set; } - - /// - /// Gets or sets the pre condition code. - /// - /// The pre condition code. - public string PreConditionCode { get; set; } - - /// - /// Constructor which reads the regular expression formats from InputFormats.xml file - /// - public SputnikTestScript() - { - ReadInputXml(); - } - - /// - /// Reads the regular expression formats from inputformats.xml file - /// - public void ReadInputXml() - { - string inputXmlPath = Path.GetFullPath(ConfigurationManager.AppSettings[ResourceClass.InputXMLPath].ToString()); - XmlTextReader reader = new XmlTextReader(inputXmlPath); - try - { - if (File.Exists(inputXmlPath)) - { - while (reader.Read()) - { - switch (reader.NodeType) - { - case XmlNodeType.Element: - if (!Convert.ToBoolean(string.Compare(reader.Name.ToLower(), xmlNode))) - { - testScriptFormats.Add(reader.GetAttribute(xmlAttribute), reader.ReadString()); - } - break; - } - } - } - } - catch (XmlException ex) - { - Logger.WriteToLog(string.Format(ResourceClass.XMLException_Log, ex.Message)); - } - } - - /// - /// Loads the sputnik testscript file and extracts the required details from it - /// - /// Path to the source file - public void Load(string filePath, string root) - { - string[] regexTrimDelimiter = { "\n","\r"}; - String fullFile = string.Empty; - - using (TextReader txtReader = new StreamReader(filePath)) - { - fullFile = txtReader.ReadToEnd(); - } - this.FullPath = filePath; - int indexOfRoot = this.FullPath.IndexOf(root, StringComparison.InvariantCulture) + root.Length + 1; - this.pathFromRoot = this.FullPath.Substring(indexOfRoot, this.FullPath.Length - indexOfRoot); - - Regex regx = new Regex("\\\\S([0-9]+)_([^\\\\]+)\\.js$"); - if (regx.IsMatch(this.pathFromRoot)) - { - Match tempMatch = regx.Match(this.pathFromRoot); - String tempDir = "\\" + tempMatch.Groups[1].Value + ".0_Chapter"; - this.pathFromRoot = regx.Replace(this.pathFromRoot, tempDir + "\\S$1.0_$2.js"); - } - ReadSimpleTestCase(fullFile); - } - - /// - /// Read a basic sputnik test file and create an object for it. Assume just a header comment and a test body - /// - /// Input file content - private void ReadSimpleTestCase(string fullFile) - { - char[] delimiter = { ':' }; - char[] trimDelimit = { ';' ,'\r','\n'}; - string holdStr = string.Empty; - string[] arrComments; - - Regex commentTailRegex = new Regex("\\s*\\*\\/\\s*"); - Match matchCommentTail = commentTailRegex.Match(fullFile); - - this.Header = fullFile.Substring(0,matchCommentTail.Index+matchCommentTail.Length); - - Regex csharpCommentRegx = new Regex("\\/\\*"); - Match matchCSharpCommentHead = csharpCommentRegx.Match(this.Header); - this.InitialComment = this.Header.Substring(0, matchCSharpCommentHead.Index); - - this.Body = fullFile.Substring(matchCommentTail.Index+matchCommentTail.Length); - - string commentFormat = "@[a-zA-Z0-9_]+(:\\s*[^\\r\\n]*)?;?\\s*(\\r|\\n)"; - Regex regx = new Regex(commentFormat); - MatchCollection matchComments = regx.Matches(this.Header); - - foreach (Match comment in matchComments) - { - holdStr = comment.Value; - arrComments = holdStr.Trim(trimDelimit).Trim().Split(delimiter,2); - - string commentKey = arrComments[0].ToLower(); - if (commentKey.Contains(ResourceClass.LookFor_Name)) - { - this.id = this.pathFromRoot.Substring(this.pathFromRoot.LastIndexOf("\\") + 1); - this.id = this.id.Remove(this.id.Length - 3); - } - if (commentKey.Contains(ResourceClass.LookFor_Section)) - { - this.path = this.pathFromRoot; - } - if (commentKey.Contains(ResourceClass.LookFor_Assertion)) - { - this.assertion = arrComments[arrComments.Length - 1].Trim(trimDelimit); - } - if (commentKey.Contains(ResourceClass.LookFor_Description)) - { - this.description = arrComments[arrComments.Length - 1].Trim(trimDelimit); - } - if (commentKey.Contains(ResourceClass.LookFor_NegativeStrictMode)) - { - this.IsNegativeInStrictMode = true; - } - if (commentKey.Contains(ResourceClass.LookFor_Negative)) - { - if (!arrComments[0].Contains(ResourceClass.LookFor_NegativeStrictMode)) this.IsNegative = true; - } - } - - - this.PossibleChecksCount = 1; - } - } -} diff --git a/tools/SputnikConverter/bin/Debug/InputFormats.xml b/tools/SputnikConverter/bin/Debug/InputFormats.xml deleted file mode 100644 index 840952f2f4..0000000000 --- a/tools/SputnikConverter/bin/Debug/InputFormats.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - \s*CHECK#[0-9]\r\n(.*(\r\n)?.)+ - diff --git a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe deleted file mode 100644 index 3963221b3d..0000000000 Binary files a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe and /dev/null differ diff --git a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe.config b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe.config deleted file mode 100644 index 7551afef46..0000000000 --- a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.pdb b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.pdb deleted file mode 100644 index 8fe7baed33..0000000000 Binary files a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.pdb and /dev/null differ diff --git a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.suo b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.suo deleted file mode 100644 index 7ecc2ad3e5..0000000000 Binary files a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.suo and /dev/null differ diff --git a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.vshost.exe b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.vshost.exe deleted file mode 100644 index bb84a51ac4..0000000000 Binary files a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.vshost.exe and /dev/null differ diff --git a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.vshost.exe.config b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.vshost.exe.config deleted file mode 100644 index 7551afef46..0000000000 --- a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.vshost.exe.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.vshost.exe.manifest b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.vshost.exe.manifest deleted file mode 100644 index f96b1d6b3f..0000000000 --- a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.vshost.exe.manifest +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/tools/SputnikConverter/bin/Debug/testNegativePrereqTemplate.js b/tools/SputnikConverter/bin/Debug/testNegativePrereqTemplate.js deleted file mode 100644 index ae1dbfe9b0..0000000000 --- a/tools/SputnikConverter/bin/Debug/testNegativePrereqTemplate.js +++ /dev/null @@ -1,22 +0,0 @@ -{0} -// Converted for Test262 from original Sputnik source - -ES5Harness.registerTest( {{ -id: "{1}", - -path: "TestCases/{2}", - -description: "{4}", - -test: function testcase() {{ - try {{ - (function() {{ - {5} {6} }})(); - }} catch (__e__) {{return true /* failure is success */}}; - return false /* but success is failure */ - }}, - -precondition: function precond() {{ - {7} - }} -}}); diff --git a/tools/SputnikConverter/bin/Debug/testNegativeTemplate.js b/tools/SputnikConverter/bin/Debug/testNegativeTemplate.js deleted file mode 100644 index e9b503ebf6..0000000000 --- a/tools/SputnikConverter/bin/Debug/testNegativeTemplate.js +++ /dev/null @@ -1,4 +0,0 @@ -{8} -// Converted for Test262 from original Sputnik source - -{5} {6} diff --git a/tools/SputnikConverter/bin/Debug/testPrereqTemplate.js b/tools/SputnikConverter/bin/Debug/testPrereqTemplate.js deleted file mode 100644 index 0faf2536ce..0000000000 --- a/tools/SputnikConverter/bin/Debug/testPrereqTemplate.js +++ /dev/null @@ -1,21 +0,0 @@ -{0} -// Converted for Test262 from original Sputnik source - -ES5Harness.registerTest( {{ -id: "{1}", - -path: "TestCases/{2}", - -assertion: "{3}", - -description: "{4}", - -test: function testcase() {{ - {5} {6} - }}, - -precondition: function precond() {{ - {7} - }} - -}}); diff --git a/tools/SputnikConverter/bin/Debug/testTemplate.js b/tools/SputnikConverter/bin/Debug/testTemplate.js deleted file mode 100644 index 7026d6f4e2..0000000000 --- a/tools/SputnikConverter/bin/Debug/testTemplate.js +++ /dev/null @@ -1,16 +0,0 @@ -{0} -// Converted for Test262 from original Sputnik source - -ES5Harness.registerTest( {{ -id: "{1}", - -path: "TestCases/{2}", - -assertion: "{3}", - -description: "{4}", - -test: function testcase() {{ - {5} {6} - }} -}}); diff --git a/tools/SputnikConverter/testNegativePrereqTemplate.js b/tools/SputnikConverter/testNegativePrereqTemplate.js deleted file mode 100644 index ae1dbfe9b0..0000000000 --- a/tools/SputnikConverter/testNegativePrereqTemplate.js +++ /dev/null @@ -1,22 +0,0 @@ -{0} -// Converted for Test262 from original Sputnik source - -ES5Harness.registerTest( {{ -id: "{1}", - -path: "TestCases/{2}", - -description: "{4}", - -test: function testcase() {{ - try {{ - (function() {{ - {5} {6} }})(); - }} catch (__e__) {{return true /* failure is success */}}; - return false /* but success is failure */ - }}, - -precondition: function precond() {{ - {7} - }} -}}); diff --git a/tools/SputnikConverter/testNegativeTemplate.js b/tools/SputnikConverter/testNegativeTemplate.js deleted file mode 100644 index e9b503ebf6..0000000000 --- a/tools/SputnikConverter/testNegativeTemplate.js +++ /dev/null @@ -1,4 +0,0 @@ -{8} -// Converted for Test262 from original Sputnik source - -{5} {6} diff --git a/tools/SputnikConverter/testPrereqTemplate.js b/tools/SputnikConverter/testPrereqTemplate.js deleted file mode 100644 index 0faf2536ce..0000000000 --- a/tools/SputnikConverter/testPrereqTemplate.js +++ /dev/null @@ -1,21 +0,0 @@ -{0} -// Converted for Test262 from original Sputnik source - -ES5Harness.registerTest( {{ -id: "{1}", - -path: "TestCases/{2}", - -assertion: "{3}", - -description: "{4}", - -test: function testcase() {{ - {5} {6} - }}, - -precondition: function precond() {{ - {7} - }} - -}}); diff --git a/tools/SputnikConverter/testTemplate.js b/tools/SputnikConverter/testTemplate.js deleted file mode 100644 index 7026d6f4e2..0000000000 --- a/tools/SputnikConverter/testTemplate.js +++ /dev/null @@ -1,16 +0,0 @@ -{0} -// Converted for Test262 from original Sputnik source - -ES5Harness.registerTest( {{ -id: "{1}", - -path: "TestCases/{2}", - -assertion: "{3}", - -description: "{4}", - -test: function testcase() {{ - {5} {6} - }} -}});