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.

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

support port which not default to 443 #282

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/test/java/org/jitsi/meet/test/IFrameAPITest.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void testIFrameAPI()
String domain;
try
{
domain = iFrameUrl.getHost();
domain = iFrameUrl.getHostWithPort();
}
catch (MalformedURLException e)
{
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/jitsi/meet/test/RestTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public boolean skipTestByDefault()
public void testRestAPI()
throws MalformedURLException
{
serverAddress = getJitsiMeetUrl().getHost();
serverAddress = getJitsiMeetUrl().getHostWithPort();

checkJicofoHealth();
checkJVBHealth();
Expand Down
21 changes: 21 additions & 0 deletions src/test/java/org/jitsi/meet/test/base/JitsiMeetUrl.java
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,27 @@ public String getHost()
return toUrl().getHost();
}

/**
* @return a port part of the URL returned by {@link #toUrl()}.
* @throws MalformedURLException the same as in {@link #toUrl()}.
*/
public int getPort()
throws MalformedURLException
{
return toUrl().getPort();
}

public String getHostWithPort()
throws MalformedURLException
{
int port = getPort();
if (port != 443) {
return getHost() + ":" + port;
} else {
return getHost();
}
}

/**
* @return obtains {@link #roomName} part of the conference URL.
*/
Expand Down