@@ -2,7 +2,8 @@ task :default => :rexap SL = 'C:\Program Files\Microsoft Silverlight\3.0.40307.0' CSC = 'C:\Windows\Microsoft.NET\Framework\v3.5\csc.exe' -DLR = 'c:\users\jimmysch\dev\agdlr\bin\debug' +DLR = 'c:\users\jimmysch\dev\agdlr\bin\release' +#DLR = 'c:\users\jimmysch\dev\releases\agdlr-0.5.0\bin' CHR = "#{DLR}\\Chiron.exe" SYSTEM_REFERENCES = %W(mscorlib System System.Core System.Net System.Windows System.Windows.Browser) Rakefile @@ -50,8 +50,10 @@ class Eggs end def run(engine = nil) + # eggs_config should call something like Eggs.config(:tests => ['sample']) + load 'eggs_config.rb' engine ? Repl.show(engine, engine.create_scope) : Repl.show - Repl.current.input_buffer.write("Eggs.current.run_tests\n") + Repl.current.input_buffer.write "Eggs.current.run_tests\n" end def current @@ -62,22 +64,23 @@ class Eggs # # Test Running # - # TODO need a way to walk all *_test.rb files in tests directory def run_tests Eggs.get_config.each do |test_type, test_files| test_files.each do |file| loaded = false ["#{test_type}/#{file}_test.rb", "#{test_type}/test_#{file}.rb"].each do |pth| - prepend = File.dirname(DynamicApplication.current ? + prepend = File.dirname( + DynamicApplication.current ? DynamicApplication.current.entry_point.to_s : - '') + '' + ) pth = "#{prepend}/#{pth}" if prepend != '.' if !loaded && Package.get_file(pth) load pth loaded = true end end - raise "#{file} is not a known test (check your Eggs.config call)" unless loaded + raise "#{file} is not a known test (check your eggs_config.rb file)" unless loaded end end Eggs.execute_at_exit_blocks lib/eggs.rb @@ -32,11 +32,13 @@ public class Eggs { "IronRuby.Libraries" }; //, "IronPython", "IronPython.Modules" - public static void Start(Dictionary<string, List<string>> tests, StreamResourceInfo xap) { - var assemblies = LoadDLRAssemblies(xap); - InitializeDLR(xap, assemblies); + public static void Start(Uri testsXapUri, StreamResourceInfo eggsXap) { + var assemblies = LoadDLRAssemblies(eggsXap); + InitializeDLR(eggsXap, assemblies); LoadEggs(); - ConfigureAndRunEggs(tests); + DownloadTestsXap(testsXapUri, delegate(StreamResourceInfo testsXap) { + ConfigureAndRunEggs(testsXap); + }); } private static void InitializeDLR(StreamResourceInfo xap, List<Assembly> assemblies) { @@ -74,18 +76,33 @@ public class Eggs { Repl.Show(_engine, _scope); } - private static void ConfigureAndRunEggs(Dictionary<string, List<string>> tests) { + private static Action<StreamResourceInfo> _onDownloadComplete; + + private static void DownloadTestsXap(Uri testsXapUri, Action<StreamResourceInfo> OnDownloadComplete) { + _onDownloadComplete = OnDownloadComplete; + WebClient wc = new WebClient(); + wc.OpenReadCompleted += new OpenReadCompletedEventHandler(DownloadTestXap_Complete); + wc.OpenReadAsync(testsXapUri); + } + + private static void DownloadTestXap_Complete(object sender, OpenReadCompletedEventArgs e) { + if (e.Error == null) { + var sri = new StreamResourceInfo(e.Result, null); + if (_onDownloadComplete != null) { + _onDownloadComplete.Invoke(sri); + } + } else { + System.Windows.Browser.HtmlPage.Window.Alert("Tests failed to download"); + } + } + + private static void ConfigureAndRunEggs(StreamResourceInfo testsXap) { + DynamicApplication.XapFile = testsXap; + ScriptScope scope = _engine.Runtime.Globals; IronRuby.Ruby.GetExecutionContext(_engine).DefineGlobalVariable("engine", _engine); - IronRuby.Ruby.GetExecutionContext(_engine).DefineGlobalVariable("test_list", tests); - - DynamicApplication.XapFile = null; - var code = @" -$test_list = $test_list.inject({}) {|h, kvp| h[kvp.key.to_s] = kvp.value.to_s; h} -Eggs.config($test_list) -Eggs.run($engine) -"; + var code = "Eggs.run($engine)"; var source = _engine.CreateScriptSourceFromString(code, SourceCodeKind.File); source.Compile(new ErrorFormatter.Sink()).Execute(scope); } src/Eggs.cs 191a29bcdca95e08708f43ee4cafd6bd0fbfb71d Jimmy Schementi jschementi@gmail.com http://github.com/jschementi/eggs/commit/a9f4976a90102e39326b6f36c79713c65f3aa070 a9f4976a90102e39326b6f36c79713c65f3aa070 2009-03-27T16:03:25-07:00 2009-03-27T16:03:25-07:00 Ability for tests to be in a separate XAP file 1c18c5a7b9cceee06270034cbbc8c72888d4e7c5 Jimmy Schementi jschementi@gmail.com