Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from jitsi:master #141

Merged
merged 1 commit into from
Aug 9, 2024
Merged

[pull] master from jitsi:master #141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 2 additions & 19 deletions src/test/java/org/jitsi/meet/test/SharedVideoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,9 @@ public class SharedVideoTest
extends WebTestBase
{
/**
* Links to youtube videos and their expected urls, used for loading and
* Links to videos and their expected urls, used for loading and
* testing.
*/
private static String V1_VIDEO_ID = "xNXN7CZk8X0";
private static String V1_LINK = "https://www.youtube.com/watch?v=" + V1_VIDEO_ID;
public static String V2_LINK = "https://archive.org/download/BigBuckBunny_124/Content/big_buck_bunny_720p_surround.mp4";
private static String V2_VIDEO_ID = V2_LINK;

Expand Down Expand Up @@ -76,7 +74,7 @@ public void setupClass()
@Test
public void startSharingVideo()
{
startSharingVideoByUrl(V1_LINK, V1_VIDEO_ID, true);
startSharingVideoByUrl(V2_LINK, V2_VIDEO_ID, true);

checkRunning();

Expand Down Expand Up @@ -376,22 +374,7 @@ public void stopSharingTest()
}
}

/**
* Starts sharing another video.
*/
@Test(dependsOnMethods = { "stopSharingTest" })
public void startSharingDifferentVideo()
{
startSharingVideoByUrl(V2_LINK, V2_VIDEO_ID, true);

checkRunning();

checkUrls();

stopSharingTest();
}

@Test(dependsOnMethods = { "startSharingDifferentVideo" })
public void startSharingDifferentVideoAfterStop()
{
startSharingVideoByUrl(V2_LINK, V2_VIDEO_ID, true);
Expand Down
Loading