Skip to content

Commit c443874

Browse files
committed
Fix broken real test and migrate mock data
1 parent c637c19 commit c443874

6 files changed

Lines changed: 26 additions & 582 deletions

File tree

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,10 +1009,10 @@ public void testVerified() throws Exception {
10091009
@Test
10101010
public void testTabs() throws Exception {
10111011
assertTabsContain(extractor().getTabs(),
1012-
ChannelTabs.VIDEOS, ChannelTabs.LIVESTREAMS, ChannelTabs.PLAYLISTS);
1012+
ChannelTabs.VIDEOS, ChannelTabs.LIVESTREAMS, ChannelTabs.PLAYLISTS, ChannelTabs.SHORTS);
10131013
assertTrue(extractor().getTabs().stream()
1014-
.filter(it -> ChannelTabs.VIDEOS.equals(it.getContentFilters().get(0)))
1015-
.allMatch(ReadyChannelTabListLinkHandler.class::isInstance));
1014+
.filter(it -> ChannelTabs.VIDEOS.equals(it.getContentFilters().get(0)))
1015+
.allMatch(ReadyChannelTabListLinkHandler.class::isInstance));
10161016
}
10171017

10181018
@Override

extractor/src/test/resources/mocks/v1/org/schabi/newpipe/extractor/services/youtube/youtubechannelextractor/channelwithpronouns/generated_mock_0.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"httpMethod": "GET",
44
"url": "https://www.youtube.com/sw.js",
55
"headers": {
6-
"Referer": [
6+
"Origin": [
77
"https://www.youtube.com"
88
],
9-
"Origin": [
9+
"Referer": [
1010
"https://www.youtube.com"
1111
],
1212
"Accept-Language": [
@@ -35,7 +35,7 @@
3535
"private, max-age\u003d0"
3636
],
3737
"content-security-policy": [
38-
"require-trusted-types-for \u0027script\u0027;report-uri /cspreport"
38+
"require-trusted-types-for \u0027script\u0027"
3939
],
4040
"content-type": [
4141
"text/javascript; charset\u003dutf-8"
@@ -44,13 +44,13 @@
4444
"same-origin; report-to\u003d\"youtube_main\""
4545
],
4646
"date": [
47-
"Sat, 12 Jul 2025 10:24:31 GMT"
47+
"Wed, 16 Jul 2025 18:13:08 GMT"
4848
],
4949
"document-policy": [
5050
"include-js-call-stacks-in-crash-reports"
5151
],
5252
"expires": [
53-
"Sat, 12 Jul 2025 10:24:31 GMT"
53+
"Wed, 16 Jul 2025 18:13:08 GMT"
5454
],
5555
"origin-trial": [
5656
"AmhMBR6zCLzDDxpW+HfpP67BqwIknWnyMOXOQGfzYswFmJe+fgaI6XZgAzcxOrzNtP7hEDsOo1jdjFnVr2IdxQ4AAAB4eyJvcmlnaW4iOiJodHRwczovL3lvdXR1YmUuY29tOjQ0MyIsImZlYXR1cmUiOiJXZWJWaWV3WFJlcXVlc3RlZFdpdGhEZXByZWNhdGlvbiIsImV4cGlyeSI6MTc1ODA2NzE5OSwiaXNTdWJkb21haW4iOnRydWV9"
@@ -65,14 +65,14 @@
6565
"{\"group\":\"youtube_main\",\"max_age\":2592000,\"endpoints\":[{\"url\":\"https://csp.withgoogle.com/csp/report-to/youtube_main\"}]}"
6666
],
6767
"reporting-endpoints": [
68-
"default\u003d\"/web-reports?context\u003deJwNzmtMzXEcx3G_PmM5_9P5_79fuZXVkYbRaUc5UYq5lVulYYvinEoncbrIOUeFzQNstmbMtSLzpCyTy4NWEg9sGLkMmZFlWp3ZIja3qfB98Hr0fX-2r-n72G7rLhXav0uleEpU9KpS1bavVF0_sFvlzqpQK5_tUemTvKom1at-NnrV1Q6vqu_yqUGrX-VE-dW5br-6-M6vPL2VarivUjUY2UHusOygSuGalh3UscUEt9uEH7UmfOsxoWrIhJy5GrRYDS_XaBjM0LAzV0Nrk4aOmxpOvtXwPqDBl2PGV5cZESVmOHxmlP0049P6EHTWhuDFyxDEbLQgucaCy-0WrH9gwQlRNGLBl1ELElJ0tKTp8BfqaPbo0Pw66o7qmHdWR5roq9URfEnHtfs6Jj_S0RltYGCpgWCXAZNwnDbwot5AVpeB808MXOg30PPLwKI_BkpGDGydQPDOIdyeT3A5CAlJhOoUwqElhLUbCOc3Ed47CelFhBvFhIKdhKFqwv790oi8w7KtITwVy47J7SQh_hRh8RlCT6Nsmwh3mwmhVwhWEd5CyGyVto0weovw7w5Be0xwPifwK4K9mxDoJbwOEKZ9InwZJHz8TTD_IVgEi1AxRYSJCGEV0WKmmCNihF3EiQSxUCSLxWKZWCF2DMv_I4TIv4TjYxgmxQgEMSzjGXsnMkqmMr6GMdrDGfWRjGArI206440YiGJ0zmZUxTAexDLi4xkOUSc2OxifExmjSYwZyYym5YzqVEabeCtsqxlhaxj_xJZ1jG3CJfLFduEWHlEh_KJa3M5gNGQyjmQxPuQyyp3SFTGGRV0Vg83BvUMP740zDgYanyLKVlXm8_ryC2P3Fubb3BVlpV5bYel2W0FFsbe4IM_jjLPHOewL7Imx8-zOcvt_GvrqVw\""
68+
"default\u003d\"/web-reports?context\u003deJwNzmtMzXEcx3G_85nU_386___3y1yq0dJEKl2ckMrcYqbCmFZRupxEdVSn02V5RputGXNPmCdlTKOZITHzwP0yiaHksrQslQdiXXZ8H7wefd-f7at9mdwZuFclFBWrUk-xCl5foko1p7q2v1RlhpSpta_KVfJ0l6pPcqmRJpe62uZSA4FulRHkVqc73erCJ7cq6qlSY9-r1HkzzeLwS7NUieyANEtbugaHQ8OfMxp-d2moHtKQsVCHNUKHITo26BhI0XGzWUdbq47uPh0VGVYMZ1thr7DCOWJF_yZftJ_xxZsOX4RttSG-3oZLt23Y9MiGo6Jg3IbBCRtiTQOxCQZa1hlw5xvQ3QYaDhmIOmUgSXhfNDDjqYH2YBN9K014Z5vQhP2EiTdnTWx-bqLxhYlzvSa6_ppYPmrCx2PiyRTCjqkEVyjh7mLCLjshNo5wYAWhcRuhO4uQXEC4XkjI3UOorZWbyD4ofT3hpVh1mDB0jBBznJB4ktDVRPjcTLh_mTD1CsG_hZB6U7pbhPE7BM89gs9jgv6M8OmFNG8J7_oIAf2EwQHCt38E6yjBJlhMEzOFn5gtAkWwmCdCRZiIFNEiViwV8SJRrBJrxO4x-XucYPcQjkxiaIrRZ2HYfBjFsxjDfozb_ozGOYwfQYy0EEb7fEbvAsbJUEZlGGP9IkZMDMMuGoSXnfFrGWMijjE3nlGayGhezahJYtwQH4VnAyN9IyNT7BQ5Ik84RJEoE25RI9pTGOdTGXWbGQ-2MH5uZ4xlML5mMpxZsimQjXgtxkRVOWOwjsFW7xvvex56mcMfGlotQeHVzgpXRU5-RGV-TrijzFniCs8vyQvPLSt0FebuKsqKjoy2Ry6JiomIiszaF_Uf5TPjYw\""
6969
],
7070
"server": [
7171
"ESF"
7272
],
7373
"set-cookie": [
74-
"YSC\u003dAQZO7rh45Wg; Domain\u003d.youtube.com; Path\u003d/; Secure; HttpOnly; SameSite\u003dnone",
75-
"VISITOR_INFO1_LIVE\u003d; Domain\u003d.youtube.com; Expires\u003dSun, 16-Oct-2022 10:24:31 GMT; Path\u003d/; Secure; HttpOnly; SameSite\u003dnone"
74+
"YSC\u003dpJRyhDmQDvA; Domain\u003d.youtube.com; Path\u003d/; Secure; HttpOnly; SameSite\u003dnone",
75+
"VISITOR_INFO1_LIVE\u003d; Domain\u003d.youtube.com; Expires\u003dThu, 20-Oct-2022 18:13:08 GMT; Path\u003d/; Secure; HttpOnly; SameSite\u003dnone"
7676
],
7777
"strict-transport-security": [
7878
"max-age\u003d31536000"

extractor/src/test/resources/mocks/v1/org/schabi/newpipe/extractor/services/youtube/youtubechannelextractor/channelwithpronouns/generated_mock_1.json

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

extractor/src/test/resources/mocks/v1/org/schabi/newpipe/extractor/services/youtube/youtubechannelextractor/channelwithpronouns/generated_mock_2.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"httpMethod": "POST",
44
"url": "https://www.youtube.com/youtubei/v1/navigation/resolve_url?prettyPrint\u003dfalse",
55
"headers": {
6-
"Referer": [
6+
"Origin": [
77
"https://www.youtube.com"
88
],
9-
"Origin": [
9+
"Referer": [
1010
"https://www.youtube.com"
1111
],
1212
"Cookie": [
@@ -362,7 +362,7 @@
362362
"application/json; charset\u003dUTF-8"
363363
],
364364
"date": [
365-
"Sat, 12 Jul 2025 10:24:33 GMT"
365+
"Wed, 16 Jul 2025 18:13:10 GMT"
366366
],
367367
"server": [
368368
"scaffolding on HTTPServer2"
@@ -382,7 +382,7 @@
382382
"0"
383383
]
384384
},
385-
"responseBody": "{\"responseContext\":{\"visitorData\":\"CgtDclowMm9wUEFEUSjh78jDBjIKCgJERRIEEgAgRA%3D%3D\",\"serviceTrackingParams\":[{\"service\":\"CSI\",\"params\":[{\"key\":\"c\",\"value\":\"WEB\"},{\"key\":\"cver\",\"value\":\"2.20250710.09.00\"},{\"key\":\"yt_li\",\"value\":\"0\"},{\"key\":\"ResolveUrl_rid\",\"value\":\"0x2bbb37db1f17014c\"}]},{\"service\":\"GFEEDBACK\",\"params\":[{\"key\":\"logged_in\",\"value\":\"0\"},{\"key\":\"e\",\"value\":\"23804281,23986025,24004644,24077241,24166867,24181174,24290153,24453989,24566687,24699899,39325854,39328892,51010235,51025415,51063643,51072748,51095478,51098299,51115184,51134507,51141472,51146014,51152050,51183910,51204329,51222973,51227037,51237842,51242448,51256074,51262158,51272458,51285052,51300176,51300241,51303432,51313109,51313767,51314158,51338524,51340662,51342857,51349914,51353393,51354083,51355912,51366423,51372971,51375205,51386540,51389629,51399452,51404808,51404810,51414747,51432294,51432529,51432560,51437205,51439005,51443158,51444283,51445757,51447191,51452420,51456629,51459424,51460559,51462020,51467525,51467676,51471745,51472205,51472817,51477846,51478868,51481410,51481788,51483631,51484222,51487680,51488476,51490158,51490224,51490331,51491126,51492930,51494655,51497739,51500050,51500153,51501895,51505436,51509183,51509543,51509613,51509706,51510637,51510815,51510887,51511440,51512708,51515823,51516181,51516746,51517140,51518123,51518179,51519388,51519754,51519960,51522022,51522473,51524403,51526397,51526691,51526700,51528905,51529338,51529759,51530495,51532166,51534990,51535073,51537779,51541345,51541882,100670016\"},{\"key\":\"visitor_data\",\"value\":\"CgtDclowMm9wUEFEUSjh78jDBjIKCgJERRIEEgAgRA%3D%3D\"}]},{\"service\":\"GUIDED_HELP\",\"params\":[{\"key\":\"logged_in\",\"value\":\"0\"}]},{\"service\":\"ECATCHER\",\"params\":[{\"key\":\"client.version\",\"value\":\"2.20250710\"},{\"key\":\"client.name\",\"value\":\"WEB\"}]}],\"mainAppWebResponseContext\":{\"loggedOut\":true},\"webResponseContextExtensionData\":{\"hasDecorated\":true}},\"endpoint\":{\"clickTrackingParams\":\"IhMI2bCgqY23jgMVkxwGAB1CMw2LMghleHRlcm5hbA\u003d\u003d\",\"commandMetadata\":{\"webCommandMetadata\":{\"url\":\"/youtubei/v1/navigation/resolve_url\",\"webPageType\":\"WEB_PAGE_TYPE_CHANNEL\",\"rootVe\":3611,\"apiUrl\":\"/youtubei/v1/browse\"},\"resolveUrlCommandMetadata\":{\"isVanityUrl\":true}},\"browseEndpoint\":{\"browseId\":\"UCEAXWzgcuF6XEiJcszhikQA\",\"params\":\"EgC4AQCSAwDyBgQKAjIA\"}}}",
385+
"responseBody": "{\"responseContext\":{\"visitorData\":\"Cgt2RUNyRHVXaXVnTSi219_DBjIKCgJERRIEEgAgZQ%3D%3D\",\"serviceTrackingParams\":[{\"service\":\"CSI\",\"params\":[{\"key\":\"c\",\"value\":\"WEB\"},{\"key\":\"cver\",\"value\":\"2.20250710.09.00\"},{\"key\":\"yt_li\",\"value\":\"0\"},{\"key\":\"ResolveUrl_rid\",\"value\":\"0xf920c3ffa235bd18\"}]},{\"service\":\"GFEEDBACK\",\"params\":[{\"key\":\"logged_in\",\"value\":\"0\"},{\"key\":\"e\",\"value\":\"23804281,23986026,24004644,24077241,24166867,24290153,24453989,24566687,24699899,39325854,39328892,51010235,51025415,51037346,51037353,51063643,51072748,51095478,51098299,51115184,51141472,51152050,51178320,51178327,51178340,51178353,51183910,51204329,51222973,51227037,51237842,51242448,51256074,51272458,51285052,51300176,51300241,51303432,51311031,51311038,51313109,51313767,51314158,51338524,51340662,51341228,51342857,51349914,51353393,51354567,51355912,51359177,51362071,51366423,51367489,51372971,51375205,51386540,51389629,51397095,51404808,51404810,51404953,51407629,51407634,51414747,51414985,51425030,51432294,51432529,51432560,51433503,51436340,51437205,51439005,51440725,51441712,51443158,51443167,51444283,51445757,51447191,51448332,51448401,51452420,51452479,51452495,51456423,51456629,51459025,51459424,51459470,51460093,51460559,51462020,51463383,51463530,51467525,51467676,51468320,51471745,51471783,51472205,51472817,51475686,51477496,51478868,51479905,51481788,51483631,51484222,51487681,51488476,51489568,51490158,51490224,51490331,51491126,51492548,51492930,51494655,51495294,51496341,51497739,51498459,51500051,51500153,51501529,51501786,51505436,51505848,51508689,51509183,51509543,51509613,51509659,51509706,51509946,51510319,51510638,51511094,51511440,51511952,51512708,51512854,51513635,51516181,51516746,51517140,51518123,51518179,51518806,51518819,51519388,51519754,51520229,51521506,51521954,51522198,51524403,51524497,51526398,51526691,51526700,51528113,51528610,51529338,51529395,51529759,51530495,51530723,51530731,51532166,51532252,51532623,51533017,51533386,51533391,51533400,51533403,51533566,51533803,51534316,51534328,51534335,51534340,51534349,51534352,51534361,51535073,51535264,51535728,51537766,51537771,51538053,51538220,51539094,51539470,51540077,51540717,51541811,51541883,51542227,51542866,51545122,51545592,51545646,100670017\"},{\"key\":\"visitor_data\",\"value\":\"Cgt2RUNyRHVXaXVnTSi219_DBjIKCgJERRIEEgAgZQ%3D%3D\"}]},{\"service\":\"GUIDED_HELP\",\"params\":[{\"key\":\"logged_in\",\"value\":\"0\"}]},{\"service\":\"ECATCHER\",\"params\":[{\"key\":\"client.version\",\"value\":\"2.20250710\"},{\"key\":\"client.name\",\"value\":\"WEB\"}]}],\"mainAppWebResponseContext\":{\"loggedOut\":true},\"webResponseContextExtensionData\":{\"hasDecorated\":true}},\"endpoint\":{\"clickTrackingParams\":\"IhMIi6avw_3BjgMVL3R6BR2Y7gUdMghleHRlcm5hbA\u003d\u003d\",\"commandMetadata\":{\"webCommandMetadata\":{\"url\":\"/youtubei/v1/navigation/resolve_url\",\"webPageType\":\"WEB_PAGE_TYPE_CHANNEL\",\"rootVe\":3611,\"apiUrl\":\"/youtubei/v1/browse\"},\"resolveUrlCommandMetadata\":{\"isVanityUrl\":true}},\"browseEndpoint\":{\"browseId\":\"UCEAXWzgcuF6XEiJcszhikQA\",\"params\":\"EgC4AQCSAwDyBgQKAjIA\"}}}",
386386
"latestUrl": "https://www.youtube.com/youtubei/v1/navigation/resolve_url?prettyPrint\u003dfalse"
387387
}
388388
}

extractor/src/test/resources/mocks/v1/org/schabi/newpipe/extractor/services/youtube/youtubechannelextractor/channelwithpronouns/generated_mock_3.json

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)