Skip to content

Commit

Permalink
Merge pull request #229 from zebrunner/develop
Browse files Browse the repository at this point in the history
1.2.12
  • Loading branch information
vdelendik authored Oct 24, 2024
2 parents 5682535 + cf1a51a commit f6c575c
Show file tree
Hide file tree
Showing 8 changed files with 343 additions and 294 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@
<snapshotRepository>
<id>ZBR_Nexus</id>
<name>Zebrunner Snapshots</name>
<url>https://nexus.zebrunner.dev/repository/ce-snapshots/</url>
<url>https://public-nexus.zebrunner.com/repository/ce-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
29 changes: 24 additions & 5 deletions src/main/java/com/zebrunner/carina/webdriver/CarinaDriver.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,19 @@
*******************************************************************************/
package com.zebrunner.carina.webdriver;

import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.openqa.selenium.Capabilities;
import org.openqa.selenium.WebDriver;

import com.zebrunner.carina.webdriver.TestPhase.Phase;
import com.zebrunner.carina.webdriver.device.Device;

public class CarinaDriver {
private String name;
private WebDriver driver;
private Device device;
private Phase phase;
private final String name;
private final WebDriver driver;
private final Device device;
private final Phase phase;
private long threadId;
private final Capabilities originalCapabilities;

Expand Down Expand Up @@ -66,11 +68,28 @@ protected void setThreadId(long threadId) {
/**
* Get capabilities that used for creating driver.<br>
* <b>For internal usage only</b>
*
*
* @return {@link Capabilities}
*/
public Capabilities getOriginalCapabilities() {
return originalCapabilities;
}

@Override
public boolean equals(Object o) {
if (this == o)
return true;

if (o == null || getClass() != o.getClass())
return false;

CarinaDriver driver = (CarinaDriver) o;

return new EqualsBuilder().append(threadId, driver.threadId).append(name, driver.name).isEquals();
}

@Override
public int hashCode() {
return new HashCodeBuilder(17, 37).append(name).append(threadId).toHashCode();
}
}
Loading

0 comments on commit f6c575c

Please sign in to comment.