Skip to content
This repository has been archived by the owner on May 22, 2018. It is now read-only.

Commit

Permalink
Re-arrange build.desc files so shared js_fragment definitions are pul…
Browse files Browse the repository at this point in the history
…led out

into their own namespace. Also moving the fragments that only depend upon
//javascript/atoms under that tree.
  • Loading branch information
jleyba committed Oct 22, 2013
1 parent 9f89f42 commit 2fe9ff3
Show file tree
Hide file tree
Showing 11 changed files with 513 additions and 505 deletions.
28 changes: 14 additions & 14 deletions iphone/build.desc
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
js_fragment_header(name = "atoms",
deps = [
"//javascript/iphone-driver:execute_async_script:ios",
"//javascript/webdriver/atoms:clear:ios",
"//javascript/webdriver/atoms:click:ios",
"//javascript/webdriver/atoms:execute_script:ios",
"//javascript/webdriver/atoms:find_element:ios",
"//javascript/webdriver/atoms:find_elements:ios",
"//javascript/webdriver/atoms:get_attribute:ios",
"//javascript/webdriver/atoms:get_effective_style:ios",
"//javascript/webdriver/atoms:get_location:ios",
"//javascript/webdriver/atoms:get_text:ios",
"//javascript/webdriver/atoms:is_displayed:ios",
"//javascript/webdriver/atoms:is_enabled:ios",
"//javascript/webdriver/atoms:is_selected:ios",
"//javascript/webdriver/atoms:submit:ios",
"//javascript/webdriver/atoms:type:ios",
"//javascript/atoms/fragments:clear:ios",
"//javascript/atoms/fragments:click:ios",
"//javascript/atoms/fragments:execute_script:ios",
"//javascript/atoms/fragments:find_element:ios",
"//javascript/atoms/fragments:find_elements:ios",
"//javascript/atoms/fragments:get_effective_style:ios",
"//javascript/atoms/fragments:get_location:ios",
"//javascript/atoms/fragments:is_displayed:ios",
"//javascript/atoms/fragments:is_enabled:ios",
"//javascript/atoms/fragments:submit:ios",
"//javascript/atoms/fragments:type:ios",
"//javascript/webdriver/atoms/fragments:get_attribute:ios",
"//javascript/webdriver/atoms/fragments:get_text:ios",
"//javascript/webdriver/atoms/fragments:is_selected:ios",
],
out = "iphone/src/objc/atoms.h",
utf8 = "true")
4 changes: 2 additions & 2 deletions java/client/test/org/openqa/selenium/atoms/build.desc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ rename(
name = "execute_script",
out = "execute_script.js",
deps = [
"//javascript/webdriver/atoms:execute_script.js",
"//javascript/atoms/fragments:execute_script.js",
])


