diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/router-rules.js b/testing/web-platform/tests/service-workers/service-worker/resources/router-rules.js index 3940f66cc5f50..71c09e7079cce 100644 --- a/testing/web-platform/tests/service-workers/service-worker/resources/router-rules.js +++ b/testing/web-platform/tests/service-workers/service-worker/resources/router-rules.js @@ -1,8 +1,5 @@ const TEST_CACHE_NAME = 'v1'; - -const CONDITION_MAX_RECURSION_DEPTH = 10; - const routerRules = { 'condition-urlpattern-constructed-source-network': [{ condition: {urlPattern: new URLPattern({pathname: '/**/direct.txt'})}, @@ -60,34 +57,6 @@ const routerRules = { condition: {requestMethod: String.fromCodePoint(0x3042)}, source: 'network' }], - 'condition-invalid-or-condition-depth': (() => { - const addOrCondition = (depth) => { - if (depth > CONDITION_MAX_RECURSION_DEPTH) { - return {urlPattern: '/foo'}; - } - return { - or: [addOrCondition(depth + 1)] - }; - }; - return {condition: addOrCondition(1), source: 'network'}; - })(), - 'condition-invalid-not-condition-depth': (() => { - const generateNotCondition = (depth) => { - if (depth > CONDITION_MAX_RECURSION_DEPTH) { - return { - urlPattern: '/**/example.txt', - }; - } - return {not: generateNotCondition(depth + 1)}; - }; - return {condition: generateNotCondition(1), source: 'network'}; - })(), - 'condition-invalid-router-size': [...Array(512)].map((val, i) => { - return { - condition: {urlPattern: `/foo-${i}`}, - source: 'network' - }; - }), 'condition-request-destination-script-network': [{condition: {requestDestination: 'script'}, source: 'network'}], 'condition-or-source-network': [{ diff --git a/testing/web-platform/tests/service-workers/service-worker/static-router-invalid-rules.https.html b/testing/web-platform/tests/service-workers/service-worker/static-router-invalid-rules.https.html index 15b8ef5742d7d..05f39f2c9dce4 100644 --- a/testing/web-platform/tests/service-workers/service-worker/static-router-invalid-rules.https.html +++ b/testing/web-platform/tests/service-workers/service-worker/static-router-invalid-rules.https.html @@ -15,12 +15,6 @@ const ROUTER_RULE_KEY_INVALID_REQUEST_METHOD = 'condition-invalid-request-method'; -const ROUTER_RULE_KEY_INVALID_OR_CONDITION_DEPTH = - 'condition-invalid-or-condition-depth'; -const ROUTER_RULE_KEY_INVALID_NOT_CONDITION_DEPTH = - 'condition-invalid-not-condition-depth'; -const ROUTER_RULE_KEY_INVALID_ROUTER_SIZE = - 'condition-invalid-router-size'; const ROUTER_RULE_KEY_LACK_OF_CONDITION = 'condition-lack-of-condition'; const ROUTER_RULE_KEY_LACK_OF_SOURCE = @@ -33,27 +27,6 @@ assert_equals(errors.length, 1); }, 'addRoutes should raise for invalid request method.'); -promise_test(async t => { - const worker = await registerAndActivate(t, ROUTER_RULE_KEY_INVALID_OR_CONDITION_DEPTH); - t.add_cleanup(() => {reset_info_in_worker(worker)}); - const {errors} = await get_info_from_worker(worker); - assert_equals(errors.length, 1); -}, 'addRoutes should raise if or condition exceeds the depth limit'); - -promise_test(async t => { - const worker = await registerAndActivate(t, ROUTER_RULE_KEY_INVALID_NOT_CONDITION_DEPTH); - t.add_cleanup(() => {reset_info_in_worker(worker)}); - const {errors} = await get_info_from_worker(worker); - assert_equals(errors.length, 1); -}, 'addRoutes should raise if not condition exceeds the depth limit'); - -promise_test(async t => { - const worker = await registerAndActivate(t, ROUTER_RULE_KEY_INVALID_ROUTER_SIZE); - t.add_cleanup(() => {reset_info_in_worker(worker)}); - const {errors} = await get_info_from_worker(worker); - assert_equals(errors.length, 1); -}, 'addRoutes should raise if the number of router rules exceeds the length limit'); - promise_test(async t => { const worker = await registerAndActivate(t, ROUTER_RULE_KEY_LACK_OF_CONDITION); t.add_cleanup(() => {reset_info_in_worker(worker)});