@@ -2,7 +2,7 @@ [{description, "Selenium server remote control"}, {author, "Nicolas Charpentier"}, {vsn, %VSN%}, - {modules, %MODULES%}, + {modules, [selenium_session, selenium_api, %MODULES%]}, {registered, []}, {applications, [kernel, stdlib, inets]} ]}. lib/selenium_remote/src/selenium_remote.app.src @@ -8,15 +8,15 @@ -include_lib("eunit/include/eunit.hrl"). --export ([fast_tests/0]). +-export([default_server_test /1]). +-export([google_test /1]). +-export([keypress_test /1]). +-export([type_very_long_text_test /1]). +-export([utf8_test /1]). +-export([i18n_test /1]). -fast_tests () -> - [fun default_server_test/1, - fun i18n_test/1, - fun utf8_test/1, - fun type_very_long_text_test/1, - fun keypress_test/1, - fun google_test/1]. +fast_test_() -> + test_generator: start_stop (?MODULE). default_server_test (Session) -> Start_url = "/selenium-server/tests/html/test_click_page1.html", @@ -90,7 +90,6 @@ i18n_test (Session) -> {"japanese", [12414,12407]}, {"dangerous", "&%?\\+|,%*"}], - Test = fun({Id,Data}) -> UTF8 = xmerl_ucs:to_utf8(Data), Result = selenium_api: is_text_present (Session, UTF8), lib/selenium_remote/test/selenium_api_tests.erl @@ -8,15 +8,15 @@ -include_lib("eunit/include/eunit.hrl"). --export ([fast_tests/0]). +-export([default_server_test /1]). +-export([google_test /1]). +-export([keypress_test /1]). +-export([type_very_long_text_test /1]). +-export([utf8_test /1]). +-export([i18n_test /1]). -fast_tests () -> - [fun default_server_test/1, - fun i18n_test/1, - fun utf8_test/1, - fun type_very_long_text_test/1, - fun keypress_test/1, - fun google_test/1]. +fast_test_() -> + test_generator: launch_close (?MODULE). default_server_test (Session) -> Start_url = "/selenium-server/tests/html/test_click_page1.html", @@ -90,7 +90,6 @@ i18n_test (Session) -> {"japanese", [12414,12407]}, {"dangerous", "&%?\\+|,%*"}], - Test = fun({Id,Data}) -> UTF8 = xmerl_ucs:to_utf8(Data), Result = Session: is_text_present ( UTF8), lib/selenium_remote/test/selenium_session_tests.erl @@ -8,15 +8,19 @@ -include_lib("eunit/include/eunit.hrl"). --export ([fast_tests/0]). +-export([default_server_test /1]). +-export([google_test /1]). +-export([keypress_test /1]). +-export([type_very_long_text_test /1]). +-export([utf8_test /1]). +-export([i18n_test /1]). -fast_tests () -> - [fun default_server_test/1, - fun i18n_test/1, - fun utf8_test/1, - fun type_very_long_text_test/1, - fun keypress_test/1, - fun google_test/1]. +all_test_() -> + [{inparallel, 2, [{timeout, 60, fun start_session/0}, + {timeout, 60, fun high_level/0}]}]. + +fast_test_() -> + test_generator: start_stop(?MODULE). default_server_test (Session) -> Start_url = "/selenium-server/tests/html/test_click_page1.html", @@ -30,10 +34,8 @@ default_server_test (Session) -> selenium: cmd (Session, click, ["link"]), selenium: cmd (Session, waitForPageToLoad, ["5000"]), - %% Head ++ "/selenium-server/tests/html/test_click_page2.html" = selenium:cmd(get_location,Session), selenium: cmd (Session, click, ["previousPage"]), selenium: cmd (Session, waitForPageToLoad, ["5000"]), - %% Head ++ "/selenium-server/tests/html/test_click_page1.html" = selenium:cmd(get_location,Session), ok. google_test (Session) -> @@ -172,7 +174,7 @@ parse_body_test () -> {ok, ["comma, test"," other line"]} = selenium:parse_body (array, "OK,comma\\\, test, other line"), ok. -start_session_test () -> +start_session () -> URL = "http://localhost:4444", io:format("Test~n"), Session = selenium: start (?HOST, @@ -182,7 +184,7 @@ start_session_test () -> selenium: stop (Session), ok. -high_level_test () -> +high_level () -> Config = selenium_config (), Commands = commands (), Results = selenium: run (Config, Commands), @@ -193,7 +195,6 @@ high_level_test () -> {{click, ["link"]}, {not_tested, {ok, none}}}, {{waitForPageToLoad, ["5000"]}, {not_tested, {ok, none}}}] = Results. - commands () -> [open (), get_text (), @@ -223,8 +224,6 @@ selenium_config () -> {browser, ?COMMAND}, {url, URL}]. - - id () -> "666". lib/selenium_remote/test/selenium_tests.erl @@ -6,46 +6,38 @@ %% @copyright 2009 Nicolas Charpentier -module(test_generator). --export ([api_tests/0]). --export ([start_session/0]). --export ([launch_session/0]). --export ([selenium_tests/0]). --export ([session_tests/0]). +-export([start_stop /1]). +-export([launch_close /1]). -start_session () -> - URL = "http://localhost:4444", - selenium: start (?HOST, ?PORT, ?COMMAND, URL). +-define (URL, "http://localhost:4444"). -launch_session () -> - URL = "http://localhost:4444", - selenium: launch_session (?HOST, ?PORT, ?COMMAND, URL). +start_stop(Module) -> + [{setup, fun start_session/0, fun stop_session/1, + fast_tests(Module)}]. -close_session (Session) -> - Session: stop_session (). +start_session () -> + selenium: start (?HOST, ?PORT, ?COMMAND, ?URL). stop_session (Session) -> selenium: stop (Session). -selenium_tests () -> - [{setup, fun start_session/0, - fun stop_session/1, - generate_tests_fun(selenium_tests)}]. +launch_close(Module) -> + [{setup, fun launch_session/0, fun close_session/1, + fast_tests(Module)}]. -api_tests () -> - [{setup, fun start_session/0, - fun stop_session/1, - generate_tests_fun(selenium_api_tests)}]. +launch_session () -> + selenium: launch_session (?HOST, ?PORT, ?COMMAND, ?URL). -session_tests () -> - [{setup, fun launch_session/0, - fun close_session/1, - generate_tests_fun(selenium_session_tests)}]. +close_session (Session) -> + Session: stop_session (). -generate_tests_fun(Module) -> +fast_tests (Module) -> + Tests = [default_server_test, + i18n_test, + utf8_test, + type_very_long_text_test, + keypress_test, + google_test], fun (X) -> - Tests = Module: fast_tests (), - [generate_test (T,X) || T <- Tests] + [{timeout, 60, fun() -> Module:T(X) end} || T <- Tests] end. - -generate_test (T, X) -> - {timeout, 60, fun() -> T(X) end}. lib/selenium_remote/test/test_generator.erl @@ -1,2 +1,2 @@ -{vsn,"2009-01"}. +{vsn,"r83"}. lib/selenium_remote/vsn.config @@ -91,7 +91,7 @@ namespace :erlang do def application_modules(app_file) modules = FileList.new(app_file.pathmap("%d/*.beam")).pathmap("%f").ext("") modules = modules.map {|item| item.gsub(/^([A-Z].*)/, '\'\1\'')} - modules = "[" + modules.join(', ') + "]" + modules = modules.join(', ') end def check_dependencies (file) rakelib/erlang.rake lib/selenium_remote/test/test.desc e359a8f971541e77847d224e9c959ed3f9edabfa charpi charpi@3ab005ec-33ed-11dd-9e78-a92e4af85449 http://github.com/charpi/erl_selenium/commit/75f077395c1f4bfd519322a52edd026e0a40eab2 75f077395c1f4bfd519322a52edd026e0a40eab2 2009-06-13T00:10:09-07:00 2009-06-13T00:10:09-07:00 Eunit tests refactoring. The use of test generators makes test.desc file obsolete. b2d59918ed3edaad37679a7b9fdda72a8e09938c charpi charpi@3ab005ec-33ed-11dd-9e78-a92e4af85449