Expand All @@ -13,7 +13,7 @@ java_test(name = "test",
":execute_script",
],
deps = [
"//javascript/webdriver/atoms:execute_script",
"//javascript/atoms/fragments:execute_script",
"//java/client/test/org/openqa/selenium:build",
"//java/client/test/org/openqa/selenium/testing:util",
"//third_party/java/guava-libraries",
Expand Down
66 changes: 33 additions & 33 deletions javascript/android-driver/build.desc
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
js_fragment_java(name = "atoms",
deps = [
"//javascript/webdriver/atoms:execute_async_script:android",
"//javascript/webdriver/atoms:execute_script:android",
"//javascript/webdriver/atoms/inject:active_element:android",
"//javascript/webdriver/atoms/inject:clear:android",
"//javascript/webdriver/atoms/inject:clear_local_storage:android",
"//javascript/webdriver/atoms/inject:clear_session_storage:android",
"//javascript/webdriver/atoms/inject:click:android",
"//javascript/webdriver/atoms/inject:default_content:android",
"//javascript/webdriver/atoms/inject:find_element:android",
"//javascript/webdriver/atoms/inject:find_elements:android",
"//javascript/webdriver/atoms/inject:frame_by_id_or_name:android",
"//javascript/webdriver/atoms/inject:frame_by_index:android",
"//javascript/webdriver/atoms/inject:get_attribute_value:android",
"//javascript/webdriver/atoms/inject:get_frame_window:android",
"//javascript/webdriver/atoms/inject:get_local_storage_item:android",
"//javascript/webdriver/atoms/inject:get_local_storage_keys:android",
"//javascript/webdriver/atoms/inject:get_local_storage_size:android",
"//javascript/webdriver/atoms/inject:get_session_storage_item:android",
"//javascript/webdriver/atoms/inject:get_session_storage_keys:android",
"//javascript/webdriver/atoms/inject:get_session_storage_size:android",
"//javascript/webdriver/atoms/inject:get_size:android",
"//javascript/webdriver/atoms/inject:get_text:android",
"//javascript/webdriver/atoms/inject:get_top_left_coordinates:android",
"//javascript/webdriver/atoms/inject:get_value_of_css_property:android",
"//javascript/webdriver/atoms/inject:is_displayed:android",
"//javascript/webdriver/atoms/inject:is_enabled:android",
"//javascript/webdriver/atoms/inject:is_selected:android",
"//javascript/webdriver/atoms/inject:remove_local_storage_item:android",
"//javascript/webdriver/atoms/inject:remove_session_storage_item:android",
"//javascript/webdriver/atoms/inject:set_local_storage_item:android",
"//javascript/webdriver/atoms/inject:set_session_storage_item:android",
"//javascript/webdriver/atoms/inject:submit:android",
"//javascript/webdriver/atoms/inject:get_appcache_status:android",
"//javascript/atoms/fragments:execute_async_script:android",
"//javascript/atoms/fragments:execute_script:android",
"//javascript/webdriver/atoms/fragments/inject:active_element:android",
"//javascript/webdriver/atoms/fragments/inject:clear:android",
"//javascript/webdriver/atoms/fragments/inject:clear_local_storage:android",
"//javascript/webdriver/atoms/fragments/inject:clear_session_storage:android",
"//javascript/webdriver/atoms/fragments/inject:click:android",
"//javascript/webdriver/atoms/fragments/inject:default_content:android",
"//javascript/webdriver/atoms/fragments/inject:find_element:android",
"//javascript/webdriver/atoms/fragments/inject:find_elements:android",
"//javascript/webdriver/atoms/fragments/inject:frame_by_id_or_name:android",
"//javascript/webdriver/atoms/fragments/inject:frame_by_index:android",
"//javascript/webdriver/atoms/fragments/inject:get_attribute_value:android",
"//javascript/webdriver/atoms/fragments/inject:get_frame_window:android",
"//javascript/webdriver/atoms/fragments/inject:get_local_storage_item:android",
"//javascript/webdriver/atoms/fragments/inject:get_local_storage_keys:android",
"//javascript/webdriver/atoms/fragments/inject:get_local_storage_size:android",
"//javascript/webdriver/atoms/fragments/inject:get_session_storage_item:android",
"//javascript/webdriver/atoms/fragments/inject:get_session_storage_keys:android",
"//javascript/webdriver/atoms/fragments/inject:get_session_storage_size:android",
"//javascript/webdriver/atoms/fragments/inject:get_size:android",
"//javascript/webdriver/atoms/fragments/inject:get_text:android",
"//javascript/webdriver/atoms/fragments/inject:get_top_left_coordinates:android",
"//javascript/webdriver/atoms/fragments/inject:get_value_of_css_property:android",
"//javascript/webdriver/atoms/fragments/inject:is_displayed:android",
"//javascript/webdriver/atoms/fragments/inject:is_enabled:android",
"//javascript/webdriver/atoms/fragments/inject:is_selected:android",
"//javascript/webdriver/atoms/fragments/inject:remove_local_storage_item:android",
"//javascript/webdriver/atoms/fragments/inject:remove_session_storage_item:android",
"//javascript/webdriver/atoms/fragments/inject:set_local_storage_item:android",
"//javascript/webdriver/atoms/fragments/inject:set_session_storage_item:android",
"//javascript/webdriver/atoms/fragments/inject:submit:android",
"//javascript/webdriver/atoms/fragments/inject:get_appcache_status:android",
],
utf8 = "true",
package = "org.openqa.selenium.android.library")
137 changes: 137 additions & 0 deletions javascript/atoms/fragments/build.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
js_fragment(
name = "clear",
function = "bot.action.clear",
module = "bot.action",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "click",
function = "bot.action.click",
module = "bot.action",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "execute_script",
function = "bot.inject.executeScript",
module = "bot.inject",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "execute_async_script",
function = "bot.inject.executeAsyncScript",
module = "bot.inject",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "find_element",
function = "bot.locators.findElement",
module = "bot.locators",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "find_elements",
function = "bot.locators.findElements",
module = "bot.locators",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "get_effective_style",
function = "bot.dom.getEffectiveStyle",
module = "bot.dom",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "get_location",
function = "goog.style.getPageOffset",
module = "goog.style",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "get_size",
function = "goog.style.getSize",
module = "goog.style",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "is_displayed",
function = "bot.dom.isShown",
module = "bot.dom",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "is_editable",
function = "bot.dom.isEditable",
module = "bot.dom",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "is_enabled",
function = "bot.dom.isEnabled",
module = "bot.dom",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "is_interactable",
function = "bot.dom.isInteractable",
module = "bot.dom",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "submit",
function = "bot.action.submit",
module = "bot.action",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "type",
function = "bot.action.type",
module = "bot.action",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "get_frame_index",
function = "bot.frame.getFrameIndex",
module = "bot.frame",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "get_window_size",
function = "bot.window.getSize",
module = "bot.window",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "set_window_size",
function = "bot.window.setSize",
module = "bot.window",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "get_window_position",
function = "bot.window.getPosition",
module = "bot.window",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "set_window_position",
function = "bot.window.setPosition",
module = "bot.window",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "is_online",
function = "bot.connection.isOnline",
module = "bot.connection",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "get_current_position",
function = "bot.geolocation.getCurrentPosition",
module = "bot.geolocation",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "execute_sql",
function = "bot.storage.database.executeSql",
module = "bot.storage.database",
deps = [ "//javascript/atoms:all_js" ])
65 changes: 32 additions & 33 deletions javascript/chrome-driver/build.desc
Original file line number Diff line number Diff line change
Expand Up @@ -35,43 +35,42 @@ js_test(name = "test",

js_fragment_cpp(name = "atoms",
deps = [
"//javascript/atoms/fragments:clear:chrome",
"//javascript/atoms/fragments:click:chrome",
"//javascript/atoms/fragments:execute_async_script:chrome",
"//javascript/atoms/fragments:execute_script:chrome",
"//javascript/atoms/fragments:execute_sql:chrome",
"//javascript/atoms/fragments:find_element:chrome",
"//javascript/atoms/fragments:find_elements:chrome",
"//javascript/atoms/fragments:get_effective_style:chrome",
"//javascript/atoms/fragments:get_location:chrome",
"//javascript/atoms/fragments:get_size:chrome",
"//javascript/atoms/fragments:is_displayed:chrome",
"//javascript/atoms/fragments:is_enabled:chrome",
"//javascript/atoms/fragments:is_online:chrome",
"//javascript/atoms/fragments:submit:chrome",
"//javascript/chrome-driver:get_first_client_rect:chrome",
"//javascript/chrome-driver:get_location_in_view:chrome",
"//javascript/chrome-driver:get_page_zoom:chrome",
"//javascript/chrome-driver:is_element_clickable:chrome",
"//javascript/webdriver/atoms:clear:chrome",
"//javascript/webdriver/atoms:clear_local_storage:chrome",
"//javascript/webdriver/atoms:clear_session_storage:chrome",
"//javascript/webdriver/atoms:click:chrome",
"//javascript/webdriver/atoms:execute_async_script:chrome",
"//javascript/webdriver/atoms:execute_script:chrome",
"//javascript/webdriver/atoms:execute_sql:chrome",
"//javascript/webdriver/atoms:find_element:chrome",
"//javascript/webdriver/atoms:find_elements:chrome",
"//javascript/webdriver/atoms:get_appcache_status:chrome",
"//javascript/webdriver/atoms:get_attribute:chrome",
"//javascript/webdriver/atoms:get_effective_style:chrome",
"//javascript/webdriver/atoms:get_in_view_location:chrome",
"//javascript/webdriver/atoms:get_local_storage_item:chrome",
"//javascript/webdriver/atoms:get_local_storage_key:chrome",
"//javascript/webdriver/atoms:get_local_storage_keys:chrome",
"//javascript/webdriver/atoms:get_local_storage_size:chrome",
"//javascript/webdriver/atoms:get_session_storage_item:chrome",
"//javascript/webdriver/atoms:get_session_storage_key:chrome",
"//javascript/webdriver/atoms:get_session_storage_keys:chrome",
"//javascript/webdriver/atoms:get_session_storage_size:chrome",
"//javascript/webdriver/atoms:get_location:chrome",
"//javascript/webdriver/atoms:get_size:chrome",
"//javascript/webdriver/atoms:get_text:chrome",
"//javascript/webdriver/atoms:is_displayed:chrome",
"//javascript/webdriver/atoms:is_enabled:chrome",
"//javascript/webdriver/atoms:is_online:chrome",
"//javascript/webdriver/atoms:is_selected:chrome",
"//javascript/webdriver/atoms:remove_local_storage_item:chrome",
"//javascript/webdriver/atoms:remove_session_storage_item:chrome",
"//javascript/webdriver/atoms:set_local_storage_item:chrome",
"//javascript/webdriver/atoms:set_session_storage_item:chrome",
"//javascript/webdriver/atoms:submit:chrome",
"//javascript/webdriver/atoms/fragments:clear_local_storage:chrome",
"//javascript/webdriver/atoms/fragments:clear_session_storage:chrome",
"//javascript/webdriver/atoms/fragments:get_appcache_status:chrome",
"//javascript/webdriver/atoms/fragments:get_attribute:chrome",
"//javascript/webdriver/atoms/fragments:get_local_storage_item:chrome",
"//javascript/webdriver/atoms/fragments:get_local_storage_key:chrome",
"//javascript/webdriver/atoms/fragments:get_local_storage_keys:chrome",
"//javascript/webdriver/atoms/fragments:get_local_storage_size:chrome",
"//javascript/webdriver/atoms/fragments:get_session_storage_item:chrome",
"//javascript/webdriver/atoms/fragments:get_session_storage_key:chrome",
"//javascript/webdriver/atoms/fragments:get_session_storage_keys:chrome",
"//javascript/webdriver/atoms/fragments:get_session_storage_size:chrome",
"//javascript/webdriver/atoms/fragments:get_text:chrome",
"//javascript/webdriver/atoms/fragments:is_selected:chrome",
"//javascript/webdriver/atoms/fragments:remove_local_storage_item:chrome",
"//javascript/webdriver/atoms/fragments:remove_session_storage_item:chrome",
"//javascript/webdriver/atoms/fragments:set_local_storage_item:chrome",
"//javascript/webdriver/atoms/fragments:set_session_storage_item:chrome",
],
extension = "cc",
utf8 = "true")
28 changes: 14 additions & 14 deletions javascript/ie-driver/build.desc
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,23 @@ js_test(name = "test",

js_fragment_header(name = "atoms",
deps = [
"//javascript/atoms/fragments:click:ie",
"//javascript/atoms/fragments:clear:ie",
"//javascript/atoms/fragments:get_effective_style:ie",
"//javascript/atoms/fragments:get_location:ie",
"//javascript/atoms/fragments:get_size:ie",
"//javascript/atoms/fragments:is_displayed:ie",
"//javascript/atoms/fragments:is_editable:ie",
"//javascript/atoms/fragments:is_enabled:ie",
"//javascript/atoms/fragments:is_interactable:ie",
"//javascript/atoms/fragments:submit:ie",
"//javascript/ie-driver:find_element:ie",
"//javascript/ie-driver:find_elements:ie",
"//javascript/ie-driver:is_in_parent_overflow:ie",
"//javascript/webdriver/atoms:click:ie",
"//javascript/webdriver/atoms:clear:ie",
"//javascript/webdriver/atoms:get_attribute:ie",
"//javascript/webdriver/atoms:get_effective_style:ie",
"//javascript/webdriver/atoms:get_location:ie",
"//javascript/webdriver/atoms:get_size:ie",
"//javascript/webdriver/atoms:get_text:ie",
"//javascript/webdriver/atoms:is_displayed:ie",
"//javascript/webdriver/atoms:is_editable:ie",
"//javascript/webdriver/atoms:is_enabled:ie",
"//javascript/webdriver/atoms:is_interactable:ie",
"//javascript/webdriver/atoms:is_selected:ie",
"//javascript/webdriver/atoms:submit:ie",
"//javascript/webdriver/atoms:inputs"
"//javascript/webdriver/atoms:inputs",
"//javascript/webdriver/atoms/fragments:get_attribute:ie",
"//javascript/webdriver/atoms/fragments:get_text:ie",
"//javascript/webdriver/atoms/fragments:is_selected:ie",
],
out = "cpp/iedriver/Generated/atoms.h"
)
Loading

0 comments on commit 2fe9ff3

Please sign in to comment.