Skip to content

Commit

Permalink
Updating .NET build dependencies for updated java targets
Browse files Browse the repository at this point in the history
  • Loading branch information
jimevans committed Jun 16, 2016
1 parent 8eb46e5 commit c5aeece
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions dotnet/test/common/Environment/RemoteSeleniumServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace OpenQA.Selenium.Environment
public class RemoteSeleniumServer
{
private Process webserverProcess;
private string serverJarName = @"build\java\server\src\org\openqa\selenium\server\server-standalone.jar";
private string serverJarName = @"buck-out\gen\java\server\src\org\openqa\grid\selenium\selenium.jar";
private string projectRootPath;
private bool autoStart;

Expand All @@ -33,7 +33,7 @@ public void Start()
while (!isRunning && DateTime.Now < timeout)
{
// Poll until the webserver is correctly serving pages.
HttpWebRequest request = WebRequest.Create("http://localhost:6000/selenium-server/driver?cmd=getLogMessages") as HttpWebRequest;
HttpWebRequest request = WebRequest.Create("http://localhost:6000/wd/hub/status") as HttpWebRequest;
try
{
HttpWebResponse response = request.GetResponse() as HttpWebResponse;
Expand Down
6 changes: 3 additions & 3 deletions dotnet/test/common/Environment/TestWebServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class TestWebServer
{
private Process webserverProcess;

private string standaloneTestJar = @"build/java/client/test/org/openqa/selenium/tests-standalone.jar";
private string standaloneTestJar = @"buck-out/gen/java/client/test/org/openqa/selenium/environment/webserver.jar";
private string webserverClassName = "org.openqa.selenium.environment.webserver.JettyAppServer";
private string projectRootPath;

Expand All @@ -27,9 +27,9 @@ public void Start()
{
throw new FileNotFoundException(
string.Format(
"Standalone test jar at {0} didn't exist - please build it using something like {1}",
"Test webserver jar at {0} didn't exist - please build it using something like {1}",
standaloneTestJar,
"go //java/client/test/org/openqa/selenium:tests:uber"));
"go //java/client/test/org/openqa/selenium/environment:webserver"));
}

string javaExecutableName = "java";
Expand Down
2 changes: 1 addition & 1 deletion dotnet/test/common/build.desc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dotnet_library(name = "common",
deps = [
"//java/client/test/org/openqa/selenium:tests"
"//java/client/test/org/openqa/selenium/environment:webserver"
],
srcs = "**/*.cs",
refs = [
Expand Down
2 changes: 1 addition & 1 deletion dotnet/test/remote/build.desc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dotnet_test(name = "remote",
deps = [
"//java/server/src/org/openqa/selenium/server:server"
"//java/server/src/org/openqa/grid/selenium:selenium"
],
srcs = "**/*.cs",
refs = [
Expand Down

0 comments on commit c5aeece

Please sign in to comment.