conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
@RelatedIssue(issueID = "SOC-622")
=======
>>>>>>>
@RelatedIssue(issueID = "MAIN-4322") |
<<<<<<<
@FindBy(css = ".tools-menu li > a[data-name='themedesigner]'")
private WebElement themeDesignerButton;
=======
>>>>>>>
@FindBy(css = ".tools-menu li > a[data-name='themedesigner]'")
private WebElement themeDesignerButton;
<<<<<<<
jQueryClick(
waitForElementByCss(String.format(toolbarToolCss, toolName))
=======
jsActions.click(
wait.forElementVisible(By.cssSelector(String.format(toolbarToolCss, toolName)))
>>>>>>>
jsActions.click(
wait.forElementVisible(By.cssSelector(String.format(toolbarToolCss, toolName)))
<<<<<<<
waitForElementByElement(pageWatchlistStatusMessage);
waitForValueToBePresentInElementsAttributeByCss(String.format(toolbarToolCss, PageContent.FOLLOW),
=======
wait.forElementVisible(pageWatchlistStatusMessage);
waitForValueToBePresentInElementsAttributeByCss(String.format(toolbarToolCss, "follow"),
>>>>>>>
waitForElementByElement(pageWatchlistStatusMessage);
waitForValueToBePresentInElementsAttributeByCss(String.format(toolbarToolCss, PageContent.FOLLOW), |
<<<<<<<
import java.io.IOException;
import java.net.URISyntaxException;
=======
import java.io.File;
import java.time.LocalDateTime;
>>>>>>>
import java.io.IOException;
import java.net.URISyntaxException;
import java.time.LocalDateTime; |
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
public void anonUserOnDesktopCanSeeGuidelinesImageArea() {
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
public void anonUserOnDesktopCanSeeGuidelinesHeroUnit() {
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
public void anonUserOnDesktopCanSeeGuidelinesImageArea() {
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
public void regularUserOnDesktopCanSeeGuidelinesImageArea() {
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
public void regularUserOnDesktopCanSeeGuidelinesHeroUnit() {
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
public void regularUserOnDesktopCanSeeGuidelinesImageArea() {
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
public void discussionsModeratorOnDesktopCanSeeGuidelinesImageArea() {
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
public void discussionsModeratorOnDesktopCanSeeGuidelinesHeroUnit() {
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
public void discussionsModeratorOnDesktopCanSeeGuidelinesImageArea() {
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
public void staffOnDesktopCanSeeGuidelinesImageArea() {
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
public void staffOnDesktopCanSeeGuidelinesHeroUnit() {
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
public void staffOnDesktopCanSeeGuidelinesImageArea() {
<<<<<<<
@InBrowser(browser = Browser.CHROME, browserSize = DESKTOP_RESOLUTION)
=======
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG)
>>>>>>>
@InBrowser(emulator = Emulator.DESKTOP_BREAKPOINT_BIG) |
<<<<<<<
@Test(groups = "MercuryLightboxTest_002")
@InBrowser(browser = BrowserType.CHROME_ANDROID)
public void MercuryLightboxTest_002_TapOnEdgesChangeImages_SwipeChangeImages() {
=======
@Test(groups = "mercury_lightbox_changeImageByTapOnEdgeAndByGesture")
@InBrowser(browser = Browser.CHROME_ANDROID)
public void mercury_lightbox_changeImageByTapOnEdgeAndByGesture() {
>>>>>>>
@Test(groups = "mercury_lightbox_changeImageByTapOnEdgeAndByGesture")
@InBrowser(browser = BrowserType.CHROME_ANDROID)
public void mercury_lightbox_changeImageByTapOnEdgeAndByGesture() {
<<<<<<<
@Test(groups = "MercuryLightboxTest_003")
@InBrowser(browser = BrowserType.CHROME_ANDROID)
public void MercuryLightboxTest_003_ZoomByGesture_ZoomByDoubleTap() {
=======
@Test(groups = "mercury_lightbox_zoomByGestureAndByDoubleTap")
@InBrowser(browser = Browser.CHROME_ANDROID)
public void mercury_lightbox_zoomByGestureAndByDoubleTap() {
>>>>>>>
@Test(groups = "mercury_lightbox_zoomByGestureAndByDoubleTap")
@InBrowser(browser = BrowserType.CHROME_ANDROID)
public void mercury_lightbox_zoomByGestureAndByDoubleTap() {
<<<<<<<
@Test(groups = "MercuryLightboxTest_006")
@InBrowser(browser = BrowserType.CHROME_ANDROID)
public void MercuryLightboxTest_006_MovingOnZoomedImage() {
=======
@Test(groups = "mercury_lightbox_moveImageWhileZoomed")
@InBrowser(browser = Browser.CHROME_ANDROID)
public void mercury_lightbox_moveImageWhileZoomed() {
>>>>>>>
@Test(groups = "mercury_lightbox_moveImageWhileZoomed")
@InBrowser(browser = BrowserType.CHROME_ANDROID)
public void mercury_lightbox_moveImageWhileZoomed() { |
<<<<<<<
private URLsContent() {
}
=======
//Wikis with smart banners
public static final String SMART_BANNER_GTA = "gta";
public static final String SMART_BANNER_GLEE = "glee";
>>>>>>>
//Wikis with smart banners
public static final String SMART_BANNER_GTA = "gta";
public static final String SMART_BANNER_GLEE = "glee";
private URLsContent() {
} |
<<<<<<<
import com.wikia.webdriver.common.core.annotations.RelatedIssue;
import com.wikia.webdriver.common.core.annotations.ExecuteAs;
import com.wikia.webdriver.common.core.annotations.User;
=======
import com.wikia.webdriver.common.core.configuration.Configuration;
>>>>>>>
import com.wikia.webdriver.common.core.annotations.RelatedIssue;
import com.wikia.webdriver.common.core.configuration.Configuration; |
<<<<<<<
@Test(groups = "MercuryVKWidgetTest_004")
@Execute(onWikia = "mercuryautomationtesting")
public void MercuryVKWidgetTest_004_areLoadedOnFirstVisitDirectlyFromUrl() {
VKWidgetPageObject vkWidget = new VKWidgetPageObject(driver);
vkWidget
.create(2)
.navigate(wikiURL);
Assertion.assertTrue(vkWidget.areLoadedOnMercury(), MercuryMessages.INVISIBLE_MSG);
}
=======
@Test(groups = "MercuryVKWidgetTest_005")
@Execute(onWikia = "mercuryautomationtesting")
public void MercuryVKWidgetTest_005_isErrorPresent() {
VKWidgetPageObject vkWidget = new VKWidgetPageObject(driver);
vkWidget.createIncorrectAndNavigate(wikiURL);
Assertion.assertTrue(vkWidget.isErrorPresent(), MercuryMessages.INVISIBLE_MSG);
}
>>>>>>>
@Test(groups = "MercuryVKWidgetTest_004")
@Execute(onWikia = "mercuryautomationtesting")
public void MercuryVKWidgetTest_004_areLoadedOnFirstVisitDirectlyFromUrl() {
VKWidgetPageObject vkWidget = new VKWidgetPageObject(driver);
vkWidget
.create(2)
.navigate(wikiURL);
Assertion.assertTrue(vkWidget.areLoadedOnMercury(), MercuryMessages.INVISIBLE_MSG);
}
@Test(groups = "MercuryVKWidgetTest_005")
@Execute(onWikia = "mercuryautomationtesting")
public void MercuryVKWidgetTest_005_isErrorPresent() {
VKWidgetPageObject vkWidget = new VKWidgetPageObject(driver);
vkWidget.createIncorrectAndNavigate(wikiURL);
Assertion.assertTrue(vkWidget.isErrorPresent(), MercuryMessages.INVISIBLE_MSG);
} |
<<<<<<<
import com.wikia.webdriver.Common.Core.CommonExpectedConditions;
import com.wikia.webdriver.Common.Core.CommonFunctions;
=======
>>>>>>>
import com.wikia.webdriver.Common.Core.CommonExpectedConditions;
<<<<<<<
import com.wikia.webdriver.PageObjectsFactory.ComponentObject.Vet.VetAddVideoComponentObject;
=======
import com.wikia.webdriver.Common.Properties.Properties;
>>>>>>>
import com.wikia.webdriver.Common.Properties.Properties;
import com.wikia.webdriver.PageObjectsFactory.ComponentObject.Vet.VetAddVideoComponentObject;
<<<<<<<
import com.wikia.webdriver.TestCases.VideoTests.VetAddingVideo;
=======
import com.wikia.webdriver.PageObjectsFactory.PageObject.WikiPage.EditMode.WikiArticleEditMode;
import org.openqa.selenium.NoSuchElementException;
>>>>>>>
import com.wikia.webdriver.PageObjectsFactory.PageObject.WikiPage.EditMode.WikiArticleEditMode;
<<<<<<<
@FindBy(css="figure.tleft")
private WebElement videoOnLeftOfArticle;
@FindBy(css="figure.tright")
private WebElement videoOnRightOfArticle;
@FindBy(css="figure.tnone")
private WebElement videoOnCenterOfArticle;
@FindBy(css="#WikiaArticle div[style*='width:250px']")
private WebElement videoWidthOnArticle;
@FindBy(css="figcaption.thumbcaption")
private WebElement videoCaptionOnArticle;
private By galleryDialogPhotosList = By
.cssSelector("ul[class='WikiaPhotoGalleryResults'][type='results'] li input");
private By galleryDialogPhotoOrientationsList = By
.cssSelector("ul.clearfix[id='WikiaPhotoGalleryOrientation'] li");
private String videoAddVideoButtonSelector = "div.input-group.VideoEmbedNoBorder input";
private String videoReturnToEditingSelector = "input[value=\"Return to editing\"]";
private By galleryDialogSlideshowOrientationsList = By
.cssSelector("ul.clearfix[id='WikiaPhotoGallerySliderType'] li");
private By layoutList = By.cssSelector("ul#CreatePageDialogChoices li");
private By captionTextArea = By.cssSelector("textarea[id='ImageUploadCaption']");
private By addThisPhotoLink = By.cssSelector("tr.ImageUploadFindLinks td a");
=======
@FindBy (css = "#WikiaPageHeader h1")
private WebElement wikiFirstHeader;
>>>>>>>
@FindBy(css="figure.tleft")
private WebElement videoOnLeftOfArticle;
@FindBy(css="figure.tright")
private WebElement videoOnRightOfArticle;
@FindBy(css="figure.tnone")
private WebElement videoOnCenterOfArticle;
@FindBy(css="#WikiaArticle div[style*='width:250px']")
private WebElement videoWidthOnArticle;
@FindBy(css="figcaption.thumbcaption")
private WebElement videoCaptionOnArticle;
@FindBy(css = ".UserLoginModal input[type='submit']")
protected WebElement modalLoginSubmit;
@FindBy(css = ".wikia-menu-button.contribute.secondary.combined > .drop")
protected WebElement contributeButton;
@FindBy(css = ".WikiaMenuElement a[data-id='createpage']")
protected WebElement contributeAddPage;
@FindBy(css = "#CreatePageDialog")
protected WebElement addPageModal;
@FindBy(css = ".UserLoginModal input[name='password']")
protected WebElement modalPasswordInput;
private By galleryDialogPhotosList = By
.cssSelector("ul[class='WikiaPhotoGalleryResults'][type='results'] li input");
private By galleryDialogPhotoOrientationsList = By
.cssSelector("ul.clearfix[id='WikiaPhotoGalleryOrientation'] li");
private String videoAddVideoButtonSelector = "div.input-group.VideoEmbedNoBorder input";
private String videoReturnToEditingSelector = "input[value=\"Return to editing\"]";
private By galleryDialogSlideshowOrientationsList = By
.cssSelector("ul.clearfix[id='WikiaPhotoGallerySliderType'] li");
private By layoutList = By.cssSelector("ul#CreatePageDialogChoices li");
private By captionTextArea = By.cssSelector("textarea[id='ImageUploadCaption']");
private By addThisPhotoLink = By.cssSelector("tr.ImageUploadFindLinks td a");
@FindBy (css = "#WikiaPageHeader h1")
private WebElement wikiFirstHeader;
<<<<<<<
public void verifyVideoOnTheLeftOnAritcle()
{
waitForElementByElement(videoOnLeftOfArticle);
PageObjectLogging.log("verifyVideoOnTheLeftOnAritcle", "Video appears on the left of the article page once published", true, driver);
}
public void verifyVideoOnTheRightOnAritcle()
{
waitForElementByElement(videoOnRightOfArticle);
PageObjectLogging.log("verifyVideoOnTheRightOnAritcle", "Video appears on the right of the article page once published", true, driver);
}
public void verifyVideoOnTheCenterOnArticle()
{
waitForElementByElement(videoOnCenterOfArticle);
PageObjectLogging.log("verifyVideoOnTheCenterOnAritcle", "Video appears on the center of the article page once published", true, driver);
}
public void verifyVideoWidthOnAritcle()
{
waitForElementByElement(videoWidthOnArticle);
PageObjectLogging.log("verifyVideoWidthOnAritcle", "Video width is correct article page when page is published", true, driver);
}
public void verifyVideoCaptionOnAritcle()
{
waitForElementByElement(videoCaptionOnArticle);
CommonExpectedConditions.textToBePresentInElement(videoCaptionOnArticle, "QAWebdriverCaption1");
PageObjectLogging.log("verifyVideoCaptionOnAritcle", "Video caption appears correctly in article page", true, driver);
}
public void verifyNoVideoCaptionOnAritcle() {
waitForElementNotVisibleByElement(videoCaptionOnArticle);
PageObjectLogging.log("verifyNoVideoCaptionOnAritcle", "Verify that the video does not have a caption in the article page", true);
}
=======
public void openSpecialPage(String specialPage) {
getUrl(Domain + specialPage);
}
public void verifyLoginReguiredMessage() {
waitForTextToBePresentInElementByElement(
wikiFirstHeader, PageContent.loginRequired
);
PageObjectLogging.log(
"LoginRequiredMessage",
"Login required message in first header present",
true, driver
);
}
public void clickLoginOnSpecialPage() {
waitForElementByElement(specialUserLoginLink);
PageObjectLogging.log(
"LoginLinkPresent",
"Link to login special page present",
true, driver
);
clickAndWait(specialUserLoginLink);
PageObjectLogging.log(
"LoginLinkClicked",
"Link to login special page clicked",
true, driver
);
}
public void verifyNotLoggedInMessage() {
waitForTextToBePresentInElementByElement(
wikiFirstHeader, PageContent.notLoggedInMessage
);
PageObjectLogging.log(
"NotLoggedInMessage",
"Not logged in message present",
true, driver
);
}
public void clickContributeNewPage() {
clickContributeButton();
waitForElementVisibleByElement(contributeAddPage);
clickAndWait(contributeAddPage);
}
public void logInViaModal(String userName, String password) {
waitForElementByElement(modalUserNameInput);
modalUserNameInput.sendKeys(userName);
waitForElementByElement(modalPasswordInput);
modalPasswordInput.sendKeys(password);
PageObjectLogging.log(
"FillLoginForm",
"Login form in modal is filled",
true, driver
);
clickAndWait(modalLoginSubmit);
PageObjectLogging.log(
"LoginFormSubmitted",
"Login form is submitted",
true
);
waitForElementNotVisibleByElement(logInModal);
PageObjectLogging.log(
"LoginModalDissapears",
"Login modal is no longer visible",
true
);
}
public String receiveMailWithNewPassowrd() {
MailFunctions.deleteAllMails(Properties.email, Properties.emailPassword);
String newPassword = MailFunctions.getPasswordFromMailContent((
MailFunctions.getFirstMailContent(
Properties.email, Properties.emailPassword)
)
);
PageObjectLogging.log(
"NewPasswordRecived",
"New password recived from mail",
true
);
return newPassword;
}
/**
* Method checks if current wiki page is main page of this wiki
*
* @return Boolean
*/
protected Boolean checkIfMainPage() {
WebElement body = driver.findElement(By.cssSelector("body"));
return (body.getAttribute("class").contains("mainpage"));
}
>>>>>>>
public void verifyVideoOnTheLeftOnAritcle()
{
waitForElementByElement(videoOnLeftOfArticle);
PageObjectLogging.log("verifyVideoOnTheLeftOnAritcle", "Video appears on the left of the article page once published", true, driver);
}
public void verifyVideoOnTheRightOnAritcle()
{
waitForElementByElement(videoOnRightOfArticle);
PageObjectLogging.log("verifyVideoOnTheRightOnAritcle", "Video appears on the right of the article page once published", true, driver);
}
public void verifyVideoOnTheCenterOnArticle()
{
waitForElementByElement(videoOnCenterOfArticle);
PageObjectLogging.log("verifyVideoOnTheCenterOnAritcle", "Video appears on the center of the article page once published", true, driver);
}
public void verifyVideoWidthOnAritcle()
{
waitForElementByElement(videoWidthOnArticle);
PageObjectLogging.log("verifyVideoWidthOnAritcle", "Video width is correct article page when page is published", true, driver);
}
public void verifyVideoCaptionOnAritcle()
{
waitForElementByElement(videoCaptionOnArticle);
CommonExpectedConditions.textToBePresentInElement(videoCaptionOnArticle, "QAWebdriverCaption1");
PageObjectLogging.log("verifyVideoCaptionOnAritcle", "Video caption appears correctly in article page", true, driver);
}
public void verifyNoVideoCaptionOnAritcle() {
waitForElementNotVisibleByElement(videoCaptionOnArticle);
PageObjectLogging.log("verifyNoVideoCaptionOnAritcle", "Verify that the video does not have a caption in the article page", true);
}
public void openSpecialPage(String specialPage) {
getUrl(Domain + specialPage);
}
public void verifyLoginReguiredMessage() {
waitForTextToBePresentInElementByElement(
wikiFirstHeader, PageContent.loginRequired
);
PageObjectLogging.log(
"LoginRequiredMessage",
"Login required message in first header present",
true, driver
);
}
public void clickLoginOnSpecialPage() {
waitForElementByElement(specialUserLoginLink);
PageObjectLogging.log(
"LoginLinkPresent",
"Link to login special page present",
true, driver
);
clickAndWait(specialUserLoginLink);
PageObjectLogging.log(
"LoginLinkClicked",
"Link to login special page clicked",
true, driver
);
}
public void verifyNotLoggedInMessage() {
waitForTextToBePresentInElementByElement(
wikiFirstHeader, PageContent.notLoggedInMessage
);
PageObjectLogging.log(
"NotLoggedInMessage",
"Not logged in message present",
true, driver
);
}
public void clickContributeNewPage() {
clickContributeButton();
waitForElementVisibleByElement(contributeAddPage);
clickAndWait(contributeAddPage);
}
public void logInViaModal(String userName, String password) {
waitForElementByElement(modalUserNameInput);
modalUserNameInput.sendKeys(userName);
waitForElementByElement(modalPasswordInput);
modalPasswordInput.sendKeys(password);
PageObjectLogging.log(
"FillLoginForm",
"Login form in modal is filled",
true, driver
);
clickAndWait(modalLoginSubmit);
PageObjectLogging.log(
"LoginFormSubmitted",
"Login form is submitted",
true
);
waitForElementNotVisibleByElement(logInModal);
PageObjectLogging.log(
"LoginModalDissapears",
"Login modal is no longer visible",
true
);
}
public String receiveMailWithNewPassowrd() {
MailFunctions.deleteAllMails(Properties.email, Properties.emailPassword);
String newPassword = MailFunctions.getPasswordFromMailContent((
MailFunctions.getFirstMailContent(
Properties.email, Properties.emailPassword)
)
);
PageObjectLogging.log(
"NewPasswordRecived",
"New password recived from mail",
true
);
return newPassword;
}
/**
* Method checks if current wiki page is main page of this wiki
*
* @return Boolean
*/
protected Boolean checkIfMainPage() {
WebElement body = driver.findElement(By.cssSelector("body"));
return (body.getAttribute("class").contains("mainpage"));
} |
<<<<<<<
@RelatedIssue(issueID = "MAIN-3413")
@ExecuteAs(user = User.USER)
=======
@RelatedIssue(issueID = "QAART-585")
>>>>>>>
@RelatedIssue(issueID = "QAART-585")
@ExecuteAs(user = User.USER) |
<<<<<<<
public abstract String getAppiumIp();
public abstract String getDeviceName();
=======
>>>>>>>
public abstract String getAppiumIp();
public abstract String getDeviceName(); |
<<<<<<<
=======
>>>>>>>
<<<<<<<
public static final String
LIST_ITEMS_ARE_NOT_UNIQUE_MSG =
"there are at least two elements with the same name";
private MercuryMessages() {
}
=======
public static final String LIST_ITEMS_ARE_NOT_UNIQUE_MSG = "there are at least two elements with the same name";
public static final String ALL_VALID_WIDGETS_ARE_SWAPPED_MSG =
"all valid widget placeholders are swapped for widget inline frames";
public static final String SOME_VALID_WIDGETS_WERE_NOT_SWAPPED_MSG =
"some valid widget placeholders are not swapped for widget inline frames";
private MercuryMessages() {
}
>>>>>>>
public static final String LIST_ITEMS_ARE_NOT_UNIQUE_MSG =
"there are at least two elements with the same name";
public static final String ALL_VALID_WIDGETS_ARE_SWAPPED_MSG =
"all valid widget placeholders are swapped for widget inline frames";
public static final String SOME_VALID_WIDGETS_WERE_NOT_SWAPPED_MSG =
"some valid widget placeholders are not swapped for widget inline frames";
private MercuryMessages() {
} |
<<<<<<<
@FindBy(css="input[name=search]")
private WebElement searchInput;
@FindBy(css=".autocomplete div")
private List<WebElement> searchSuggestions;
@FindBy(css=".autocomplete div:nth-child(7)")
private WebElement searchSuggestionsLast;
=======
>>>>>>>
@FindBy(css="input[name=search]")
private WebElement searchInput;
@FindBy(css=".autocomplete div")
private List<WebElement> searchSuggestions;
@FindBy(css=".autocomplete div:nth-child(7)")
private WebElement searchSuggestionsLast;
<<<<<<<
=======
public String resetForgotPasswordTime(String userName) {
String[][] apiRequestParameters = {
{"action", ApiActions.apiActionForgotPassword},
{"user", userName},
{"token", Properties.apiToken},
{"format", "json"},
};
return CommonUtils.sendPost(URLsContent.apiUrl, apiRequestParameters);
}
>>>>>>>
public String resetForgotPasswordTime(String userName) {
String[][] apiRequestParameters = {
{"action", ApiActions.apiActionForgotPassword},
{"user", userName},
{"token", Properties.apiToken},
{"format", "json"},
};
return CommonUtils.sendPost(URLsContent.apiUrl, apiRequestParameters);
}
<<<<<<<
public void typeSearchQuery(String query){
waitForElementByElement(searchInput);
builder.sendKeys(searchInput, query).build().perform();
PageObjectLogging.log("typeSearchquery", "search query typed on home page", true);
}
public void verifySuggestionDropdown(String query) {
waitForElementByElement(searchSuggestionsLast);
for(WebElement elem:searchSuggestions) {
Assertion.assertStringContains(elem.getAttribute("title").toUpperCase(), query.toUpperCase());
}
}
/**
* @author Michal Nowierski
* */
public SpecialVideosPageObject openSpecialVideoPage(){
getUrl(Global.DOMAIN+"wiki/Special:Videos");
=======
public UserProfilePageObject navigateToProfilePage(String userName, String wikiURL) {
getUrl(wikiURL + "wiki/User:" + userName);
return new UserProfilePageObject(driver);
}
public SpecialVideosPageObject openSpecialVideoPage(String wikiURL){
getUrl(wikiURL+URLsContent.specialNewVideo);
>>>>>>>
public void typeSearchQuery(String query){
waitForElementByElement(searchInput);
builder.sendKeys(searchInput, query).build().perform();
PageObjectLogging.log("typeSearchquery", "search query typed on home page", true);
}
public void verifySuggestionDropdown(String query) {
waitForElementByElement(searchSuggestionsLast);
for(WebElement elem:searchSuggestions) {
Assertion.assertStringContains(elem.getAttribute("title").toUpperCase(), query.toUpperCase());
}
}
public UserProfilePageObject navigateToProfilePage(String userName, String wikiURL) {
getUrl(wikiURL + "wiki/User:" + userName);
return new UserProfilePageObject(driver);
}
public SpecialVideosPageObject openSpecialVideoPage(String wikiURL){
getUrl(wikiURL+URLsContent.specialNewVideo);
<<<<<<<
protected void clickDeleteButtonInDropDown() {
waitForElementByElement(deleteButton);
clickActions(deleteButton);
PageObjectLogging.log("clickDeleteButtonInDropDown",
"delete button in drop-down clicked", true);
=======
public VisualEditModePageObject goToArticleEditPage(String wikiURL, String article) {
getUrl(
urlBuilder.appendQueryStringToURL(
wikiURL + URLsContent.wikiDir + article, URLsContent.actionEditParameter
)
);
return new VisualEditModePageObject(driver);
>>>>>>>
public VisualEditModePageObject goToArticleEditPage(String wikiURL, String article) {
getUrl(
urlBuilder.appendQueryStringToURL(
wikiURL + URLsContent.wikiDir + article, URLsContent.actionEditParameter
)
);
return new VisualEditModePageObject(driver);
<<<<<<<
public void deleteArticle(String atricleName) {
getUrl(driver.getCurrentUrl() + "?action=delete");
// clickDeleteButtonInDropDown();
clickArticleDeleteConfirmationButton(atricleName);
waitForElementByXPath("//div[@class='msg' and contains(text(), 'has been deleted.')]");
PageObjectLogging.log("deleteArticle", "article "+atricleName+" has been deleted",
true, driver);
}
=======
>>>>>>>
<<<<<<<
=======
public void verifyNotificationMessage() {
waitForElementVisibleByElement(flashMessage);
flashMessageClose.click();
waitForElementNotVisibleByElement(flashMessage);
}
>>>>>>>
public void verifyNotificationMessage() {
waitForElementVisibleByElement(flashMessage);
flashMessageClose.click();
waitForElementNotVisibleByElement(flashMessage);
}
<<<<<<<
=======
public ArticlePageObject openArticleByName(String wikiURL, String articleName) {
getUrl(
wikiURL +
URLsContent.wikiDir +
articleName
);
return new ArticlePageObject(driver);
}
public BlogPageObject openBlogByName(String wikiURL, String blogTitle, String userName) {
getUrl(
wikiURL +
URLsContent.blogNameSpace.replace("%userName%", userName) +
blogTitle
);
return new BlogPageObject(driver);
}
>>>>>>>
public ArticlePageObject openArticleByName(String wikiURL, String articleName) {
getUrl(
wikiURL +
URLsContent.wikiDir +
articleName
);
return new ArticlePageObject(driver);
}
public BlogPageObject openBlogByName(String wikiURL, String blogTitle, String userName) {
getUrl(
wikiURL +
URLsContent.blogNameSpace.replace("%userName%", userName) +
blogTitle
);
return new BlogPageObject(driver);
}
<<<<<<<
public CreateNewWikiPageObjectStep1 startAWiki() {
return null;
}
=======
>>>>>>> |
<<<<<<<
public String getNameForArticle () {
return PageContent.articleNamePrefix + getTimeStamp();
}
=======
public void openSpecialPromoteOnCurrentWiki() {
JavascriptExecutor js = (JavascriptExecutor) driver;
String url = (String) js.executeScript("return wgServer");
getUrl(url + "/" + URLsContent.specialPromote);
PageObjectLogging.log("openSpecialPromote", "special promote page opened", true);
}
>>>>>>>
public String getNameForArticle () {
return PageContent.articleNamePrefix + getTimeStamp();
}
public void openSpecialPromoteOnCurrentWiki() {
JavascriptExecutor js = (JavascriptExecutor) driver;
String url = (String) js.executeScript("return wgServer");
getUrl(url + "/" + URLsContent.specialPromote);
PageObjectLogging.log("openSpecialPromote", "special promote page opened", true);
} |
<<<<<<<
// UI Mapping
=======
>>>>>>>
<<<<<<<
@FindBy(css = "input[name='poiCategoryMarkers[]']")
private List<WebElement> uploadMarker;
@FindBy(css = "input[name='wpUploadFile']")
private List<WebElement> uploadInputsCollection;
=======
>>>>>>>
@FindBy(css = "input[name='poiCategoryMarkers[]']")
private List<WebElement> uploadMarker;
@FindBy(css = "input[name='wpUploadFile']")
private List<WebElement> uploadInputsCollection;
<<<<<<<
@FindBy(css = ".addPoiCategory.modalEvent")
private WebElement addMorePinTypesLink;
@FindBy(css = ".poi-category-dropdown")
private WebElement mainParentCategorySelector;
@FindBy(css = ".poi-category-dropdown > option")
private List<WebElement> parentCatOption;
@FindBy(css = "select[name='poiCategoryParents[]']")
private List<WebElement> parentCatElements;
@FindBy(css = ".modal.medium.int-map-modal")
private WebElement creatingPinDialog;
@FindBy(css = "#intMapError")
private WebElement pinTypesError;
private int amountPinTypeTitleInputs, amountUploadMarker, amountParentCatElements;
public void typePinTypeTitle(String pinTypeName, int index) {
WebElement firstPin = pinTypeTitleInputs.get(index);
=======
public void typePinTypeTitle(String pinTypeName) {
WebElement firstPin = pinTypeTitleInputs.get(0);
>>>>>>>
@FindBy(css = ".addPoiCategory.modalEvent")
private WebElement addMorePinTypesLink;
@FindBy(css = ".poi-category-dropdown")
private WebElement mainParentCategorySelector;
@FindBy(css = ".poi-category-dropdown > option")
private List<WebElement> parentCatOption;
@FindBy(css = "select[name='poiCategoryParents[]']")
private List<WebElement> parentCatElements;
@FindBy(css = ".modal.medium.int-map-modal")
private WebElement creatingPinDialog;
@FindBy(css = "#intMapError")
private WebElement pinTypesError;
private int amountPinTypeTitleInputs, amountUploadMarker, amountParentCatElements;
public void typePinTypeTitle(String pinTypeName, int index) {
WebElement firstPin = pinTypeTitleInputs.get(index);
<<<<<<<
public void selectParentCategory(int catValue) {
waitForElementClickableByElement(mainParentCategorySelector);
mainParentCategorySelector.click();
WebElement parentSelected = parentCatOption.get(catValue);
waitForElementVisibleByElement(parentSelected);
parentSelected.click();
}
public void clickAddAnotherPinType() {
waitForElementByElement(addMorePinTypesLink);
addMorePinTypesLink.click();
PageObjectLogging.log("clickAddAnotherPinType", "clicked add more pin types link in create pin types modal", true);
}
public void verifyPinTypesDialog() {
driver.switchTo().activeElement();
waitForElementByElement(creatingPinDialog);
PageObjectLogging.log("verifyPinTypesDialog", "Pin types dialog was showed", true);
}
public void savePinTypesListState() {
amountPinTypeTitleInputs = pinTypeTitleInputs.size();
amountUploadMarker = uploadMarker.size();
amountParentCatElements = parentCatElements.size();
PageObjectLogging.log("savePinTypesListState", "State of pin types list is saved", true);
}
public void selectFileToUpload(String file, String typeOfFile) {
unhideElementByClassChange("wpUploadFile", "poi-category-marker-image-upload");
uploadInputsCollection.get(0).sendKeys(getAbsolutePathForFile(PageContent.resourcesPath + file));
PageObjectLogging.log("selectFileToUpload", "Tried to upload " + typeOfFile, true, driver);
}
public void verifyAddAnotherPinType() {
Assertion.assertEquals(amountPinTypeTitleInputs + 1, pinTypeTitleInputs.size());
Assertion.assertEquals(amountUploadMarker + 1, uploadMarker.size());
Assertion.assertEquals(amountParentCatElements + 1, parentCatElements.size());
}
public void verifyErrorsExist() {
waitForElementByElement(pinTypesError);
Assertion.assertEquals(false, pinTypesError.getText().isEmpty());
}
=======
>>>>>>>
public void selectParentCategory(int catValue) {
waitForElementClickableByElement(mainParentCategorySelector);
mainParentCategorySelector.click();
WebElement parentSelected = parentCatOption.get(catValue);
waitForElementVisibleByElement(parentSelected);
parentSelected.click();
}
public void clickAddAnotherPinType() {
waitForElementByElement(addMorePinTypesLink);
addMorePinTypesLink.click();
PageObjectLogging.log("clickAddAnotherPinType", "clicked add more pin types link in create pin types modal", true);
}
public void verifyPinTypesDialog() {
driver.switchTo().activeElement();
waitForElementByElement(creatingPinDialog);
PageObjectLogging.log("verifyPinTypesDialog", "Pin types dialog was showed", true);
}
public void savePinTypesListState() {
amountPinTypeTitleInputs = pinTypeTitleInputs.size();
amountUploadMarker = uploadMarker.size();
amountParentCatElements = parentCatElements.size();
PageObjectLogging.log("savePinTypesListState", "State of pin types list is saved", true);
}
public void selectFileToUpload(String file, String typeOfFile) {
unhideElementByClassChange("wpUploadFile", "poi-category-marker-image-upload");
uploadInputsCollection.get(0).sendKeys(getAbsolutePathForFile(PageContent.resourcesPath + file));
PageObjectLogging.log("selectFileToUpload", "Tried to upload " + typeOfFile, true, driver);
}
public void verifyAddAnotherPinType() {
Assertion.assertEquals(amountPinTypeTitleInputs + 1, pinTypeTitleInputs.size());
Assertion.assertEquals(amountUploadMarker + 1, uploadMarker.size());
Assertion.assertEquals(amountParentCatElements + 1, parentCatElements.size());
}
public void verifyErrorsExist() {
waitForElementByElement(pinTypesError);
Assertion.assertEquals(false, pinTypesError.getText().isEmpty());
} |
<<<<<<<
/**
* @author Tomasz Napieralski
* @param rgba String representing function rgba(int, int, int, int)
* @return int[], where 0='red', 1='green', 2='blue'
*/
public static int[] convertRGBAFunctiontoIntTable(String rgba) {
int[] extract = new int[3];
int start = rgba.indexOf("(", 0) + 1;
int end = rgba.indexOf(",", 0);
int red = Integer.parseInt(rgba.substring(start, end));
start = rgba.indexOf(" ", end + 1) + 1;
end = rgba.indexOf(",", end + 1);
int green = Integer.parseInt(rgba.substring(start, end));
start = rgba.indexOf(" ", end + 1) + 1;
end = rgba.indexOf(",", end + 1);
int blue = Integer.parseInt(rgba.substring(start, end));
extract[0] = red;
extract[1] = green;
extract[2] = blue;
return extract;
}
=======
public void verifyMainEditEditor(Editor expectedEditor) {
switch(expectedEditor) {
case VE:
VisualEditorPageObject ve = openVEModeWithMainEditButton();
ve.verifyVEToolBarPresent();
ve.verifyEditorSurfacePresent();
break;
case CK:
VisualEditModePageObject ck = openCKModeWithMainEditButton();
ck.verifyContentLoaded();
ck.clickPublishButton();
break;
case SRC:
SourceEditModePageObject src = openSrcModeWithMainEditButton();
src.verifySourceOnlyMode();
src.clickPublishButton();
break;
}
}
public void verifyCreateAPageEditor(Editor expectedEditor, String articleName) {
switch(expectedEditor) {
case VE:
VisualEditorPageObject ve = createArticleInVEUsingDropdown(articleName);
ve.verifyVEToolBarPresent();
ve.verifyEditorSurfacePresent();
break;
case CK:
VisualEditModePageObject ck = createArticleInCKUsingDropdown(articleName);
ck.verifyContentLoaded();
ck.clickPublishButton();
break;
case SRC:
SourceEditModePageObject src = createArticleInSrcUsingDropdown(articleName);
src.verifySourceOnlyMode();
src.clickPublishButton();
break;
}
}
public void verifySectionEditEditor(Editor expectedEditor) {
switch(expectedEditor) {
case VE:
VisualEditorPageObject ve = openVEModeWithSectionEditButton(0);
ve.verifyVEToolBarPresent();
ve.verifyEditorSurfacePresent();
break;
case CK:
VisualEditModePageObject ck = openCKModeWithSectionEditButton(0);
ck.verifyContentLoaded();
ck.clickPublishButton();
break;
case SRC:
SourceEditModePageObject src = openSrcModeWithSectionEditButton(0);
src.verifySourceOnlyMode();
src.clickPublishButton();
break;
}
}
public void verifyRedLinkEditor(Editor expectedEditor) {
switch(expectedEditor) {
case VE:
VisualEditorPageObject ve = openVEModeWithRedLinks(0);
ve.verifyVEToolBarPresent();
ve.verifyEditorSurfacePresent();
break;
case CK:
VisualEditModePageObject ck = openCKModeWithRedLinks(0);
ck.verifyContentLoaded();
ck.clickPublishButton();
break;
case SRC:
SourceEditModePageObject src = openSrcModeWithRedLinks(0);
src.verifySourceOnlyMode();
src.clickPublishButton();
break;
}
}
public void verifyURLActionEditEditor(Editor expectedEditor, String articleName, String wikiURL) {
switch(expectedEditor) {
case CK:
VisualEditModePageObject ck = navigateToArticleEditPageCK(wikiURL, articleName);
ck.verifyContentLoaded();
ck.clickPublishButton();
break;
case SRC:
SourceEditModePageObject src = navigateToArticleEditPageSrc(wikiURL, articleName);
src.verifySourceOnlyMode();
src.clickPublishButton();
break;
default:
throw new NoSuchElementException("Invalid expected editor chosen: " + expectedEditor.name());
}
}
public void verifyURLVEActionEditEditor(Editor expectedEditor, String wikiURL) {
switch(expectedEditor) {
case VE:
VisualEditorPageObject ve = openNewArticleEditModeVisual(wikiURL);
ve.verifyVEToolBarPresent();
ve.verifyEditorSurfacePresent();
break;
default:
throw new NoSuchElementException("Invalid expected editor chosen: " + expectedEditor.name());
}
}
>>>>>>>
/**
* @author Tomasz Napieralski
* @param rgba String representing function rgba(int, int, int, int)
* @return int[], where 0='red', 1='green', 2='blue'
*/
public static int[] convertRGBAFunctiontoIntTable(String rgba) {
int[] extract = new int[3];
int start = rgba.indexOf("(", 0) + 1;
int end = rgba.indexOf(",", 0);
int red = Integer.parseInt(rgba.substring(start, end));
start = rgba.indexOf(" ", end + 1) + 1;
end = rgba.indexOf(",", end + 1);
int green = Integer.parseInt(rgba.substring(start, end));
start = rgba.indexOf(" ", end + 1) + 1;
end = rgba.indexOf(",", end + 1);
int blue = Integer.parseInt(rgba.substring(start, end));
extract[0] = red;
extract[1] = green;
extract[2] = blue;
return extract;
}
public void verifyMainEditEditor(Editor expectedEditor) {
switch(expectedEditor) {
case VE:
VisualEditorPageObject ve = openVEModeWithMainEditButton();
ve.verifyVEToolBarPresent();
ve.verifyEditorSurfacePresent();
break;
case CK:
VisualEditModePageObject ck = openCKModeWithMainEditButton();
ck.verifyContentLoaded();
ck.clickPublishButton();
break;
case SRC:
SourceEditModePageObject src = openSrcModeWithMainEditButton();
src.verifySourceOnlyMode();
src.clickPublishButton();
break;
}
}
public void verifyCreateAPageEditor(Editor expectedEditor, String articleName) {
switch(expectedEditor) {
case VE:
VisualEditorPageObject ve = createArticleInVEUsingDropdown(articleName);
ve.verifyVEToolBarPresent();
ve.verifyEditorSurfacePresent();
break;
case CK:
VisualEditModePageObject ck = createArticleInCKUsingDropdown(articleName);
ck.verifyContentLoaded();
ck.clickPublishButton();
break;
case SRC:
SourceEditModePageObject src = createArticleInSrcUsingDropdown(articleName);
src.verifySourceOnlyMode();
src.clickPublishButton();
break;
}
}
public void verifySectionEditEditor(Editor expectedEditor) {
switch(expectedEditor) {
case VE:
VisualEditorPageObject ve = openVEModeWithSectionEditButton(0);
ve.verifyVEToolBarPresent();
ve.verifyEditorSurfacePresent();
break;
case CK:
VisualEditModePageObject ck = openCKModeWithSectionEditButton(0);
ck.verifyContentLoaded();
ck.clickPublishButton();
break;
case SRC:
SourceEditModePageObject src = openSrcModeWithSectionEditButton(0);
src.verifySourceOnlyMode();
src.clickPublishButton();
break;
}
}
public void verifyRedLinkEditor(Editor expectedEditor) {
switch(expectedEditor) {
case VE:
VisualEditorPageObject ve = openVEModeWithRedLinks(0);
ve.verifyVEToolBarPresent();
ve.verifyEditorSurfacePresent();
break;
case CK:
VisualEditModePageObject ck = openCKModeWithRedLinks(0);
ck.verifyContentLoaded();
ck.clickPublishButton();
break;
case SRC:
SourceEditModePageObject src = openSrcModeWithRedLinks(0);
src.verifySourceOnlyMode();
src.clickPublishButton();
break;
}
}
public void verifyURLActionEditEditor(Editor expectedEditor, String articleName, String wikiURL) {
switch(expectedEditor) {
case CK:
VisualEditModePageObject ck = navigateToArticleEditPageCK(wikiURL, articleName);
ck.verifyContentLoaded();
ck.clickPublishButton();
break;
case SRC:
SourceEditModePageObject src = navigateToArticleEditPageSrc(wikiURL, articleName);
src.verifySourceOnlyMode();
src.clickPublishButton();
break;
default:
throw new NoSuchElementException("Invalid expected editor chosen: " + expectedEditor.name());
}
}
public void verifyURLVEActionEditEditor(Editor expectedEditor, String wikiURL) {
switch(expectedEditor) {
case VE:
VisualEditorPageObject ve = openNewArticleEditModeVisual(wikiURL);
ve.verifyVEToolBarPresent();
ve.verifyEditorSurfacePresent();
break;
default:
throw new NoSuchElementException("Invalid expected editor chosen: " + expectedEditor.name());
}
} |
<<<<<<<
import com.wikia.webdriver.common.core.annotations.ExecuteAs;
import com.wikia.webdriver.common.core.annotations.User;
=======
import com.wikia.webdriver.common.core.annotations.RelatedIssue;
>>>>>>>
import com.wikia.webdriver.common.core.annotations.RelatedIssue;
import com.wikia.webdriver.common.core.annotations.ExecuteAs;
import com.wikia.webdriver.common.core.annotations.User; |
<<<<<<<
import com.wikia.webdriver.pageobjectsfactory.pageobject.mercury.JoinPage;
=======
import com.wikia.webdriver.pageobjectsfactory.pageobject.mobile.MobileSignupPageObject;
>>>>>>>
import com.wikia.webdriver.pageobjectsfactory.pageobject.mercury.JoinPage;
import com.wikia.webdriver.pageobjectsfactory.pageobject.mobile.MobileSignupPageObject;
<<<<<<<
}
@Test
@Execute(onWikia = "mobileregressiontesting")
public void userIsTakenToJoinPage(){
JoinPage joinPage = new JoinPage(driver).get();
String expectedMessage = joinPage.getJoinTodayText();
ArticlePageObject homePage = new ArticlePageObject(driver);
homePage.openMainPage(wikiURL);
TopBarComponentObject loginIcon = new TopBarComponentObject(driver);
loginIcon.clickLoginIcon();
Assertion.assertEquals(joinPage.getJoinTodayText(), expectedMessage);
@Test
@Execute(onWikia = "mobileregressiontesting")
public void registerButtonWorks() {
JoinPage joinPage = new JoinPage(driver).get();
joinPage.clickRegisterWithEmail();
}
=======
}
@Test
@Execute (onWikia = "mobileregressiontesting")
public void registerNowLinkWorksAndRedirectsProperly(){
MobileSignupPageObject registrationPage = new MobileSignupPageObject(driver);
registrationPage.openRegisterPage();
String expectedHeader = registrationPage.getHeadertext();
LoginPage loginPage = new LoginPage(driver).get();
loginPage.clickOnRegisterLink();
String currentHeader = registrationPage.getHeadertext();
>>>>>>>
}
@Test
@Execute (onWikia = "mobileregressiontesting")
public void registerNowLinkWorksAndRedirectsProperly(){
MobileSignupPageObject registrationPage = new MobileSignupPageObject(driver);
registrationPage.openRegisterPage();
String expectedHeader = registrationPage.getHeadertext();
LoginPage loginPage = new LoginPage(driver).get();
loginPage.clickOnRegisterLink();
String currentHeader = registrationPage.getHeadertext(); |
<<<<<<<
private static final String[] TAGS = {
"<vk group-id=\"59925174\" />",
"<vk group-id=\"12345\" />",
};
=======
private static final String TAG =
"<vk group-id=\"12345\" />";
private static final String INCORRECT_TAG = "<vk />";
private static final String ERROR_MESSAGE = "Failed to render the VK widget. Please check if all required parameters are in place.";
>>>>>>>
private static final String[] TAGS = {
"<vk group-id=\"59925174\" />",
"<vk group-id=\"12345\" />",
};
private static final String INCORRECT_TAG = "<vk />";
private static final String ERROR_MESSAGE = "Failed to render the VK widget. Please check if all required parameters are in place."; |
<<<<<<<
@FindBy(css=".video-media")
private WebElement videoContainer;
@FindBy(css=".LightboxHeader h1 a")
private WebElement titleLink;
@FindBy(css=".more-info-button")
private WebElement moreInfoLink;
@FindBy(css=".WikiaLightbox div:not(.video-media)")
private WebElement imageContainer;
=======
@FindBy(css="span.carousel-arrow.next")
private WebElement carouselRight;
@FindBy(css="span.carousel-arrow.previous:not(.disabled)")
private WebElement carouselLeft;
@FindBy(css="span.carousel-arrow.previous.disabled")
private WebElement carouselLeftDisabled;
@FindBy(css="button.more-info-close")
private WebElement closeShareScreenButton;
@FindBy(css=".LightboxHeader button.close.wikia-chiclet-button")
protected WebElement closeModalButton;
@FindBy(css="div.video-media")
private WebElement mediaContainer;
>>>>>>>
@FindBy(css=".video-media")
private WebElement videoContainer;
@FindBy(css=".LightboxHeader h1 a")
private WebElement titleLink;
@FindBy(css=".more-info-button")
private WebElement moreInfoLink;
@FindBy(css=".WikiaLightbox div:not(.video-media)")
private WebElement imageContainer;
@FindBy(css="span.carousel-arrow.next")
private WebElement carouselRight;
@FindBy(css="span.carousel-arrow.previous:not(.disabled)")
private WebElement carouselLeft;
@FindBy(css="span.carousel-arrow.previous.disabled")
private WebElement carouselLeftDisabled;
@FindBy(css="button.more-info-close")
private WebElement closeShareScreenButton;
@FindBy(css=".LightboxHeader button.close.wikia-chiclet-button")
protected WebElement closeModalButton;
@FindBy(css="div.video-media")
private WebElement mediaContainer;
<<<<<<<
waitForElementByElement(lightBoxHeader);
PageObjectLogging.log("verifyLightboxPopup", "Lightbox appeared", true);
=======
waitForElementByElement(lightBoxModal);
PageObjectLogging.log("verifyLightboxPopup", "verify lightbox appeared", true);
>>>>>>>
waitForElementByElement(lightBoxModal);
PageObjectLogging.log("verifyLightboxPopup", "Lightbox appeared", true);
<<<<<<<
public void verifyTitleUrl(String expectedUrl) {
String titleUrl = titleLink.getAttribute("href");
Assertion.assertEquals(expectedUrl, titleUrl);
PageObjectLogging.log("verifyTitleUrl", "Title URL is correct", true);
}
public FilePagePageObject clickTitle() {
waitForElementByElement(titleLink);
titleLink.click();
PageObjectLogging.log("clickTitleUrl", "Title url is clicked", true);
return new FilePagePageObject(driver);
}
public void verifyMoreInfoUrl(String expectedUrl) {
String moreInfoUrl = moreInfoLink.getAttribute("href");
Assertion.assertEquals(expectedUrl, moreInfoUrl);
PageObjectLogging.log("verifyMoreInfoUrl", "More Info URL is correct", true);
}
=======
public void clickCarouselRight() {
waitForElementByElement(carouselRight);
carouselRight.click();
PageObjectLogging.log("clickCarouselRight", "carousel right button is clicked", true);
}
public void clickCarouselLeft() {
waitForElementByElement(carouselLeft);
carouselLeft.click();
PageObjectLogging.log("clickCarouselLeft", "carousel left button is clicked", true);
}
public void verifyCarouselLeftDisabled() {
waitForElementByElement(carouselLeftDisabled);
PageObjectLogging.log("verifyCarouselLeftDisabled", "carousel left button is disabled", true);
}
>>>>>>>
public void verifyTitleUrl(String expectedUrl) {
String titleUrl = titleLink.getAttribute("href");
Assertion.assertEquals(expectedUrl, titleUrl);
PageObjectLogging.log("verifyTitleUrl", "Title URL is correct", true);
}
public FilePagePageObject clickTitle() {
waitForElementByElement(titleLink);
titleLink.click();
PageObjectLogging.log("clickTitleUrl", "Title url is clicked", true);
return new FilePagePageObject(driver);
}
public void verifyMoreInfoUrl(String expectedUrl) {
String moreInfoUrl = moreInfoLink.getAttribute("href");
Assertion.assertEquals(expectedUrl, moreInfoUrl);
PageObjectLogging.log("verifyMoreInfoUrl", "More Info URL is correct", true);
}
public void clickCarouselRight() {
waitForElementByElement(carouselRight);
carouselRight.click();
PageObjectLogging.log("clickCarouselRight", "carousel right button is clicked", true);
}
public void clickCarouselLeft() {
waitForElementByElement(carouselLeft);
carouselLeft.click();
PageObjectLogging.log("clickCarouselLeft", "carousel left button is clicked", true);
}
public void verifyCarouselLeftDisabled() {
waitForElementByElement(carouselLeftDisabled);
PageObjectLogging.log("verifyCarouselLeftDisabled", "carousel left button is disabled", true);
} |
<<<<<<<
public void verifyTOCpresent() {
waitForElementByElement(tableOfContents);
PageObjectLogging.log("verifyTOCpresent", "toc is present", true);
}
public void verifyTOCexpanded() {
waitForElementByElement(tableOfContentsOrderedList);
PageObjectLogging.log("verifyTOCexpanded", "toc is expanded", true);
}
public void verifyTOCcollapsed() {
waitForElementNotVisibleByElement(tableOfContentsOrderedList);
PageObjectLogging.log("verifyTOCcollapsed", "toc is collapsed", true);
}
/**
* the method clicks on button show or hide,
* depending on which one is currently visible
*/
public void clickTOCshowHideButton() {
waitForElementByElement(tableOfContentsShowHideButton);
scrollAndClick(tableOfContentsShowHideButton);
PageObjectLogging.log("clickTOCshowHideButton", "table of contents 'show/hide' button clicked", true);
}
/**
* 1. remember the section that TOC link points to
* 2. click on the TOC link
* 3. verify that the section went up on the screen
* 4. verify that the wanted section is almost on the top of the screen
*
* @param numberOfTheSection - TOC link counting from the top
*/
public void verifyTOCsectionLinkWorks(int numberOfTheSection) {
WebElement sectionTOClink = tableOfContentsSectionsList.get(numberOfTheSection-1);
String sectionID = sectionTOClink.getAttribute("href").substring(getCurrentUrl().length());
WebElement sectionOnArticle = driver.findElement(By.cssSelector(sectionID));
int sectionYbefore = sectionOnArticle.getLocation().getY();
sectionTOClink.click();
int sectionYafter = sectionOnArticle.getLocation().getY();
Assertion.assertNotEquals(sectionYbefore, sectionYafter);
// assume that if section is less than 5px from top, it is scrolled up properly
Assertion.assertTrue(sectionYafter < 5);
PageObjectLogging.log("verifyTOCsectionLinkWorks", "choosen section "+sectionID+" was scrolled up", true);
}
=======
public void closeNewWikiCongratulationsLightBox() {
scrollAndClick(welcomeLightBoxCloseButton);
PageObjectLogging.log("closeNewWikiCongratulationsLightBox ", "congratulations lightbox closed", true);
}
>>>>>>>
public void verifyTOCpresent() {
waitForElementByElement(tableOfContents);
PageObjectLogging.log("verifyTOCpresent", "toc is present", true);
}
public void verifyTOCexpanded() {
waitForElementByElement(tableOfContentsOrderedList);
PageObjectLogging.log("verifyTOCexpanded", "toc is expanded", true);
}
public void verifyTOCcollapsed() {
waitForElementNotVisibleByElement(tableOfContentsOrderedList);
PageObjectLogging.log("verifyTOCcollapsed", "toc is collapsed", true);
}
/**
* the method clicks on button show or hide,
* depending on which one is currently visible
*/
public void clickTOCshowHideButton() {
waitForElementByElement(tableOfContentsShowHideButton);
scrollAndClick(tableOfContentsShowHideButton);
PageObjectLogging.log("clickTOCshowHideButton", "table of contents 'show/hide' button clicked", true);
}
/**
* 1. remember the section that TOC link points to
* 2. click on the TOC link
* 3. verify that the section went up on the screen
* 4. verify that the wanted section is almost on the top of the screen
*
* @param numberOfTheSection - TOC link counting from the top
*/
public void verifyTOCsectionLinkWorks(int numberOfTheSection) {
WebElement sectionTOClink = tableOfContentsSectionsList.get(numberOfTheSection-1);
String sectionID = sectionTOClink.getAttribute("href").substring(getCurrentUrl().length());
WebElement sectionOnArticle = driver.findElement(By.cssSelector(sectionID));
int sectionYbefore = sectionOnArticle.getLocation().getY();
sectionTOClink.click();
int sectionYafter = sectionOnArticle.getLocation().getY();
Assertion.assertNotEquals(sectionYbefore, sectionYafter);
// assume that if section is less than 5px from top, it is scrolled up properly
Assertion.assertTrue(sectionYafter < 5);
PageObjectLogging.log("verifyTOCsectionLinkWorks", "choosen section "+sectionID+" was scrolled up", true);
}
public void closeNewWikiCongratulationsLightBox() {
scrollAndClick(welcomeLightBoxCloseButton);
PageObjectLogging.log("closeNewWikiCongratulationsLightBox ", "congratulations lightbox closed", true);
} |
<<<<<<<
public static final String SPECIAL_WHAT_LINKS_HERE = "Special:WhatLinksHere";
=======
public static final String SPECIAL_VERSION = "wiki/Special:Version";
>>>>>>>
public static final String SPECIAL_VERSION = "wiki/Special:Version";
public static final String SPECIAL_WHAT_LINKS_HERE = "Special:WhatLinksHere"; |
<<<<<<<
private By editButtonSelector = By.cssSelector("a#ca-edit");
private By editDropDownBy = By.cssSelector("article span.drop");
=======
private By editButtonSelector = By.cssSelector("a#ca-edit");
@FindBy (css = "#WikiaPageHeader h1")
private WebElement wikiFirstHeader;
@FindBy (css = "#WikiaArticle a[href*='Special:UserLogin']")
private WebElement specialUserLoginLink;
@FindBy(css = ".UserLoginModal input[name='username']")
protected WebElement modalUserNameInput;
@FindBy(css="#AccountNavigation > li > a > .avatar")
protected WebElement userProfileAvatar;
@FindBy(css="#AccountNavigation > li > a ~ ul > li > a[data-id='logout']")
protected WebElement navigationLogoutLink;
>>>>>>>
private By editButtonSelector = By.cssSelector("a#ca-edit");
private By editDropDownBy = By.cssSelector("article span.drop");
@FindBy (css = "#WikiaPageHeader h1")
private WebElement wikiFirstHeader;
@FindBy (css = "#WikiaArticle a[href*='Special:UserLogin']")
private WebElement specialUserLoginLink;
@FindBy(css = ".UserLoginModal input[name='username']")
protected WebElement modalUserNameInput;
@FindBy(css="#AccountNavigation > li > a > .avatar")
protected WebElement userProfileAvatar;
@FindBy(css="#AccountNavigation > li > a ~ ul > li > a[data-id='logout']")
protected WebElement navigationLogoutLink;
<<<<<<<
getUrl(Global.DOMAIN+URLsContent.specialNewVideo);
return new SpecialVideosPageObject(driver);
=======
getUrl(Global.DOMAIN+URLsContent.specialNewVideo);
return new SpecialVideosPageObject(driver, Global.DOMAIN);
>>>>>>>
getUrl(Global.DOMAIN+URLsContent.specialNewVideo);
return new SpecialVideosPageObject(driver, Global.DOMAIN);
<<<<<<<
getUrl(Global.DOMAIN + URLsContent.specialUpload);
return new SpecialUploadPageObject(driver);
}
/**
* Verify that the Object appears on the page
*
* @author Michal Nowierski
* @param Object Object = {gallery, slideshow}
* */
public void verifyObjectOnThePage(String Object) {
waitForElementByBy(By.cssSelector("#WikiaArticle div[id*='"+ Object +"']"));
PageObjectLogging.log(
"VerifyTheObjetOnThePage",
"Verify that the " + Object + " appears on the page",
true, driver
);
=======
getUrl(Global.DOMAIN + URLsContent.specialUpload);
return new SpecialUploadPageObject(driver, Global.DOMAIN);
>>>>>>>
getUrl(Global.DOMAIN + URLsContent.specialUpload);
return new SpecialUploadPageObject(driver, Global.DOMAIN);
}
/**
* Verify that the Object appears on the page
*
* @author Michal Nowierski
* @param Object Object = {gallery, slideshow}
* */
public void verifyObjectOnThePage(String Object) {
waitForElementByBy(By.cssSelector("#WikiaArticle div[id*='"+ Object +"']"));
PageObjectLogging.log(
"VerifyTheObjetOnThePage",
"Verify that the " + Object + " appears on the page",
true, driver
);
<<<<<<<
getUrl(Global.DOMAIN + URLsContent.specialMultipleUpload);
return new SpecialMultipleUploadPageObject(driver);
=======
getUrl(Global.DOMAIN + URLsContent.specialMultipleUpload);
return new SpecialMultipleUploadPageObject(driver, Global.DOMAIN);
>>>>>>>
getUrl(Global.DOMAIN + URLsContent.specialMultipleUpload);
return new SpecialMultipleUploadPageObject(driver, Global.DOMAIN);
<<<<<<<
public WikiArticleEditMode clickEditButton() {
=======
public void clickEditButton() {
mouseOver("#GlobalNavigation li:nth(1)");
mouseRelease("#GlobalNavigation li:nth(1)");
waitForElementByElement(editButton);
waitForElementClickableByElement(editButton);
clickAndWait(editButton);
}
public WikiArticleEditMode clickEditButton(String pageName) {
>>>>>>>
public void clickEditButton() {
mouseOver("#GlobalNavigation li:nth(1)");
mouseRelease("#GlobalNavigation li:nth(1)");
waitForElementByElement(editButton);
waitForElementClickableByElement(editButton);
clickAndWait(editButton);
}
public WikiArticleEditMode clickEditButton(String pageName) {
<<<<<<<
public void verifyEditButtonNotPresent() {
waitForElementNotVisibleByElement(editButton);
PageObjectLogging.log("verifyEditButtonNotPresent",
"edit button is not present", true);
}
=======
public void verifyEditButtonNotPresent() {
waitForElementNotVisibleByElement(editButton);
PageObjectLogging.log("verifyEditButtonNotPresent",
"edit button is not present", true);
}
>>>>>>>
public void verifyEditButtonNotPresent() {
waitForElementNotVisibleByElement(editButton);
PageObjectLogging.log("verifyEditButtonNotPresent",
"edit button is not present", true);
}
<<<<<<<
protected Boolean checkIfMainPage() {
WebElement body = driver.findElement(By.cssSelector("body"));
return (body.getAttribute("class").contains("mainpage"));
}
=======
protected Boolean checkIfMainPage() {
WebElement body = driver.findElement(By.cssSelector("body"));
return (body.getAttribute("class").contains("mainpage"));
}
>>>>>>>
protected Boolean checkIfMainPage() {
WebElement body = driver.findElement(By.cssSelector("body"));
return (body.getAttribute("class").contains("mainpage"));
} |
<<<<<<<
=======
import java.util.List;
import java.util.concurrent.TimeUnit;
import lombok.Getter;
import org.joda.time.DateTime;
import org.json.JSONException;
import org.json.JSONObject;
import org.openqa.selenium.By;
import org.openqa.selenium.Cookie;
import org.openqa.selenium.Dimension;
import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.TimeoutException;
import org.openqa.selenium.WebDriverException;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;
>>>>>>>
import java.util.List;
import java.util.concurrent.TimeUnit;
import lombok.Getter;
import org.joda.time.DateTime;
import org.json.JSONException;
import org.json.JSONObject;
import org.openqa.selenium.By;
import org.openqa.selenium.Cookie;
import org.openqa.selenium.Dimension;
import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.TimeoutException;
import org.openqa.selenium.WebDriverException;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy; |
<<<<<<<
@FindBy(css="figure.wikia-interactive-map-thumbnail")
private WebElement mapNode;
=======
@FindBy(css=".ve-ui-wikiaMediaPreviewWidget-overlay")
private WebElement previewOverlay;
@FindBy(css=".ve-ui-wikiaMediaPreviewWidget-title")
private WebElement previewMeditaTitle;
@FindBy(css=".ve-ui-wikiaMediaPreviewWidget-closeButton .oo-ui-buttonedElement-button")
private WebElement previewCloseButton;
@FindBy(css=".ve-ui-wikiaMediaPreviewWidget-overlay img")
private WebElement previewImage;
@FindBy(css=".ve-ui-wikiaMediaPreviewWidget-videoWrapper")
private WebElement previewVideoWrapper;
>>>>>>>
@FindBy(css="figure.wikia-interactive-map-thumbnail")
private WebElement mapNode;
@FindBy(css=".ve-ui-wikiaMediaPreviewWidget-overlay")
private WebElement previewOverlay;
@FindBy(css=".ve-ui-wikiaMediaPreviewWidget-title")
private WebElement previewMeditaTitle;
@FindBy(css=".ve-ui-wikiaMediaPreviewWidget-closeButton .oo-ui-buttonedElement-button")
private WebElement previewCloseButton;
@FindBy(css=".ve-ui-wikiaMediaPreviewWidget-overlay img")
private WebElement previewImage;
@FindBy(css=".ve-ui-wikiaMediaPreviewWidget-videoWrapper")
private WebElement previewVideoWrapper; |
<<<<<<<
@FindBy(css = ".modal-dialog-wrapper.menu .modal-dialog")
private WebElement modal;
@FindBy(css = ".file-upload-label")
private WebElement uploadButton;
@FindBy(css = "#fileUpload")
private WebElement uploadInput;
=======
@FindBy(css = ".modal-dialog .crop-image")
private WebElement cropImageButton;
>>>>>>>
@FindBy(css = ".modal-dialog-wrapper.menu .modal-dialog")
private WebElement modal;
@FindBy(css = "#fileUpload")
private WebElement uploadInput;
@FindBy(css = ".modal-dialog .crop-image")
private WebElement cropImageButton;
<<<<<<<
public CroppingToolPageObject uploadImage(String filePath) {
wait.forElementVisible(modal);
System.out.println("before send keys");
uploadInput.sendKeys(filePath);
System.out.println("after send keys, before submit");
uploadInput.submit();
System.out.println("after submit");
return new CroppingToolPageObject(driver);
}
public void clickUpload() {
waitAndClick(uploadButton);
}
=======
public boolean isCropOptionEnabled() {
return !cropImageButton.getAttribute("class").contains("disabled");
}
public CroppingToolPageObject selectCrop() {
waitAndClick(cropImageButton);
return new CroppingToolPageObject(driver);
}
>>>>>>>
public CroppingToolPageObject uploadImage(String filePath) {
wait.forElementVisible(modal);
System.out.println("before send keys");
uploadInput.sendKeys(filePath);
System.out.println("after send keys, before submit");
uploadInput.submit();
System.out.println("after submit");
return new CroppingToolPageObject(driver);
}
public boolean isCropOptionEnabled() {
return !cropImageButton.getAttribute("class").contains("disabled");
}
public CroppingToolPageObject selectCrop() {
waitAndClick(cropImageButton);
return new CroppingToolPageObject(driver);
} |
<<<<<<<
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptInModal().isVisible(), shouldGetModal);
=======
PageObjectLogging.logInfo("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptInPage().isVisible(), shouldGetModal);
>>>>>>>
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptInPage().isVisible(), shouldGetModal);
<<<<<<<
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptInModal().isVisible(), shouldGetModal);
=======
PageObjectLogging.logInfo("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptInPage().isVisible(), shouldGetModal);
>>>>>>>
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptInPage().isVisible(), shouldGetModal);
<<<<<<<
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptInModal().isVisible(), shouldGetModal);
=======
PageObjectLogging.logInfo("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptInPage().isVisible(), shouldGetModal);
>>>>>>>
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptInPage().isVisible(), shouldGetModal);
<<<<<<<
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptInModal().isVisible(), shouldGetModal);
=======
PageObjectLogging.logInfo("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptInPage().isVisible(), shouldGetModal);
>>>>>>>
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertEquals(new TrackingOptInPage().isVisible(), shouldGetModal);
<<<<<<<
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInModal().isVisible());
=======
PageObjectLogging.logInfo("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
>>>>>>>
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
<<<<<<<
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInModal().isVisible());
=======
PageObjectLogging.logInfo("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
>>>>>>>
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
<<<<<<<
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInModal().isVisible());
=======
PageObjectLogging.logInfo("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
>>>>>>>
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
<<<<<<<
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInModal().isVisible());
=======
PageObjectLogging.logInfo("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
>>>>>>>
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
<<<<<<<
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInModal().isVisible());
=======
PageObjectLogging.logInfo("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
>>>>>>>
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
<<<<<<<
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInModal().isVisible());
=======
PageObjectLogging.logInfo("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
>>>>>>>
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
<<<<<<<
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInModal().isVisible());
=======
PageObjectLogging.logInfo("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
>>>>>>>
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
<<<<<<<
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInModal().isVisible());
=======
PageObjectLogging.logInfo("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible());
>>>>>>>
Log.info("Geo cookie: ", driver.manage().getCookieNamed("Geo").getValue());
Assertion.assertFalse(new TrackingOptInPage().isVisible()); |
<<<<<<<
import org.joda.time.DateTime;
import org.testng.annotations.Test;
=======
import org.testng.annotations.Test;
>>>>>>>
import org.joda.time.DateTime;
import org.testng.annotations.Test;
<<<<<<<
=======
@Test(groups = {"VetModalCaption", "VetTests", "Media"})
>>>>>>>
@Test(groups = {"VetModalCaption", "VetTests", "Media"})
<<<<<<<
@Test(groups = {"VetModalCaption", "VetModalCaption_002", "VetTests", "Media"})
=======
@Test(groups = {"VetModalCaption_002"}, dependsOnGroups = "VetModalCaption_001")
>>>>>>>
@Test(groups = {"VetModalCaption_002"})
<<<<<<<
String captionText = String.format("Caption-%d", DateTime.now().getMillis());
new ArticleContent().push(String
.format("[[File:WikiEvolution - Poznańska Wiki|thumb|right|335 px|%s]]", captionText));
=======
WikiBasePageObject base = new WikiBasePageObject();
VisualEditModePageObject visualEditModePageObject =
base.navigateToArticleEditPage(wikiURL, articleTitleCaption);
>>>>>>>
String captionText = String.format("Caption-%d", DateTime.now().getMillis());
new ArticleContent().push(String
.format("[[File:WikiEvolution - Poznańska Wiki|thumb|right|335 px|%s]]", captionText)); |
<<<<<<<
import java.net.HttpURLConnection;
import java.net.URL;
=======
>>>>>>>
import java.net.HttpURLConnection;
import java.net.URL;
<<<<<<<
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.HttpStatus;
=======
>>>>>>>
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.HttpStatus;
<<<<<<<
import com.wikia.webdriver.Common.ContentPatterns.URLsContent;
import com.wikia.webdriver.Common.ContentPatterns.XSSContent;
import com.wikia.webdriver.Common.Core.Assertion;
import com.wikia.webdriver.Common.Core.CommonExpectedConditions;
import com.wikia.webdriver.Common.Core.Global;
import com.wikia.webdriver.Common.Core.Purge.PurgeMethod;
import com.wikia.webdriver.Common.Core.URLBuilder.UrlBuilder;
import com.wikia.webdriver.Common.Logging.PageObjectLogging;
=======
import com.wikia.webdriver.Common.ContentPatterns.URLsContent;
import com.wikia.webdriver.Common.ContentPatterns.XSSContent;
import com.wikia.webdriver.Common.Core.Assertion;
import com.wikia.webdriver.Common.Core.CommonExpectedConditions;
import com.wikia.webdriver.Common.Core.Global;
import com.wikia.webdriver.Common.Core.URLBuilder.UrlBuilder;
import com.wikia.webdriver.Common.Logging.PageObjectLogging;
>>>>>>>
import com.wikia.webdriver.Common.ContentPatterns.URLsContent;
import com.wikia.webdriver.Common.ContentPatterns.XSSContent;
import com.wikia.webdriver.Common.Core.Assertion;
import com.wikia.webdriver.Common.Core.CommonExpectedConditions;
import com.wikia.webdriver.Common.Core.Global;
import com.wikia.webdriver.Common.Core.Purge.PurgeMethod;
import com.wikia.webdriver.Common.Core.URLBuilder.UrlBuilder;
import com.wikia.webdriver.Common.Logging.PageObjectLogging;
<<<<<<<
public void setDisplayStyle(String selector, String style) {
JavascriptExecutor js = (JavascriptExecutor) driver;
js.executeScript("document.querySelector(arguments[0]).style.display = arguments[1]", selector, style);
}
private void purge(String URL) throws Exception {
HttpClient client = new HttpClient();
HttpMethod method = new PurgeMethod(URL);
try {
int status = client.executeMethod(method);
if (status != HttpStatus.SC_OK && status != HttpStatus.SC_NOT_FOUND) {
throw new Exception("HTTP PURGE failed for: " + URL + "(" + status + ")");
}
PageObjectLogging.log("purge", URL, true);
return;
} finally {
method.releaseConnection();
}
}
/**
* return status code of given URL
* @param URL
* @return
*/
public int getURLStatus(String URL) {
try {
purge(URL);
HttpURLConnection.setFollowRedirects(false);
HttpURLConnection connection = (HttpURLConnection) new URL(URL).openConnection();
connection.disconnect();
connection.setRequestMethod("GET");
connection.setRequestProperty(
"User-Agent",
"Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.2) " +
"Gecko/20090729 Firefox/3.5.2 (.NET CLR 3.5.30729)"
);
int status = connection.getResponseCode();
connection.disconnect();
return status;
} catch (Exception e) {
throw new RuntimeException(e);
}
}
/**
* check if current HTTP status of given URL is the same as expected
* @param desiredStatus
* @param URL
*/
public void verifyURLStatus(int desiredStatus, String URL) {
int timeOut = 500;
int statusCode = 0;
boolean status = false;
while (!status) {
try {
statusCode = getURLStatus(URL);
if (statusCode == desiredStatus){
status = true;
} else {
Thread.sleep(500);
timeOut += 500;
}
if (timeOut > 20000) {
break;
}
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
}
Assertion.assertEquals(statusCode, desiredStatus);
PageObjectLogging.log("verifyURLStatus", URL + " has status " + statusCode, true);
}
=======
public void openSpecialPromoteOnCurrentWiki() {
JavascriptExecutor js = (JavascriptExecutor) driver;
String url = (String) js.executeScript("return wgServer");
getUrl(url + "/" + URLsContent.specialPromote);
PageObjectLogging.log("openSpecialPromote", "special promote page opened", true);
}
>>>>>>>
public void setDisplayStyle(String selector, String style) {
JavascriptExecutor js = (JavascriptExecutor) driver;
js.executeScript("document.querySelector(arguments[0]).style.display = arguments[1]", selector, style);
}
private void purge(String URL) throws Exception {
HttpClient client = new HttpClient();
HttpMethod method = new PurgeMethod(URL);
try {
int status = client.executeMethod(method);
if (status != HttpStatus.SC_OK && status != HttpStatus.SC_NOT_FOUND) {
throw new Exception("HTTP PURGE failed for: " + URL + "(" + status + ")");
}
PageObjectLogging.log("purge", URL, true);
return;
} finally {
method.releaseConnection();
}
}
/**
* return status code of given URL
* @param URL
* @return
*/
public int getURLStatus(String URL) {
try {
purge(URL);
HttpURLConnection.setFollowRedirects(false);
HttpURLConnection connection = (HttpURLConnection) new URL(URL).openConnection();
connection.disconnect();
connection.setRequestMethod("GET");
connection.setRequestProperty(
"User-Agent",
"Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.2) " +
"Gecko/20090729 Firefox/3.5.2 (.NET CLR 3.5.30729)"
);
int status = connection.getResponseCode();
connection.disconnect();
return status;
} catch (Exception e) {
throw new RuntimeException(e);
}
}
/**
* check if current HTTP status of given URL is the same as expected
* @param desiredStatus
* @param URL
*/
public void verifyURLStatus(int desiredStatus, String URL) {
int timeOut = 500;
int statusCode = 0;
boolean status = false;
while (!status) {
try {
statusCode = getURLStatus(URL);
if (statusCode == desiredStatus){
status = true;
} else {
Thread.sleep(500);
timeOut += 500;
}
if (timeOut > 20000) {
break;
}
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
}
Assertion.assertEquals(statusCode, desiredStatus);
PageObjectLogging.log("verifyURLStatus", URL + " has status " + statusCode, true);
}
public void openSpecialPromoteOnCurrentWiki() {
JavascriptExecutor js = (JavascriptExecutor) driver;
String url = (String) js.executeScript("return wgServer");
getUrl(url + "/" + URLsContent.specialPromote);
PageObjectLogging.log("openSpecialPromote", "special promote page opened", true);
} |
<<<<<<<
public static final String ADS_PUSHSLOT_SCRIPT =
"window.adslots2.push([\"%slot%\",null,\"AdEngine2\"]);";
public static final String AD_DRIVER_FORCED_STATUS_SUCCESS_SCRIPT =
=======
public static final String adsPushSlotScript =
"window.adslots2.push([\"%slot%\"]);";
public static final String adDriverForcedStatusSuccessScript =
>>>>>>>
public static final String ADS_PUSHSLOT_SCRIPT =
"window.adslots2.push([\"%slot%\"]);";
public static final String AD_DRIVER_FORCED_STATUS_SUCCESS_SCRIPT = |
<<<<<<<
AdsBaseObject ads = new AdsBaseObject(page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(
driver,
slot,
ads.findFirstIframeWithAd(slot),
false
=======
AdsBaseObject ads = new AdsBaseObject(driver, page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(driver,
slot,
ads.findFirstIframeWithAd(slot),
false
>>>>>>>
AdsBaseObject ads = new AdsBaseObject(page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(driver,
slot,
ads.findFirstIframeWithAd(slot),
false
<<<<<<<
AdsBaseObject ads = new AdsBaseObject(page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(
driver,
slot,
ads.findFirstIframeWithAd(slot),
false
=======
AdsBaseObject ads = new AdsBaseObject(driver, page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(driver,
slot,
ads.findFirstIframeWithAd(slot),
false
>>>>>>>
AdsBaseObject ads = new AdsBaseObject(page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(driver,
slot,
ads.findFirstIframeWithAd(slot),
false
<<<<<<<
final AdsBaseObject ads = new AdsBaseObject(page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(
driver,
slot,
ads.findFirstIframeWithAd(slot),
false
=======
final AdsBaseObject ads = new AdsBaseObject(driver, page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(driver,
slot,
ads.findFirstIframeWithAd(slot),
false
>>>>>>>
final AdsBaseObject ads = new AdsBaseObject(page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(driver,
slot,
ads.findFirstIframeWithAd(slot),
false
<<<<<<<
AdsBaseObject ads = new AdsBaseObject(page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(
driver,
slot,
ads.findFirstIframeWithAd(slot),
false
=======
AdsBaseObject ads = new AdsBaseObject(driver, page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(driver,
slot,
ads.findFirstIframeWithAd(slot),
false
>>>>>>>
AdsBaseObject ads = new AdsBaseObject(page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(driver,
slot,
ads.findFirstIframeWithAd(slot),
false
<<<<<<<
AdsBaseObject ads = new AdsBaseObject(page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(
driver,
slot,
ads.findFirstIframeWithAd(slot),
false
=======
AdsBaseObject ads = new AdsBaseObject(driver, page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(driver,
slot,
ads.findFirstIframeWithAd(slot),
false
>>>>>>>
AdsBaseObject ads = new AdsBaseObject(page.getUrl());
final AutoplayVuap vuap = new AutoplayVuap(driver,
slot,
ads.findFirstIframeWithAd(slot),
false |
<<<<<<<
}
public void clickShareButton() {
waitForElementByElement(shareButton);
shareButton.click();
PageObjectLogging.log("clickShareButton", "Share button was clicked", true, driver);
}
public void verifyTwitterIframeVisibility() {
waitForElementByElement(twitterIframe);
PageObjectLogging.log("VerifyTwitterIframePresence", "Verify that the Twitter Iframe Is Present", true, driver);
}
public void verifyFBIframeVisibility() {
waitForElementByElement(fBIframe);
PageObjectLogging.log("VerifyFBIframeVisibility", "Verify that the FB Iframe Is Present", true, driver);
}
public void verifyEmailButtonVisibility() {
waitForElementByElement(emailButton);
PageObjectLogging.log("verifyEmailButtonVisibility", "Verify that the Email Button Is Present", true, driver);
}
public void clickTweetButton() {
waitForElementByElement(twitterIframe);
driver.switchTo().frame(twitterIframe);
twitterButton.click();
driver.switchTo().defaultContent();
PageObjectLogging.log("clickTweetButton", "Twitter button was clicked", true, driver);
}
public void clickFBLikeButton() {
waitForElementByElement(fBIframe);
driver.switchTo().frame(fBIframe);
fBLikeButton.click();
driver.switchTo().defaultContent();
PageObjectLogging.log("clickFBLikeButton", "FB Like button was clicked", true, driver);
}
public void clickEmailButton() {
waitForElementByElement(emailButton);
emailButton.click();
PageObjectLogging.log("clickEmailButton", "Email button was clicked", true, driver);
}
public void verifyTwitterModalURL() {
CommonFunctions.waitForWindow("", "");
Object[] windows = driver.getWindowHandles().toArray();
driver.switchTo().window(windows[1].toString());
Assertion.assertStringContains(getCurrentUrl(), "twitter.com");
driver.switchTo().window(windows[0].toString());
PageObjectLogging.log("VerifyTwitterModalURL", "Verify that the Twitter Modal URL is correct", true, driver);
}
public void verifyFBModalURL() {
CommonFunctions.waitForWindow("", "");
Object[] windows = driver.getWindowHandles().toArray();
driver.switchTo().window(windows[1].toString());
Assertion.assertStringContains(getCurrentUrl(), "facebook.com");
driver.switchTo().window(windows[0].toString());
PageObjectLogging.log("VerifyFBModalURL", "Verify that the FB Modal URL is correct", true, driver);
}
public void verifyEmailModalElements() {
waitForElementByElement(emailModalSendButton);
waitForElementByElement(emailModalCancelButton);
waitForElementByElement(emailModalCloseButton);
waitForElementByElement(emailModalEmailInputField);
PageObjectLogging.log("VerifyEmailModalElements", "Verify that the Email Modal elements are present", true, driver);
}
public void verifyLogInModalForAnonsVisibility() {
waitForElementByElement(logInModal);
PageObjectLogging.log("VerifyLogInModalForAnonsVisibility", "Verify that the Log In modal is present", true, driver);
}
=======
public void openWikiPage() {
String temp = Domain;
try {
temp = Domain + "?noexternals=1";
getUrl(temp);
} catch (TimeoutException e) {
PageObjectLogging.log("logOut",
"page loads for more than 30 seconds", true);
}
waitForElementByCss("a[class*=hub]");
executeScript("$('ul#pagehistory li:nth-child(1) .mw-history-undo')");
}
public void openRandomArticle() {
// String href = randomPageButton.getAttribute("href");
// driver.navigate().to(href);
clickAndWait(randomPageButton);
waitForElementByElement(searchButton);
PageObjectLogging.log("openRandomArticle",
"random page button clicked", true, driver);
}
public void openRandomArticleByUrl() {
// String href = randomPageButton.getAttribute("href");
// driver.navigate().to(href);
navigateToRandomPage();
waitForElementByElement(searchButton);
PageObjectLogging.log("openRandomArticle",
"random page button clicked", true, driver);
}
private void navigateToRandomPage() {
String temp = Domain;
try {
temp = Domain + "wiki/Special:Random";
getUrl(temp);
} catch (TimeoutException e) {
PageObjectLogging.log("logOut",
"page loads for more than 30 seconds", true);
}
}
>>>>>>>
public void openWikiPage() {
String temp = Domain;
try {
temp = Domain + "?noexternals=1";
getUrl(temp);
} catch (TimeoutException e) {
PageObjectLogging.log("logOut",
"page loads for more than 30 seconds", true);
}
waitForElementByCss("a[class*=hub]");
executeScript("$('ul#pagehistory li:nth-child(1) .mw-history-undo')");
}
public void openRandomArticle() {
// String href = randomPageButton.getAttribute("href");
// driver.navigate().to(href);
clickAndWait(randomPageButton);
waitForElementByElement(searchButton);
PageObjectLogging.log("openRandomArticle",
"random page button clicked", true, driver);
}
public void openRandomArticleByUrl() {
// String href = randomPageButton.getAttribute("href");
// driver.navigate().to(href);
navigateToRandomPage();
waitForElementByElement(searchButton);
PageObjectLogging.log("openRandomArticle",
"random page button clicked", true, driver);
}
private void navigateToRandomPage() {
String temp = Domain;
try {
temp = Domain + "wiki/Special:Random";
getUrl(temp);
} catch (TimeoutException e) {
PageObjectLogging.log("logOut",
"page loads for more than 30 seconds", true);
}
}
public void clickShareButton() {
waitForElementByElement(shareButton);
shareButton.click();
PageObjectLogging.log("clickShareButton", "Share button was clicked", true, driver);
}
public void verifyTwitterIframeVisibility() {
waitForElementByElement(twitterIframe);
PageObjectLogging.log("VerifyTwitterIframePresence", "Verify that the Twitter Iframe Is Present", true, driver);
}
public void verifyFBIframeVisibility() {
waitForElementByElement(fBIframe);
PageObjectLogging.log("VerifyFBIframeVisibility", "Verify that the FB Iframe Is Present", true, driver);
}
public void verifyEmailButtonVisibility() {
waitForElementByElement(emailButton);
PageObjectLogging.log("verifyEmailButtonVisibility", "Verify that the Email Button Is Present", true, driver);
}
public void clickTweetButton() {
waitForElementByElement(twitterIframe);
driver.switchTo().frame(twitterIframe);
twitterButton.click();
driver.switchTo().defaultContent();
PageObjectLogging.log("clickTweetButton", "Twitter button was clicked", true, driver);
}
public void clickFBLikeButton() {
waitForElementByElement(fBIframe);
driver.switchTo().frame(fBIframe);
fBLikeButton.click();
driver.switchTo().defaultContent();
PageObjectLogging.log("clickFBLikeButton", "FB Like button was clicked", true, driver);
}
public void clickEmailButton() {
waitForElementByElement(emailButton);
emailButton.click();
PageObjectLogging.log("clickEmailButton", "Email button was clicked", true, driver);
}
public void verifyTwitterModalURL() {
CommonFunctions.waitForWindow("", "");
Object[] windows = driver.getWindowHandles().toArray();
driver.switchTo().window(windows[1].toString());
Assertion.assertStringContains(getCurrentUrl(), "twitter.com");
driver.switchTo().window(windows[0].toString());
PageObjectLogging.log("VerifyTwitterModalURL", "Verify that the Twitter Modal URL is correct", true, driver);
}
public void verifyFBModalURL() {
CommonFunctions.waitForWindow("", "");
Object[] windows = driver.getWindowHandles().toArray();
driver.switchTo().window(windows[1].toString());
Assertion.assertStringContains(getCurrentUrl(), "facebook.com");
driver.switchTo().window(windows[0].toString());
PageObjectLogging.log("VerifyFBModalURL", "Verify that the FB Modal URL is correct", true, driver);
}
public void verifyEmailModalElements() {
waitForElementByElement(emailModalSendButton);
waitForElementByElement(emailModalCancelButton);
waitForElementByElement(emailModalCloseButton);
waitForElementByElement(emailModalEmailInputField);
PageObjectLogging.log("VerifyEmailModalElements", "Verify that the Email Modal elements are present", true, driver);
}
public void verifyLogInModalForAnonsVisibility() {
waitForElementByElement(logInModal);
PageObjectLogging.log("VerifyLogInModalForAnonsVisibility", "Verify that the Log In modal is present", true, driver);
} |
<<<<<<<
import com.wikia.webdriver.PageObjectsFactory.PageObject.WikiPage.EditMode.WikiArticleEditMode;
import org.json.JSONException;
import org.json.JSONObject;
import org.openqa.selenium.Cookie;
import org.openqa.selenium.Dimension;
=======
>>>>>>>
import org.json.JSONException;
import org.json.JSONObject;
import org.openqa.selenium.Cookie;
import org.openqa.selenium.Dimension; |
<<<<<<<
=======
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.Multiwikifinder.SpecialMultiWikiFinderPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialAdminDashboardPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialCreateTopListPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialCssPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialMultipleUploadPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialNewFilesPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialUploadPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialVideosPageObject;
>>>>>>>
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.Multiwikifinder.SpecialMultiWikiFinderPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialAdminDashboardPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialCreateTopListPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialCssPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialMultipleUploadPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialNewFilesPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialUploadPageObject;
import com.wikia.webdriver.PageObjectsFactory.PageObject.Special.SpecialVideosPageObject; |
<<<<<<<
@FindBy(css = ".article-gallery > figure > img")
=======
public MercuryArticlePageObject(WebDriver driver) {
super(driver);
// TODO Auto-generated constructor stub
}
@FindBy(css = ".article-gallery img")
>>>>>>>
@FindBy(css = ".article-gallery img") |
<<<<<<<
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.ListSelectionModel;
import javax.swing.RowSorter.SortKey;
import javax.swing.SortOrder;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.commons.lang3.text.WordUtils;
import com.pokegoapi.api.PokemonGo;
import com.pokegoapi.api.map.pokemon.EvolutionResult;
import com.pokegoapi.api.player.PlayerProfile.Currency;
import com.pokegoapi.api.pokemon.Pokemon;
import com.pokegoapi.api.pokemon.PokemonMeta;
import com.pokegoapi.api.pokemon.PokemonMetaRegistry;
import com.pokegoapi.api.pokemon.PokemonMoveMeta;
import com.pokegoapi.api.pokemon.PokemonMoveMetaRegistry;
=======
>>>>>>>
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.ListSelectionModel;
import javax.swing.RowSorter.SortKey;
import javax.swing.SortOrder;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.commons.lang3.text.WordUtils;
import com.pokegoapi.api.PokemonGo;
import com.pokegoapi.api.map.pokemon.EvolutionResult;
import com.pokegoapi.api.player.PlayerProfile.Currency;
import com.pokegoapi.api.pokemon.Pokemon;
import com.pokegoapi.api.pokemon.PokemonMeta;
import com.pokegoapi.api.pokemon.PokemonMetaRegistry;
import com.pokegoapi.api.pokemon.PokemonMoveMeta;
import com.pokegoapi.api.pokemon.PokemonMoveMetaRegistry; |
<<<<<<<
private AccountManager accountManager = AccountManager.getInstance();
=======
private final StringProperty evolvable = new SimpleStringProperty();
private final Pokemon pokemon;
>>>>>>>
private final StringProperty evolvable = new SimpleStringProperty();
private final Pokemon pokemon;
private AccountManager accountManager = AccountManager.getInstance(); |
<<<<<<<
* 25 Double - gymOffense
* 26 Long - gymDefense
* 27 Double - Move 1 Rating
* 28 Double - Move 2 Rating
* 29 Long - duelAbility IV
* 30 Double - gymOffense IV
* 31 Long - gymDefense IV
=======
* 25 Integer - gymOffense
* 26 Integer - gymDefense
* 27 String(Percentage) - Move 1 Rating
* 28 String(Percentage) - Move 2 Rating
* 29 String(Nullable Int) - CP Evolved
>>>>>>>
* 25 Integer - gymOffense
* 26 Integer - gymDefense
* 27 String(Percentage) - Move 1 Rating
* 28 String(Percentage) - Move 2 Rating
* 29 String(Nullable Int) - CP Evolved
* 30 Long - duelAbility IV
* 31 Double - gymOffense IV
* 32 Long - gymDefense IV
<<<<<<<
trs.setComparator(27, cDouble);
trs.setComparator(28, cDouble);
trs.setComparator(29, cLong);
trs.setComparator(30, cDouble);
trs.setComparator(31, cLong);
=======
trs.setComparator(27, cPercentageWithTwoCharacters);
trs.setComparator(28, cPercentageWithTwoCharacters);
trs.setComparator(29, cNullableInt);
>>>>>>>
trs.setComparator(27, cPercentageWithTwoCharacters);
trs.setComparator(28, cPercentageWithTwoCharacters);
trs.setComparator(29, cNullableInt);
trs.setComparator(30, cLong);
trs.setComparator(31, cDouble);
trs.setComparator(32, cLong);
<<<<<<<
private final ArrayList<Long> duelAbilityIVCol = new ArrayList<>();//29
private final ArrayList<Double> gymOffenseIVCol = new ArrayList<>();//30
private final ArrayList<Long> gymDefenseIVCol = new ArrayList<>();//31
=======
private final ArrayList<String> cpEvolvedCol = new ArrayList<>();//29
>>>>>>>
private final ArrayList<String> cpEvolvedCol = new ArrayList<>();//29
private final ArrayList<Long> duelAbilityIVCol = new ArrayList<>();//29
private final ArrayList<Double> gymOffenseIVCol = new ArrayList<>();//30
private final ArrayList<Long> gymDefenseIVCol = new ArrayList<>();//31
<<<<<<<
case 29:
return "Duel Ability IV";
case 30:
return "Gym Offense IV";
case 31:
return "Gym Defense IV";
=======
case 29:
return "CP Evolved";
>>>>>>>
case 29:
return "CP Evolved";
case 30:
return "Duel Ability IV";
case 31:
return "Gym Offense IV";
case 32:
return "Gym Defense IV";
<<<<<<<
return 32;
=======
return 30;
>>>>>>>
return 33;
<<<<<<<
case 29:
return duelAbilityIVCol.get(rowIndex);
case 30:
return gymOffenseIVCol.get(rowIndex);
case 31:
return gymDefenseIVCol.get(rowIndex);
=======
case 29:
return cpEvolvedCol.get(rowIndex);
>>>>>>>
case 29:
return cpEvolvedCol.get(rowIndex);
case 30:
return duelAbilityIVCol.get(rowIndex);
case 31:
return gymOffenseIVCol.get(rowIndex);
case 32:
return gymDefenseIVCol.get(rowIndex); |
<<<<<<<
if (Config.getConfig().getBool("develop", false)) {
new ChooseGuiWindowController();
sPrimaryStage.show();
}
=======
if (ConfigNew.getConfig().getBool(ConfigKey.DEVELOPFLAG))
openGUIChooser(primaryStage);
>>>>>>>
if (ConfigNew.getConfig().getBool(ConfigKey.DEVELOPFLAG)) {
new ChooseGuiWindowController();
sPrimaryStage.show();
} |
<<<<<<<
config = new JSONObject("{\"login\":{},\"options\":{}}");
saveConfig();
=======
config = new JSONObject("{\"login\":{},\"options\":{\"lang\":\"en\"}}");
Utilities.saveFile(file, config.toString(4));
>>>>>>>
config = new JSONObject("{\"login\":{},\"options\":{\"lang\":\"en\"}}");
saveConfig(); |
<<<<<<<
=======
import static java.lang.Math.min;
import static java.util.Collections.sort;
>>>>>>>
import static java.lang.Math.min;
<<<<<<<
List<Tuple2id> items = popList.stream()
.filter(is -> filter.test(is.v1))
.limit(maxLength)
=======
List<IdxDouble> items = popList.stream()
.filter(is -> filter.test(is.idx))
.limit(min(maxLength, popList.size()))
>>>>>>>
List<Tuple2id> items = popList.stream()
.filter(is -> filter.test(is.v1))
.limit(min(maxLength, popList.size())) |
<<<<<<<
recMap.forEach(Unchecked.biConsumer((name, recommender) -> {
System.out.println("Running " + name);
runner.run(recommender.get(), name);
}));
=======
recMap.forEach((name, recommender) -> {
try {
System.out.println("Running " + name);
runner.run(recommender.get(), format.getWriter(name));
} catch (IOException ex) {
throw new UncheckedIOException(ex);
}
});
>>>>>>>
recMap.forEach(Unchecked.biConsumer((name, recommender) -> {
System.out.println("Running " + name);
runner.run(recommender.get(), format.getWriter(name));
})); |
<<<<<<<
import es.uam.eps.ir.ranksys.core.preference.IdPref;
=======
import org.ranksys.compression.codecs.CODEC;
import static org.ranksys.compression.util.Delta.delta;
import es.uam.eps.ir.ranksys.fast.preference.IdxPref;
>>>>>>>
import es.uam.eps.ir.ranksys.core.preference.IdPref;
<<<<<<<
=======
import java.util.stream.Stream;
>>>>>>>
<<<<<<<
import org.ranksys.compression.codecs.CODEC;
=======
>>>>>>>
import java.io.Serializable;
import java.util.function.Function;
import java.util.stream.Stream;
import org.ranksys.compression.codecs.CODEC;
import static org.ranksys.compression.util.Delta.delta;
<<<<<<<
public Stream<? extends IdxPref> getUidxPreferences(final int uidx) {
return getPreferences(u_idxs[uidx], u_vs[uidx], u_len[uidx], u_codec, r_codec);
}
@Override
public Stream<? extends IdxPref> getIidxPreferences(final int iidx) {
return getPreferences(i_idxs[iidx], i_vs[iidx], i_len[iidx], i_codec, r_codec);
}
private static <Cx, Cv> Stream<IdxPref> getPreferences(Cx cidxs, Cv cvs, int len, CODEC<Cx> x_codec, CODEC<Cv> r_codec) {
if (len == 0) {
return empty();
}
int[] idxs = new int[len];
int[] vs = new int[len];
x_codec.dec(cidxs, idxs, 0, len);
r_codec.dec(cvs, vs, 0, len);
if (!x_codec.isIntegrated()) {
atled(idxs, 0, len);
}
return range(0, len).mapToObj(i -> new IdxPref(idxs[i], vs[i]));
}
@Override
=======
>>>>>>> |
<<<<<<<
import static es.uam.eps.ir.ranksys.core.util.FastStringSplitter.split;
import es.uam.eps.ir.ranksys.core.util.parsing.Parser;
=======
import es.uam.eps.ir.ranksys.fast.IdxObject;
>>>>>>>
<<<<<<<
import org.ranksys.core.util.tuples.Tuple2io;
import static org.ranksys.core.util.tuples.Tuples.tuple;
=======
import org.jooq.lambda.tuple.Tuple3;
>>>>>>>
import org.jooq.lambda.tuple.Tuple3;
import org.ranksys.core.util.tuples.Tuple2io;
import static org.ranksys.core.util.tuples.Tuples.tuple;
<<<<<<<
try (BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
reader.lines().forEach(l -> {
CharSequence[] tokens = split(l, '\t', 3);
I item = iParser.parse(tokens[0]);
F feature = fParser.parse(tokens[1]);
V value;
if (tokens.length == 3) {
value = vParser.parse(tokens[2]);
} else {
value = vParser.parse(null);
}
int iidx = iIndex.item2iidx(item);
int fidx = fIndex.feature2fidx(feature);
if (iidx == -1 || fidx == -1) {
return;
}
List<Tuple2io<V>> iList = iidxList.get(iidx);
if (iList == null) {
iList = new ArrayList<>();
iidxList.set(iidx, iList);
}
iList.add(tuple(fidx, value));
List<Tuple2io<V>> fList = fidxList.get(fidx);
if (fList == null) {
fList = new ArrayList<>();
fidxList.set(fidx, fList);
}
fList.add(tuple(iidx, value));
});
}
=======
tuples.forEach(t -> {
int iidx = iIndex.item2iidx(t.v1);
int fidx = fIndex.feature2fidx(t.v2);
if (iidx == -1 || fidx == -1) {
return;
}
List<IdxObject<V>> iList = iidxList.get(iidx);
if (iList == null) {
iList = new ArrayList<>();
iidxList.set(iidx, iList);
}
iList.add(new IdxObject<>(fidx, t.v3));
List<IdxObject<V>> fList = fidxList.get(fidx);
if (fList == null) {
fList = new ArrayList<>();
fidxList.set(fidx, fList);
}
fList.add(new IdxObject<>(iidx, t.v3));
});
>>>>>>>
tuples.forEach(t -> {
int iidx = iIndex.item2iidx(t.v1);
int fidx = fIndex.feature2fidx(t.v2);
if (iidx == -1 || fidx == -1) {
return;
}
List<Tuple2io<V>> iList = iidxList.get(iidx);
if (iList == null) {
iList = new ArrayList<>();
iidxList.set(iidx, iList);
}
iList.add(tuple(fidx, t.v3));
List<Tuple2io<V>> fList = fidxList.get(fidx);
if (fList == null) {
fList = new ArrayList<>();
fidxList.set(fidx, fList);
}
fList.add(tuple(iidx, t.v3));
}); |
<<<<<<<
List<Tuple2id> recommended = new ArrayList<>();
=======
int N = min(maxLength, randomList.size());
List<IdxDouble> recommended = new ArrayList<>();
>>>>>>>
int N = min(maxLength, randomList.size());
List<Tuple2id> recommended = new ArrayList<>();
<<<<<<<
for (int i = 0; i < maxLength; i++) {
Tuple2id iv = randomList.get(j);
while (!filter.test(iv.v1)) {
=======
for (int i = 0; i < N; i++) {
IdxDouble iv = randomList.get(j);
while (!filter.test(iv.idx)) {
>>>>>>>
for (int i = 0; i < N; i++) {
Tuple2id iv = randomList.get(j);
while (!filter.test(iv.v1)) { |
<<<<<<<
import es.uam.eps.ir.ranksys.core.preference.IdPref;
=======
import org.ranksys.fast.preference.StreamsAbstractFastPreferenceData;
>>>>>>>
import es.uam.eps.ir.ranksys.core.preference.IdPref;
<<<<<<<
import it.unimi.dsi.fastutil.doubles.DoubleIterator;
import it.unimi.dsi.fastutil.ints.IntIterator;
=======
>>>>>>>
<<<<<<<
@Override
public Optional<? extends IdPref<I>> getPreference(U u, I i) {
Optional<? extends IdxPref> pref = getPreference(user2uidx(u), item2iidx(i));
if (!pref.isPresent()) {
return Optional.empty();
} else {
return Optional.of(uPrefFun.apply(pref.get()));
}
}
@Override
public IntIterator getUidxIidxs(final int uidx) {
return new StreamIntIterator(getUidxPreferences(uidx).mapToInt(IdxPref::v1));
}
@Override
public DoubleIterator getUidxVs(final int uidx) {
return new StreamDoubleIterator(getUidxPreferences(uidx).mapToDouble(IdxPref::v2));
}
@Override
public IntIterator getIidxUidxs(final int iidx) {
return new StreamIntIterator(getIidxPreferences(iidx).mapToInt(IdxPref::v1));
}
@Override
public DoubleIterator getIidxVs(final int iidx) {
return new StreamDoubleIterator(getIidxPreferences(iidx).mapToDouble(IdxPref::v2));
}
@Override
public boolean useIteratorsPreferentially() {
return false;
}
=======
>>>>>>>
@Override
public Optional<? extends IdPref<I>> getPreference(U u, I i) {
Optional<? extends IdxPref> pref = getPreference(user2uidx(u), item2iidx(i));
if (!pref.isPresent()) {
return Optional.empty();
} else {
return Optional.of(uPrefFun.apply(pref.get()));
}
} |
<<<<<<<
public Recommendation(U user, List<IdDouble<I>> items) {
=======
/**
* Constructs the recommendation.
*
* @param user the user that receives the recommendation
* @param items a list of item ID-score pairs sorted by descending score
*/
public Recommendation(U user, List<IdDoublePair<I>> items) {
>>>>>>>
/**
* Constructs the recommendation.
*
* @param user the user that receives the recommendation
* @param items a list of item ID-score pairs sorted by descending score
*/
public Recommendation(U user, List<IdDouble<I>> items) {
<<<<<<<
public List<IdDouble<I>> getItems() {
=======
/**
* Returns the list of item-score pairs.
*
* @return a list of item ID-score pairs sorted by descending score
*/
public List<IdDoublePair<I>> getItems() {
>>>>>>>
/**
* Returns the list of item-score pairs.
*
* @return a list of item ID-score pairs sorted by descending score
*/
public List<IdDouble<I>> getItems() { |
<<<<<<<
@SuppressWarnings("rawtypes")
private static MapNode[] emptyChildren = {};
=======
private static final long serialVersionUID = 8611758181642617230L;
>>>>>>>
@SuppressWarnings("rawtypes")
private static MapNode[] emptyChildren = {};
private static final long serialVersionUID = 8611758181642617230L; |
<<<<<<<
import java.util.Map;
=======
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
>>>>>>>
import java.io.Serializable;
import java.util.Map;
<<<<<<<
public class MapPatriciaTrie<T> extends PatriciaTrie implements MapTrie<T>{
=======
public class MapPatriciaTrie<T>
extends AbstractTrie
implements Serializable, MapTrie<T>{
>>>>>>>
public class MapPatriciaTrie<T>
extends PatriciaTrie
implements Serializable, MapTrie<T>{
<<<<<<<
private class IterableAdapter extends org.trie4j.util.IterableAdapter<Pair<String, Node>, Map.Entry<String, T>>{
public IterableAdapter(Iterable<Pair<String, Node>> orig){
super(orig);
}
@Override
@SuppressWarnings("unchecked")
protected Map.Entry<String, T> convert(Pair<String, Node> value) {
return new Entry(value.getFirst(), (MapNode<T>)value.getSecond());
}
}
=======
private int size;
private MapNode<T> root = new MapNode<T>();
private static final long serialVersionUID = 2165079531157534766L;
>>>>>>>
private class IterableAdapter extends org.trie4j.util.IterableAdapter<Pair<String, Node>, Map.Entry<String, T>>{
public IterableAdapter(Iterable<Pair<String, Node>> orig){
super(orig);
}
@Override
@SuppressWarnings("unchecked")
protected Map.Entry<String, T> convert(Pair<String, Node> value) {
return new Entry(value.getFirst(), (MapNode<T>)value.getSecond());
}
}
private static final long serialVersionUID = 2165079531157534766L; |
<<<<<<<
private static int containerCount(int size, int unitSize){
return size / unitSize + ((size % unitSize) != 0 ? 1 : 0);
}
private void writeObject(ObjectOutputStream s)
throws IOException {
trimToSize();
ObjectOutputStream.PutField fields = s.putFields();
fields.put("size", size);
trimToSize();
fields.put("vector", vector);
fields.put("countCache0", countCache0);
s.writeFields();
}
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
ObjectInputStream.GetField fields = s.readFields();
size = fields.get("size", 0);
vector = (byte[])fields.get("vector", null);
countCache0 = (int[])fields.get("countCache0", null);
}
=======
>>>>>>>
private static int containerCount(int size, int unitSize){
return size / unitSize + ((size % unitSize) != 0 ? 1 : 0);
} |
<<<<<<<
import brave.Tracing;
import brave.baggage.BaggagePropagation;
import brave.propagation.B3Propagation;
import brave.propagation.B3Propagation.Format;
=======
>>>>>>>
import brave.baggage.BaggagePropagation;
<<<<<<<
// Default for spring-messaging is on 2.2.x is MULTI, though 3.x it is
// SINGLE_NO_PARENT spring-cloud/spring-cloud-sleuth#1607
Propagation.Factory defaultB3Propagation = B3Propagation.newFactoryBuilder()
.injectFormat(Format.SINGLE_NO_PARENT).build();
=======
>>>>>>>
<<<<<<<
.extracting("delegate").isNotNull();
=======
.hasFieldOrPropertyWithValue("delegate",
TraceBaggageConfiguration.B3_FACTORY);
>>>>>>>
.extracting("delegate")
.isEqualTo(TraceBaggageConfiguration.B3_FACTORY);
<<<<<<<
BDDAssertions.then(context.getBean(Tracing.class).propagation())
.isEqualTo(defaultB3Propagation);
=======
BDDAssertions.then(context.getBean(Propagation.Factory.class))
.isEqualTo(TraceBaggageConfiguration.B3_FACTORY);
});
}
@Test
public void hasNoCycles() {
this.contextRunner
.withConfiguration(AutoConfigurations.of(TraceWebAutoConfiguration.class,
TraceHttpAutoConfiguration.class))
.withInitializer(c -> ((GenericApplicationContext) c)
.setAllowCircularReferences(false))
.run((context) -> {
BDDAssertions.then(context.isRunning()).isEqualTo(true);
>>>>>>>
BDDAssertions.then(context.getBean(Propagation.Factory.class))
.isEqualTo(TraceBaggageConfiguration.B3_FACTORY); |
<<<<<<<
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
=======
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
>>>>>>>
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
<<<<<<<
import org.springframework.boot.test.system.CapturedOutput;
import org.springframework.boot.test.system.OutputCaptureExtension;
import org.springframework.cloud.sleuth.util.ArrayListSpanReporter;
=======
import org.springframework.boot.test.system.CapturedOutput;
import org.springframework.boot.test.system.OutputCaptureExtension;
import org.springframework.cloud.sleuth.util.BlockingQueueSpanReporter;
>>>>>>>
import org.springframework.boot.test.system.CapturedOutput;
import org.springframework.boot.test.system.OutputCaptureExtension;
import org.springframework.cloud.sleuth.util.BlockingQueueSpanReporter;
<<<<<<<
=======
import org.springframework.test.context.junit.jupiter.SpringExtension;
>>>>>>>
<<<<<<<
=======
@ExtendWith({ SpringExtension.class, OutputCaptureExtension.class })
>>>>>>>
<<<<<<<
@Autowired
Tracing tracer;
=======
>>>>>>>
<<<<<<<
@BeforeEach
@AfterEach
=======
@AfterEach
>>>>>>>
@AfterEach
<<<<<<<
then(this.accumulator.getSpans()).hasSize(1);
Span fromFirstTraceFilterFlow = this.accumulator.getSpans().get(0);
then(fromFirstTraceFilterFlow.tags()).containsEntry("http.method", "GET")
=======
Span fromFirstTraceFilterFlow = this.reporter.takeSpan();
then(fromFirstTraceFilterFlow.tags()).containsEntry("http.method", "GET")
>>>>>>>
Span fromFirstTraceFilterFlow = this.reporter.takeSpan();
then(fromFirstTraceFilterFlow.tags()).containsEntry("http.method", "GET") |
<<<<<<<
=======
import brave.http.HttpAdapter;
import brave.http.HttpClientParser;
>>>>>>>
<<<<<<<
=======
import brave.http.HttpRequestParser;
import brave.http.HttpResponseParser;
import brave.http.HttpSampler;
import brave.http.HttpServerParser;
>>>>>>>
import brave.http.HttpRequestParser;
import brave.http.HttpResponseParser;
<<<<<<<
=======
}
@Configuration
class DeprecatedServerSamplerConfig {
static final HttpSampler INSTANCE = new HttpSampler() {
@Override
public <Req> Boolean trySample(HttpAdapter<Req, ?> httpAdapter, Req req) {
return null;
}
};
@Bean(ServerSampler.NAME)
HttpSampler sleuthServerSampler() {
return INSTANCE;
}
}
@Configuration
class HttpClientParserConfig {
static final HttpRequestParser REQUEST_PARSER = (r, c, s) -> {
};
static final HttpResponseParser RESPONSE_PARSER = (r, c, s) -> {
};
@Bean(HttpClientRequestParser.NAME)
HttpRequestParser sleuthHttpClientRequestParser() {
return REQUEST_PARSER;
}
@Bean(HttpClientResponseParser.NAME)
HttpResponseParser sleuthHttpClientResponseParser() {
return RESPONSE_PARSER;
}
}
@Configuration
class DeprecatedHttpClientParserConfig {
static final HttpClientParser INSTANCE = new HttpClientParser();
@Bean
HttpClientParser clientParser() {
return INSTANCE;
}
}
@Configuration
class HttpServerParserConfig {
static final HttpRequestParser REQUEST_PARSER = (r, c, s) -> {
};
static final HttpResponseParser RESPONSE_PARSER = (r, c, s) -> {
};
@Bean(HttpServerRequestParser.NAME)
HttpRequestParser sleuthHttpServerRequestParser() {
return REQUEST_PARSER;
}
@Bean(HttpServerResponseParser.NAME)
HttpResponseParser sleuthHttpServerResponseParser() {
return RESPONSE_PARSER;
}
}
@Configuration
class DeprecatedHttpServerParserConfig {
static final HttpServerParser INSTANCE = new HttpServerParser();
@Bean
HttpServerParser serverParser() {
return INSTANCE;
}
}
@Configuration
class HttpParserConfig {
static final HttpRequestParser REQUEST_PARSER = (r, c, s) -> {
};
static final HttpResponseParser RESPONSE_PARSER = (r, c, s) -> {
};
@Bean(name = { HttpClientRequestParser.NAME, HttpServerRequestParser.NAME })
HttpRequestParser sleuthHttpServerRequestParser() {
return REQUEST_PARSER;
}
@Bean(name = { HttpClientResponseParser.NAME, HttpServerResponseParser.NAME })
HttpResponseParser sleuthHttpServerResponseParser() {
return RESPONSE_PARSER;
}
>>>>>>>
}
@Configuration
class HttpClientParserConfig {
static final HttpRequestParser REQUEST_PARSER = (r, c, s) -> {
};
static final HttpResponseParser RESPONSE_PARSER = (r, c, s) -> {
};
@Bean(HttpClientRequestParser.NAME)
HttpRequestParser sleuthHttpClientRequestParser() {
return REQUEST_PARSER;
}
@Bean(HttpClientResponseParser.NAME)
HttpResponseParser sleuthHttpClientResponseParser() {
return RESPONSE_PARSER;
}
}
@Configuration
class HttpServerParserConfig {
static final HttpRequestParser REQUEST_PARSER = (r, c, s) -> {
};
static final HttpResponseParser RESPONSE_PARSER = (r, c, s) -> {
};
@Bean(HttpServerRequestParser.NAME)
HttpRequestParser sleuthHttpServerRequestParser() {
return REQUEST_PARSER;
}
@Bean(HttpServerResponseParser.NAME)
HttpResponseParser sleuthHttpServerResponseParser() {
return RESPONSE_PARSER;
}
}
@Configuration
class HttpParserConfig {
static final HttpRequestParser REQUEST_PARSER = (r, c, s) -> {
};
static final HttpResponseParser RESPONSE_PARSER = (r, c, s) -> {
};
@Bean(name = { HttpClientRequestParser.NAME, HttpServerRequestParser.NAME })
HttpRequestParser sleuthHttpServerRequestParser() {
return REQUEST_PARSER;
}
@Bean(name = { HttpClientResponseParser.NAME, HttpServerResponseParser.NAME })
HttpResponseParser sleuthHttpServerResponseParser() {
return RESPONSE_PARSER;
} |
<<<<<<<
return new SkipPatternHttpClientSampler(sleuthWebProperties);
=======
if (sleuthClientSampler != null) {
return sleuthClientSampler;
}
String skipPattern = sleuthWebProperties.getClient().getSkipPattern();
if (skipPattern == null) {
return SamplerFunctions.deferDecision();
}
return new SkipPatternHttpClientSampler(Pattern.compile(skipPattern));
>>>>>>>
String skipPattern = sleuthWebProperties.getClient().getSkipPattern();
if (skipPattern == null) {
return SamplerFunctions.deferDecision();
}
return new SkipPatternHttpClientSampler(Pattern.compile(skipPattern)); |
<<<<<<<
import brave.propagation.B3Propagation;
=======
import brave.handler.MutableSpan;
>>>>>>>
import brave.handler.MutableSpan;
import brave.propagation.B3Propagation;
<<<<<<<
import brave.propagation.TraceContext;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import zipkin2.Span;
=======
import brave.test.TestSpanHandler;
import org.junit.After;
import org.junit.Test;
>>>>>>>
import brave.propagation.TraceContext;
import brave.test.TestSpanHandler;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
<<<<<<<
// SINGLE_NO_PARENT more appropriate for messaging, but we check parent
// hereTraceMessageHeaders
.propagationFactory(
B3Propagation.newFactoryBuilder().injectFormat(SINGLE).build())
.spanReporter(this.spans::add).build();
=======
.addSpanHandler(this.spans).build();
>>>>>>>
// SINGLE_NO_PARENT more appropriate for messaging, but we check parent
// hereTraceMessageHeaders
.propagationFactory(
B3Propagation.newFactoryBuilder().injectFormat(SINGLE).build())
.addSpanHandler(this.spans).build();
<<<<<<<
assertThat(this.channel.receive().getHeaders()).containsKey("b3");
assertThat(this.spans).hasSize(1).flatExtracting(Span::kind)
=======
assertThat(this.channel.receive().getHeaders()).containsKeys("X-B3-TraceId",
"X-B3-SpanId", "X-B3-Sampled", "nativeHeaders");
assertThat(this.spans).hasSize(1).extracting(MutableSpan::kind)
>>>>>>>
assertThat(this.channel.receive().getHeaders()).containsKey("b3");
assertThat(this.spans).hasSize(1).extracting(MutableSpan::kind)
<<<<<<<
assertThat(this.message.getHeaders()).containsKeys("b3", "nativeHeaders");
assertThat(this.spans).flatExtracting(Span::kind).contains(Span.Kind.CONSUMER,
=======
assertThat(this.message.getHeaders()).containsKeys("X-B3-TraceId", "X-B3-SpanId",
"X-B3-Sampled", "nativeHeaders");
assertThat(this.spans).extracting(MutableSpan::kind).contains(Span.Kind.CONSUMER,
>>>>>>>
assertThat(this.message.getHeaders()).containsKeys("b3", "nativeHeaders");
assertThat(this.spans).extracting(MutableSpan::kind).contains(Span.Kind.CONSUMER,
<<<<<<<
assertThat(this.channel.receive().getHeaders()).containsKeys("b3",
"nativeHeaders");
assertThat(this.spans).hasSize(1).flatExtracting(Span::kind)
=======
assertThat(this.channel.receive().getHeaders()).containsKeys("X-B3-TraceId",
"X-B3-SpanId", "X-B3-Sampled", "nativeHeaders");
assertThat(this.spans).hasSize(1).extracting(MutableSpan::kind)
>>>>>>>
assertThat(this.channel.receive().getHeaders()).containsKeys("b3",
"nativeHeaders");
assertThat(this.spans).hasSize(1).extracting(MutableSpan::kind)
<<<<<<<
assertThat(messages.get(0).getHeaders()).doesNotContainKeys("b3",
"nativeHeaders");
assertThat(this.spans).flatExtracting(Span::kind)
=======
assertThat(messages.get(0).getHeaders()).doesNotContainKeys("X-B3-TraceId",
"X-B3-SpanId", "X-B3-Sampled", "nativeHeaders");
assertThat(this.spans).extracting(MutableSpan::kind)
>>>>>>>
assertThat(messages.get(0).getHeaders()).doesNotContainKeys("b3",
"nativeHeaders");
assertThat(this.spans).extracting(MutableSpan::kind) |
<<<<<<<
final double edgeLength = edgeLengths[up];
final int scaledOffset = matrixSize * probabilityIndices[up];
=======
final int scaledOffset = matrixTraitSize * probabilityIndices[up];
>>>>>>>
final double edgeLength = edgeLengths[up];
final int scaledOffset = matrixTraitSize * probabilityIndices[up];
<<<<<<<
computeVarianceBranch(unscaledOffset, scaledOffset, scaledOffsetDiagonal, edgeLength);
=======
computeOUVarianceBranch(unscaledOffset, scaledOffset, scaledOffsetDiagonal);
>>>>>>>
computeOUVarianceBranch(unscaledOffset, scaledOffset, scaledOffsetDiagonal, edgeLength);
<<<<<<<
void computeVarianceBranch(final int unscaledOffset,
final int scaledOffset,
final int scaledOffsetDiagonal,
final double edgeLength) {
scalingActualizationMatrix(diagonalActualizations, scaledOffsetDiagonal,
stationaryVariances, unscaledOffset,
variances, scaledOffset,
dimTrait,
edgeLength,
inverseDiffusions,
unscaledOffset);
=======
void computeOUVarianceBranch(final int sourceOffset,
final int destinationOffset,
final int destinationOffsetDiagonal) {
double[] scales = new double[dimTrait * dimTrait];
scalingActualizationMatrix(diagonalActualizations, destinationOffsetDiagonal, dimProcess, scales);
scale(stationaryVariances, sourceOffset, scales, variances, destinationOffset, dimProcess * dimProcess);
>>>>>>>
void computeOUVarianceBranch(final int unscaledOffset,
final int scaledOffset,
final int scaledOffsetDiagonal,
final double edgeLength) {
scalingActualizationMatrix(diagonalActualizations, scaledOffsetDiagonal,
stationaryVariances, unscaledOffset,
variances, scaledOffset,
dimTrait,
edgeLength,
inverseDiffusions,
unscaledOffset); |
<<<<<<<
import org.springframework.context.ApplicationListener;
import org.springframework.context.EnvironmentAware;
=======
import org.springframework.context.event.EventListener;
>>>>>>>
import org.springframework.context.ApplicationListener;
<<<<<<<
public class DefaultEndpointLocator implements EndpointLocator, EnvironmentAware,
ApplicationListener<ServletWebServerInitializedEvent> {
=======
public class DefaultEndpointLocator implements EndpointLocator {
>>>>>>>
public class DefaultEndpointLocator implements EndpointLocator,
ApplicationListener<ServletWebServerInitializedEvent> { |
<<<<<<<
private static final String NAMECONTENT = "nameContent";
private static final String PRUNEDNODES = "prunedNodes";
=======
private static final String NAME_CONTENT = "nameContent";
>>>>>>>
private static final String NAME_CONTENT = "nameContent";
private static final String PRUNED_NODES = "prunedNodes";
<<<<<<<
private void readTrees(List<Tree> trees, String inputFileName) throws IOException {
progressStream.println("Reading trees (bar assumes 10,000 trees)...");
progressStream.println("0 25 50 75 100");
progressStream.println("|--------------|--------------|--------------|--------------|");
long stepSize = 10000 / 60;
FileReader fileReader = new FileReader(inputFileName);
TreeImporter importer = new NexusImporter(fileReader, false);
try {
totalTrees = 0;
while (importer.hasTree()) {
Tree tree = importer.importNextTree();
if (trees == null) {
trees = new ArrayList<>();
}
trees.add(tree);
if (totalTrees > 0 && totalTrees % stepSize == 0) {
progressStream.print("*");
progressStream.flush();
}
totalTrees++;
}
} catch (Importer.ImportException e) {
System.err.println("Error Parsing Input Tree: " + e.getMessage());
return;
}
fileReader.close();
progressStream.println();
progressStream.println();
if (totalTrees < 1) {
System.err.println("No trees");
return;
}
progressStream.println("Total trees read: " + totalTrees);
}
=======
>>>>>>>
<<<<<<<
if (names != null) {
for (String name : names) {
if(!basedOnContent){
int taxonId = tree.getTaxonIndex(name);
if (taxonId == -1) {
throw new RuntimeException("Unable to find taxon '" + name + "'.");
}
System.out.println(name);
taxa.add(tree.getTaxon(taxonId));
} else {
int counter = 0;
for(int i = 0; i < tree.getTaxonCount(); i++) {
Taxon taxon = tree.getTaxon(i);
String taxonName = taxon.toString();
if (taxonName.contains(name)) {
taxa.add(taxon);
System.out.println(taxonName);
counter ++;
}
}
if (counter == 0){
throw new RuntimeException("Unable to find taxon with a name containing '" + name + "'.");
}
}
}
}
=======
getTaxaToFromName(tree, taxa, names, basedOnContent);
>>>>>>>
if (names != null) {
for (String name : names) {
if(!basedOnContent){
int taxonId = tree.getTaxonIndex(name);
if (taxonId == -1) {
throw new RuntimeException("Unable to find taxon '" + name + "'.");
}
System.out.println(name);
taxa.add(tree.getTaxon(taxonId));
} else {
int counter = 0;
for(int i = 0; i < tree.getTaxonCount(); i++) {
Taxon taxon = tree.getTaxon(i);
String taxonName = taxon.toString();
if (taxonName.contains(name)) {
taxa.add(taxon);
System.out.println(taxonName);
counter ++;
}
}
if (counter == 0){
throw new RuntimeException("Unable to find taxon with a name containing '" + name + "'.");
}
}
}
}
<<<<<<<
tree.beginTreeEdit();
FlexibleNode sibling = (FlexibleNode) getSibling(tree, parent, tip);
sibling.setParent(null);
tree.setRoot(sibling);
// Annotate pruned nodes
sibling.setAttribute(PRUNEDNODES, Integer.toString(((Integer.valueOf((String) sibling.getAttribute(PRUNEDNODES)) + 1))));
tree.endTreeEdit();
=======
//sibling must become new root
NodeRef sibling = getSibling(tree, parent, tip);
FlexibleNode siblingNode = (FlexibleNode) sibling;
siblingNode.setParent(null);
tree.beginTreeEdit();
tree.setRoot(sibling);
tree.endTreeEdit();
//throw new RuntimeException("Still need to handle this situation");
>>>>>>>
//sibling must become new root
tree.beginTreeEdit();
FlexibleNode sibling = (FlexibleNode) getSibling(tree, parent, tip);
sibling.setParent(null);
tree.setRoot(sibling);
// Annotate pruned nodes
sibling.setAttribute(PRUNED_NODES, Integer.toString(
((Integer.valueOf((String) sibling.getAttribute(PRUNED_NODES)) + 1))));
tree.endTreeEdit();
<<<<<<<
int totalTrees = 0;
private void writeOutputFile(List<Tree> trees, String outputFileName, List<Taxon> taxa) {
=======
private void writeOutputFile(List<Tree> trees, String outputFileName) {
>>>>>>>
private void writeOutputFile(List<Tree> trees, String outputFileName, List<Taxon> taxa) { |
<<<<<<<
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
=======
import org.mockito.runners.MockitoJUnitRunner;
>>>>>>>
import org.mockito.junit.MockitoJUnitRunner; |
<<<<<<<
import brave.propagation.TraceContextOrSamplingFlags;
=======
import brave.sampler.RateLimitingSampler;
import brave.sampler.Sampler;
>>>>>>>
import brave.propagation.TraceContextOrSamplingFlags;
import brave.sampler.RateLimitingSampler;
import brave.sampler.Sampler;
<<<<<<<
static class WithMeterRegistry {
=======
static class WithReporter {
@Bean
Reporter<zipkin2.Span> spanReporter() {
return zipkin2.Span::toString;
}
}
@Configuration
static class WithSampler {
@Bean
Sampler alwaysSampler() {
return Sampler.ALWAYS_SAMPLE;
}
}
@Configuration
static class WithLocalKeys {
>>>>>>>
static class WithMeterRegistry {
@Bean
MeterRegistry meterRegistry() {
return new SimpleMeterRegistry();
}
}
@Configuration
static class WithReporter {
@Bean
Reporter<zipkin2.Span> spanReporter() {
return zipkin2.Span::toString;
}
}
@Configuration
static class WithSampler {
@Bean
Sampler alwaysSampler() {
return Sampler.ALWAYS_SAMPLE;
}
}
@Configuration
static class WithLocalKeys { |
<<<<<<<
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import zipkin2.Span;
import zipkin2.reporter.Reporter;
=======
import brave.test.TestSpanHandler;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
>>>>>>>
import brave.test.TestSpanHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; |
<<<<<<<
import org.junit.jupiter.api.Test;
=======
import org.junit.Test;
import zipkin2.Span;
import zipkin2.reporter.Reporter;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
>>>>>>>
import org.junit.jupiter.api.Test;
import zipkin2.Span;
import zipkin2.reporter.Reporter;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; |
<<<<<<<
=======
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
>>>>>>>
import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
<<<<<<<
@ConditionalOnBean(TraceWebAutoConfiguration.class)
@ConditionalOnProperty(name = "spring.sleuth.http.enabled", havingValue = "true",
matchIfMissing = true)
@AutoConfigureAfter(TraceWebAutoConfiguration.class)
=======
// This was formerly conditional on TraceWebAutoConfiguration, which was
// conditional on "spring.sleuth.web.enabled". As this is conditional on
// "spring.sleuth.http.enabled", to be compatible with old behavior we have
// to be conditional on two properties.
@ConditionalOnProperty(
name = { "spring.sleuth.http.enabled", "spring.sleuth.web.enabled" },
havingValue = "true", matchIfMissing = true)
@ConditionalOnBean(Tracing.class)
@ConditionalOnClass(HttpTracing.class)
@AutoConfigureAfter(TraceAutoConfiguration.class)
@Import(TraceWebAutoConfiguration.class)
@EnableConfigurationProperties(TraceKeys.class)
// public allows @AutoConfigureAfter(TraceHttpAutoConfiguration)
// for components needing HttpTracing
>>>>>>>
// This was formerly conditional on TraceWebAutoConfiguration, which was
// conditional on "spring.sleuth.web.enabled". As this is conditional on
// "spring.sleuth.http.enabled", to be compatible with old behavior we have
// to be conditional on two properties.
@ConditionalOnProperty(
name = { "spring.sleuth.http.enabled", "spring.sleuth.web.enabled" },
havingValue = "true", matchIfMissing = true)
@ConditionalOnBean(Tracing.class)
@ConditionalOnClass(HttpTracing.class)
@AutoConfigureAfter(TraceAutoConfiguration.class)
@Import(TraceWebAutoConfiguration.class)
// public allows @AutoConfigureAfter(TraceHttpAutoConfiguration)
// for components needing HttpTracing
<<<<<<<
@Nullable @HttpServerSampler SamplerFunction<HttpRequest> httpServerSampler) {
=======
@Nullable @ServerSampler HttpSampler serverSampler,
@Nullable @HttpServerSampler SamplerFunction<HttpRequest> httpServerSampler,
@Nullable List<HttpTracingCustomizer> httpTracingCustomizers) {
if (httpServerSampler == null) {
httpServerSampler = serverSampler;
}
>>>>>>>
@Nullable @HttpServerSampler SamplerFunction<HttpRequest> httpServerSampler,
@Nullable List<HttpTracingCustomizer> httpTracingCustomizers) { |
<<<<<<<
import brave.http.HttpRequest;
=======
import brave.handler.SpanHandler;
>>>>>>>
import brave.handler.SpanHandler;
import brave.http.HttpRequest;
<<<<<<<
import brave.sampler.SamplerFunction;
=======
import brave.test.TestSpanHandler;
>>>>>>>
import brave.sampler.SamplerFunction;
import brave.test.TestSpanHandler;
<<<<<<<
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import zipkin2.Span;
import zipkin2.reporter.Reporter;
=======
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
>>>>>>>
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
<<<<<<<
import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
import org.springframework.cloud.sleuth.instrument.web.HttpClientSampler;
import org.springframework.cloud.sleuth.util.ArrayListSpanReporter;
=======
import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory;
import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
>>>>>>>
import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
import org.springframework.cloud.sleuth.instrument.web.HttpClientSampler; |
<<<<<<<
import java.util.List;
import brave.Tracing;
import brave.baggage.BaggageField;
import brave.baggage.BaggagePropagation;
import brave.baggage.BaggagePropagationConfig.SingleBaggageField;
import brave.baggage.BaggagePropagationCustomizer;
import brave.propagation.B3SinglePropagation;
=======
import java.util.ArrayList;
import java.util.List;
import brave.Tracing;
import brave.baggage.BaggageField;
import brave.baggage.BaggagePropagation;
import brave.baggage.BaggagePropagationConfig.SingleBaggageField;
import brave.baggage.BaggagePropagationCustomizer;
import brave.handler.SpanHandler;
import brave.propagation.B3Propagation;
import brave.propagation.B3SinglePropagation;
import brave.propagation.ExtraFieldPropagation;
>>>>>>>
import java.util.ArrayList;
import java.util.List;
import brave.Tracing;
import brave.baggage.BaggageField;
import brave.baggage.BaggagePropagation;
import brave.baggage.BaggagePropagationConfig.SingleBaggageField;
import brave.baggage.BaggagePropagationCustomizer;
import brave.handler.SpanHandler;
import brave.propagation.B3SinglePropagation;
<<<<<<<
import brave.propagation.TraceContextOrSamplingFlags;
=======
import brave.propagation.TraceContext;
import brave.propagation.TraceContextOrSamplingFlags;
>>>>>>>
import brave.propagation.TraceContextOrSamplingFlags;
<<<<<<<
void should_apply_micrometer_reporter_metrics_when_meter_registry_bean_present() {
=======
public void span_handler_comparator() {
SpanHandler handler1 = mock(SpanHandler.class);
SpanHandler handler2 = mock(SpanHandler.class);
ZipkinSpanHandler zipkin1 = mock(ZipkinSpanHandler.class);
ZipkinSpanHandler zipkin2 = mock(ZipkinSpanHandler.class);
ArrayList<SpanHandler> spanHandlers = new ArrayList<>();
spanHandlers.add(handler1);
spanHandlers.add(zipkin1);
spanHandlers.add(handler2);
spanHandlers.add(zipkin2);
spanHandlers.sort(SPAN_HANDLER_COMPARATOR);
assertThat(spanHandlers).containsExactly(handler1, handler2, zipkin1, zipkin2);
}
@Test
public void should_apply_micrometer_reporter_metrics_when_meter_registry_bean_present() {
>>>>>>>
void span_handler_comparator() {
SpanHandler handler1 = mock(SpanHandler.class);
SpanHandler handler2 = mock(SpanHandler.class);
ZipkinSpanHandler zipkin1 = mock(ZipkinSpanHandler.class);
ZipkinSpanHandler zipkin2 = mock(ZipkinSpanHandler.class);
ArrayList<SpanHandler> spanHandlers = new ArrayList<>();
spanHandlers.add(handler1);
spanHandlers.add(zipkin1);
spanHandlers.add(handler2);
spanHandlers.add(zipkin2);
spanHandlers.sort(SPAN_HANDLER_COMPARATOR);
assertThat(spanHandlers).containsExactly(handler1, handler2, zipkin1, zipkin2);
}
@Test
void should_apply_micrometer_reporter_metrics_when_meter_registry_bean_present() {
<<<<<<<
@Test
void should_use_baggagePropagationFactoryBuilder_bean() {
// BaggagePropagation.FactoryBuilder unwraps itself if there are no baggage fields
// defined
this.contextRunner
.withUserConfiguration(WithBaggagePropagationFactoryBuilderBean.class)
.run((context -> BDDAssertions
.then(context.getBean(Propagation.Factory.class))
.isSameAs(B3SinglePropagation.FACTORY)));
}
@Configuration
static class Baggage {
List<BaggageField> fields;
@Autowired
Baggage(Tracing tracing) {
// When predefined baggage fields exist, the result !=
// TraceContextOrSamplingFlags.EMPTY
TraceContextOrSamplingFlags emptyExtraction = tracing.propagation()
.extractor((c, k) -> null).extract(Boolean.TRUE);
fields = BaggageField.getAll(emptyExtraction);
}
}
@Configuration
static class WithBaggageBeans {
@Bean
BaggagePropagationCustomizer countryCode() {
return fb -> fb
.add(SingleBaggageField.remote(BaggageField.create("country-code")));
}
@Bean
BaggagePropagationCustomizer requestId() {
return fb -> fb.add(
SingleBaggageField.remote(BaggageField.create("x-vcap-request-id")));
}
}
=======
/**
* {@link BaggagePropagation.FactoryBuilder} is new: 2.2.x should prefer older on
* conflict.
*/
@Test
public void should_prefer_extraFieldPropagationFactoryBuilder_bean() {
this.contextRunner
.withUserConfiguration(WithExtraFieldPropagationFactoryBuilderBean.class)
.withUserConfiguration(WithBaggagePropagationFactoryBuilderBean.class)
.run((context -> BDDAssertions
.then(context.getBean(Propagation.Factory.class))
.isInstanceOf(ExtraFieldPropagation.Factory.class)));
}
@Configuration
static class Baggage {
List<BaggageField> fields;
@Autowired
Baggage(Tracing tracing) {
// When predefined baggage fields exist, the result !=
// TraceContextOrSamplingFlags.EMPTY
TraceContextOrSamplingFlags emptyExtraction = tracing.propagation()
.extractor((c, k) -> null).extract(Boolean.TRUE);
fields = BaggageField.getAll(emptyExtraction);
}
}
@Configuration
static class WithBaggageBeans {
@Bean
BaggagePropagationCustomizer countryCode() {
return fb -> fb
.add(SingleBaggageField.remote(BaggageField.create("country-code")));
}
@Bean
BaggagePropagationCustomizer requestId() {
return fb -> fb.add(
SingleBaggageField.remote(BaggageField.create("x-vcap-request-id")));
}
}
@Configuration
static class WithBaggagePropagationFactoryBuilderBean {
@Bean
BaggagePropagation.FactoryBuilder baggagePropagationFactoryBuilderBean() {
return BaggagePropagation.newFactoryBuilder(B3SinglePropagation.FACTORY);
}
}
>>>>>>>
@Test
void should_use_baggagePropagationFactoryBuilder_bean() {
// BaggagePropagation.FactoryBuilder unwraps itself if there are no baggage fields
// defined
this.contextRunner
.withUserConfiguration(WithBaggagePropagationFactoryBuilderBean.class)
.run((context -> BDDAssertions
.then(context.getBean(Propagation.Factory.class))
.isSameAs(B3SinglePropagation.FACTORY)));
}
@Configuration
static class Baggage {
List<BaggageField> fields;
@Autowired
Baggage(Tracing tracing) {
// When predefined baggage fields exist, the result !=
// TraceContextOrSamplingFlags.EMPTY
TraceContextOrSamplingFlags emptyExtraction = tracing.propagation()
.extractor((c, k) -> null).extract(Boolean.TRUE);
fields = BaggageField.getAll(emptyExtraction);
}
}
@Configuration
static class WithBaggageBeans {
@Bean
BaggagePropagationCustomizer countryCode() {
return fb -> fb
.add(SingleBaggageField.remote(BaggageField.create("country-code")));
}
@Bean
BaggagePropagationCustomizer requestId() {
return fb -> fb.add(
SingleBaggageField.remote(BaggageField.create("x-vcap-request-id")));
}
}
<<<<<<<
static class WithLocalKeys {
@Bean
MeterRegistry meterRegistry() {
return new SimpleMeterRegistry();
}
}
@Configuration
static class WithBaggagePropagationFactoryBuilderBean {
=======
static class WithExtraFieldPropagationFactoryBuilderBean {
>>>>>>>
static class WithLocalKeys {
@Bean
MeterRegistry meterRegistry() {
return new SimpleMeterRegistry();
}
}
@Configuration
static class WithBaggagePropagationFactoryBuilderBean { |
<<<<<<<
import brave.http.HttpRequest;
=======
import brave.handler.SpanHandler;
>>>>>>>
import brave.handler.SpanHandler;
import brave.http.HttpRequest;
<<<<<<<
import brave.sampler.SamplerFunction;
=======
import brave.test.TestSpanHandler;
>>>>>>>
import brave.sampler.SamplerFunction;
import brave.test.TestSpanHandler;
<<<<<<<
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import zipkin2.Span;
import zipkin2.reporter.Reporter;
=======
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
>>>>>>>
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
<<<<<<<
import org.springframework.cloud.sleuth.instrument.web.HttpClientSampler;
import org.springframework.cloud.sleuth.util.ArrayListSpanReporter;
=======
>>>>>>>
import org.springframework.cloud.sleuth.instrument.web.HttpClientSampler; |
<<<<<<<
void should_use_RateLimitedSampler_withFinishedSpanHandler() {
this.contextRunner.withUserConfiguration(WithFinishedSpanHandler.class)
.run((context -> {
final Sampler bean = context.getBean(Sampler.class);
BDDAssertions.then(bean).isInstanceOf(RateLimitingSampler.class);
}));
=======
public void should_use_RateLimitedSampler_withSpanHandler() {
this.contextRunner.withUserConfiguration(WithSpanHandler.class).run((context -> {
final Sampler bean = context.getBean(Sampler.class);
BDDAssertions.then(bean).isInstanceOf(RateLimitingSampler.class);
}));
>>>>>>>
void should_use_RateLimitedSampler_withSpanHandler() {
this.contextRunner.withUserConfiguration(WithSpanHandler.class).run((context -> {
final Sampler bean = context.getBean(Sampler.class);
BDDAssertions.then(bean).isInstanceOf(RateLimitingSampler.class);
})); |
<<<<<<<
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
=======
import brave.test.TestSpanHandler;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
>>>>>>>
import brave.test.TestSpanHandler;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
<<<<<<<
=======
@Autowired
TestSpanHandler spans;
@Autowired
MessagingTemplate messagingTemplate;
>>>>>>>
@Autowired
TestSpanHandler spans; |
<<<<<<<
import org.springframework.cloud.sleuth.instrument.web.TraceWebServletAutoConfiguration;
import org.springframework.context.ApplicationContext;
=======
import org.springframework.cloud.sleuth.ErrorParser;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.instrument.web.HttpSpanInjector;
import org.springframework.cloud.sleuth.instrument.web.HttpTraceKeysInjector;
import org.springframework.cloud.sleuth.instrument.web.TraceWebAutoConfiguration;
>>>>>>>
import org.springframework.cloud.sleuth.instrument.web.TraceWebServletAutoConfiguration;
<<<<<<<
@ConditionalOnClass(RestTemplate.class)
static class RestTemplateConfig {
=======
@Bean
@ConditionalOnMissingBean
public TraceRestTemplateInterceptor traceRestTemplateInterceptor(Tracer tracer,
HttpSpanInjector spanInjector, HttpTraceKeysInjector httpTraceKeysInjector,
ErrorParser errorParser) {
return new TraceRestTemplateInterceptor(tracer, spanInjector,
httpTraceKeysInjector, errorParser);
}
@Configuration
protected static class TraceInterceptorConfiguration {
@Autowired
private TraceRestTemplateInterceptor traceRestTemplateInterceptor;
@Bean
@Order
RestTemplateCustomizer traceRestTemplateCustomizer() {
return new TraceRestTemplateCustomizer(this.traceRestTemplateInterceptor);
}
@Bean
TraceRestTemplateBPP traceRestTemplateBPP(BeanFactory beanFactory) {
return new TraceRestTemplateBPP(beanFactory);
}
}
@Configuration
@ConditionalOnClass({ UserInfoRestTemplateCustomizer.class, OAuth2RestTemplate.class })
protected static class TraceOAuthConfiguration {
@Autowired BeanFactory beanFactory;
@Bean
UserInfoRestTemplateCustomizerBPP userInfoRestTemplateCustomizerBeanPostProcessor() {
return new UserInfoRestTemplateCustomizerBPP(this.beanFactory);
}
>>>>>>>
@ConditionalOnClass(RestTemplate.class)
static class RestTemplateConfig {
<<<<<<<
=======
}
class TraceRestTemplateBPP implements BeanPostProcessor {
private final BeanFactory beanFactory;
private TraceRestTemplateInterceptor interceptor;
TraceRestTemplateBPP(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
}
@Override public Object postProcessBeforeInitialization(Object bean, String beanName)
throws BeansException {
return bean;
}
@Override public Object postProcessAfterInitialization(Object bean, String beanName)
throws BeansException {
if (bean instanceof RestTemplate) {
RestTemplate rt = (RestTemplate) bean;
new RestTemplateInterceptorInjector(interceptor()).inject(rt);
}
return bean;
}
private TraceRestTemplateInterceptor interceptor() {
if (this.interceptor == null) {
this.interceptor = this.beanFactory.getBean(TraceRestTemplateInterceptor.class);
}
return this.interceptor;
}
}
class TraceUserInfoRestTemplateCustomizer implements UserInfoRestTemplateCustomizer {
private final BeanFactory beanFactory;
private final Object delegate;
TraceUserInfoRestTemplateCustomizer(BeanFactory beanFactory) {
this(beanFactory, null);
}
TraceUserInfoRestTemplateCustomizer(BeanFactory beanFactory, Object bean) {
this.beanFactory = beanFactory;
this.delegate = bean;
}
@Override public void customize(OAuth2RestTemplate template) {
final TraceRestTemplateInterceptor interceptor =
this.beanFactory.getBean(TraceRestTemplateInterceptor.class);
new RestTemplateInterceptorInjector(interceptor).inject(template);
if (this.delegate != null) {
((UserInfoRestTemplateCustomizer) this.delegate).customize(template);
}
}
>>>>>>>
}
class TraceRestTemplateBPP implements BeanPostProcessor {
private final BeanFactory beanFactory;
private TracingClientHttpRequestInterceptor interceptor;
TraceRestTemplateBPP(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
}
@Override public Object postProcessBeforeInitialization(Object bean, String beanName)
throws BeansException {
return bean;
}
@Override public Object postProcessAfterInitialization(Object bean, String beanName)
throws BeansException {
if (bean instanceof RestTemplate) {
RestTemplate rt = (RestTemplate) bean;
new RestTemplateInterceptorInjector(interceptor()).inject(rt);
}
return bean;
}
private TracingClientHttpRequestInterceptor interceptor() {
if (this.interceptor == null) {
this.interceptor = this.beanFactory.getBean(TracingClientHttpRequestInterceptor.class);
}
return this.interceptor;
} |
<<<<<<<
@Autowired
private TracingClientHttpRequestInterceptor clientInterceptor;
@PostConstruct
public void init() {
Map<String, RestTemplate> restTemplates = BeanFactoryUtils
.beansOfTypeIncludingAncestors(this.applicationContext,
RestTemplate.class);
for (RestTemplate restTemplate : restTemplates.values()) {
new RestTemplateInterceptorInjector(
this.clientInterceptor).inject(restTemplate);
}
}
=======
@Bean
@Order
RestTemplateCustomizer traceRestTemplateCustomizer() {
return new TraceRestTemplateCustomizer(this.traceRestTemplateInterceptor);
}
>>>>>>>
@Autowired
private TracingClientHttpRequestInterceptor clientInterceptor;
<<<<<<<
=======
}
class TraceRestTemplateCustomizer implements RestTemplateCustomizer {
private final TraceRestTemplateInterceptor interceptor;
TraceRestTemplateCustomizer(TraceRestTemplateInterceptor interceptor) {
this.interceptor = interceptor;
}
@Override public void customize(RestTemplate restTemplate) {
new RestTemplateInterceptorInjector(this.interceptor)
.inject(restTemplate);
}
}
class TraceUserInfoRestTemplateCustomizer implements UserInfoRestTemplateCustomizer {
private final BeanFactory beanFactory;
private final Object delegate;
TraceUserInfoRestTemplateCustomizer(BeanFactory beanFactory) {
this(beanFactory, null);
}
TraceUserInfoRestTemplateCustomizer(BeanFactory beanFactory, Object bean) {
this.beanFactory = beanFactory;
this.delegate = bean;
}
@Override public void customize(OAuth2RestTemplate template) {
final TraceRestTemplateInterceptor interceptor =
this.beanFactory.getBean(TraceRestTemplateInterceptor.class);
new RestTemplateInterceptorInjector(interceptor).inject(template);
if (this.delegate != null) {
((UserInfoRestTemplateCustomizer) this.delegate).customize(template);
}
}
>>>>>>>
}
class TraceRestTemplateCustomizer implements RestTemplateCustomizer {
private final TracingClientHttpRequestInterceptor interceptor;
TraceRestTemplateCustomizer(TracingClientHttpRequestInterceptor interceptor) {
this.interceptor = interceptor;
}
@Override public void customize(RestTemplate restTemplate) {
new RestTemplateInterceptorInjector(this.interceptor)
.inject(restTemplate);
} |
<<<<<<<
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
=======
import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
>>>>>>>
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; |
<<<<<<<
import brave.handler.FinishedSpanHandler;
=======
import brave.handler.SpanHandler;
import brave.propagation.B3Propagation;
>>>>>>>
import brave.handler.SpanHandler;
<<<<<<<
import org.springframework.cloud.sleuth.baggage.TraceBaggageConfiguration;
=======
import org.springframework.cloud.sleuth.log.SleuthLogAutoConfiguration;
>>>>>>>
import org.springframework.cloud.sleuth.baggage.TraceBaggageConfiguration;
<<<<<<<
@Import({ TraceBaggageConfiguration.class, SamplerAutoConfiguration.class })
=======
@Import({ SleuthLogAutoConfiguration.class, SamplerAutoConfiguration.class })
>>>>>>>
@Import({ TraceBaggageConfiguration.class, SamplerAutoConfiguration.class })
<<<<<<<
List<FinishedSpanHandler> finishedSpanHandlers = new ArrayList<>();
@Autowired(required = false)
List<CurrentTraceContext.ScopeDecorator> scopeDecorators = new ArrayList<>();
=======
List<SpanAdjuster> spanAdjusters = new ArrayList<>();
@Autowired(required = false)
List<SpanHandler> spanHandlers = new ArrayList<>();
>>>>>>>
List<SpanHandler> spanHandlers = new ArrayList<>();
<<<<<<<
=======
@Autowired(required = false)
List<ExtraFieldCustomizer> extraFieldCustomizers = new ArrayList<>();
>>>>>>>
<<<<<<<
CurrentTraceContext sleuthCurrentTraceContext(CurrentTraceContext.Builder builder) {
for (ScopeDecorator scopeDecorator : this.scopeDecorators) {
=======
CurrentTraceContext sleuthCurrentTraceContext(CurrentTraceContext.Builder builder,
@Nullable List<CurrentTraceContext.ScopeDecorator> scopeDecorators,
@Nullable List<CurrentTraceContextCustomizer> currentTraceContextCustomizers) {
if (scopeDecorators == null) {
scopeDecorators = Collections.emptyList();
}
if (currentTraceContextCustomizers == null) {
currentTraceContextCustomizers = Collections.emptyList();
}
for (CurrentTraceContext.ScopeDecorator scopeDecorator : scopeDecorators) {
>>>>>>>
CurrentTraceContext sleuthCurrentTraceContext(CurrentTraceContext.Builder builder,
@Nullable List<CurrentTraceContext.ScopeDecorator> scopeDecorators,
@Nullable List<CurrentTraceContextCustomizer> currentTraceContextCustomizers) {
if (scopeDecorators == null) {
scopeDecorators = Collections.emptyList();
}
if (currentTraceContextCustomizers == null) {
currentTraceContextCustomizers = Collections.emptyList();
}
for (CurrentTraceContext.ScopeDecorator scopeDecorator : scopeDecorators) { |
<<<<<<<
HamiltonianMonteCarloOperator(AdaptationMode mode, double weight, GradientWrtParameterProvider gradientProvider,
Parameter parameter, Transform transform, Parameter mask,
double stepSize, int nSteps,
double randomStepCountFraction,
double gradientCheckTolerance) {
this(mode, weight, gradientProvider,
parameter, transform, mask,
new Options(stepSize, nSteps, randomStepCountFraction,
0, 0, 0,
0, gradientCheckTolerance,
10, 0.1),
MassPreconditioner.Type.NONE
);
}
=======
>>>>>>>
<<<<<<<
super(mode, 0.8); // Stan default
=======
super(mode, runtimeOptions.targetAcceptanceProbability);
>>>>>>>
super(mode, runtimeOptions.targetAcceptanceProbability);
<<<<<<<
public Options(double initialStepSize, int nSteps, double randomStepCountFraction,
int preconditioningUpdateFrequency, int preconditioningDelay, int preconditioningMemory,
int gradientCheckCount, double gradientCheckTolerance,
int checkStepSizeMaxIterations, double checkStepSizeReductionFactor) {
=======
public Options(double initialStepSize, int nSteps, double randomStepCountFraction,
int preconditioningUpdateFrequency, int preconditioningDelay, int preconditioningMemory,
int gradientCheckCount, double gradientCheckTolerance,
int checkStepSizeMaxIterations, double checkStepSizeReductionFactor,
double targetAcceptanceProbability) {
>>>>>>>
public Options(double initialStepSize, int nSteps, double randomStepCountFraction,
int preconditioningUpdateFrequency, int preconditioningDelay, int preconditioningMemory,
int gradientCheckCount, double gradientCheckTolerance,
int checkStepSizeMaxIterations, double checkStepSizeReductionFactor,
double targetAcceptanceProbability) {
<<<<<<<
@Override
void checkPosition(Transform transform, double[] unTransformedPosition) throws NumericInstabilityException {
if (!transform.isInInteriorDomain(unTransformedPosition, 0, unTransformedPosition.length)) {
throw new NumericInstabilityException();
}
}
// @Override
// void checkEqual(double x, double y, double eps) throws NumericInstabilityException {
// if (Math.abs(x - y) > eps) {
// throw new NumericInstabilityException();
// }
// }
@Override
boolean checkPositionTransform() { return true; }
=======
@Override
void checkEqual(double x, double y, double eps) throws NumericInstabilityException {
if (Math.abs(x - y) > eps) {
throw new NumericInstabilityException();
}
}
>>>>>>>
@Override
void checkPosition(Transform transform, double[] unTransformedPosition) throws NumericInstabilityException {
if (!transform.isInInteriorDomain(unTransformedPosition, 0, unTransformedPosition.length)) {
throw new NumericInstabilityException();
}
}
// @Override
// void checkEqual(double x, double y, double eps) throws NumericInstabilityException {
// if (Math.abs(x - y) > eps) {
// throw new NumericInstabilityException();
// }
// }
@Override
boolean checkPositionTransform() { return true; }
<<<<<<<
@Override
void checkPosition(Transform transform, double[] unTransformedPosition) throws NumericInstabilityException {
if (!transform.isInInteriorDomain(unTransformedPosition, 0, unTransformedPosition.length)) {
System.err.println("Numerical instability in HMC momentum; throwing exception");
throw new NumericInstabilityException();
}
}
// @Override
// void checkEqual(double x, double y, double eps) throws NumericInstabilityException {
// if (Math.abs(x - y) > eps) {
// System.err.println("Numerical instability in HMC momentum; throwing exception");
// throw new NumericInstabilityException();
// }
// }
@Override
boolean checkPositionTransform() { return true; }
=======
@Override
void checkEqual(double x, double y, double eps) throws NumericInstabilityException {
if (Math.abs(x - y) > eps) {
System.err.println("Numerical instability in HMC momentum; throwing exception");
throw new NumericInstabilityException();
}
}
>>>>>>>
@Override
void checkPosition(Transform transform, double[] unTransformedPosition) throws NumericInstabilityException {
if (!transform.isInInteriorDomain(unTransformedPosition, 0, unTransformedPosition.length)) {
System.err.println("Numerical instability in HMC momentum; throwing exception");
throw new NumericInstabilityException();
}
}
// @Override
// void checkEqual(double x, double y, double eps) throws NumericInstabilityException {
// if (Math.abs(x - y) > eps) {
// System.err.println("Numerical instability in HMC momentum; throwing exception");
// throw new NumericInstabilityException();
// }
// }
@Override
boolean checkPositionTransform() { return true; }
<<<<<<<
=======
checkPosition(position);
>>>>>>>
<<<<<<<
private void checkPosition(double[] unTransformedPosition) throws NumericInstabilityException {
instabilityHandler.checkPosition(transform, unTransformedPosition);
}
// private void checkPosition(double[] position) throws NumericInstabilityException {
// double[] newPosition = transform.transform(transform.inverse(position, 0, position.length),
// 0, position.length);
// for (int i = 0; i < position.length; i++) {
// instabilityHandler.checkEqual(position[i], newPosition[i], EPS);
// }
// }
//
// private double EPS = 10e-10;
=======
@Override
public void checkPosition(double[] position) throws NumericInstabilityException {
double[] newPosition = transform.transform(transform.inverse(position, 0, position.length), 0, position.length);
for (int i = 0; i < position.length; i++) {
instabilityHandler.checkEqual(position[i], newPosition[i], EPS);
}
}
private double EPS = 10e-10;
>>>>>>>
private void checkPosition(double[] unTransformedPosition) throws NumericInstabilityException {
instabilityHandler.checkPosition(transform, unTransformedPosition);
}
// private void checkPosition(double[] position) throws NumericInstabilityException {
// double[] newPosition = transform.transform(transform.inverse(position, 0, position.length),
// 0, position.length);
// for (int i = 0; i < position.length; i++) {
// instabilityHandler.checkEqual(position[i], newPosition[i], EPS);
// }
// }
//
// private double EPS = 10e-10; |
<<<<<<<
import brave.propagation.StrictScopeDecorator;
import brave.propagation.ThreadLocalCurrentTraceContext;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
=======
import brave.propagation.StrictCurrentTraceContext;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
>>>>>>>
import brave.propagation.StrictCurrentTraceContext;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension; |
<<<<<<<
=======
BeanFactory beanFactory = Mockito.mock(BeanFactory.class);
BDDMockito.given(beanFactory.getBean(TraceWebAutoConfiguration.SkipPatternProvider.class))
.willThrow(new NoSuchBeanDefinitionException("foo"));
>>>>>>>
BDDMockito.given(beanFactory.getBean(TraceWebAutoConfiguration.SkipPatternProvider.class))
.willThrow(new NoSuchBeanDefinitionException("foo")); |
<<<<<<<
import brave.http.HttpServerParser;
=======
import brave.http.HttpRequestParser;
import brave.http.HttpResponseParser;
import brave.http.HttpSampler;
>>>>>>>
import brave.http.HttpRequestParser;
import brave.http.HttpResponseParser; |
<<<<<<<
import brave.propagation.StrictScopeDecorator;
import brave.propagation.ThreadLocalCurrentTraceContext;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
=======
import brave.propagation.StrictCurrentTraceContext;
import org.junit.After;
import org.junit.Test;
>>>>>>>
import brave.propagation.StrictCurrentTraceContext;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
<<<<<<<
@AfterEach
public void close() {
assertThat(Tracing.current().currentTraceContext().get()).isNull();
Tracing.current().close();
}
=======
>>>>>>> |
<<<<<<<
@EventListener(ServletWebServerInitializedEvent.class)
public void onApplicationEvent(ServletWebServerInitializedEvent event) {
this.port = event.getSource().getPort();
=======
private String serviceName() {
if (StringUtils.hasText(this.zipkinProperties.getService().getName())) {
return this.zipkinProperties.getService().getName();
}
if (this.environment != null) {
return this.environment.getProperty("spring.application.name", "unknown");
}
return "unknown";
}
@EventListener(EmbeddedServletContainerInitializedEvent.class)
public void grabPort(EmbeddedServletContainerInitializedEvent event) {
this.port = event.getEmbeddedServletContainer().getPort();
>>>>>>>
private String serviceName() {
if (StringUtils.hasText(this.zipkinProperties.getService().getName())) {
return this.zipkinProperties.getService().getName();
}
return this.environment.getProperty("spring.application.name", "unknown");
}
@EventListener(ServletWebServerInitializedEvent.class)
public void onApplicationEvent(ServletWebServerInitializedEvent event) {
this.port = event.getSource().getPort(); |
<<<<<<<
=======
import brave.propagation.StrictCurrentTraceContext;
>>>>>>>
import brave.propagation.StrictCurrentTraceContext;
<<<<<<<
final CurrentTraceContext currentTraceContext = CurrentTraceContext.Default.create();
=======
StrictCurrentTraceContext currentTraceContext = StrictCurrentTraceContext.create();
>>>>>>>
StrictCurrentTraceContext currentTraceContext = StrictCurrentTraceContext.create(); |
<<<<<<<
map.put("logging.pattern.level",
"%5p [${spring.zipkin.service.name:${spring.application.name:-}},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]");
=======
if (Boolean.parseBoolean(environment.getProperty("spring.sleuth.enabled", "true"))) {
map.put("logging.pattern.level",
"%5p [${spring.zipkin.service.name:${spring.application.name:-}},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]");
}
// TODO: Remove this in 2.0.x. For compatibility we always set to true
if (!environment.containsProperty(SPRING_AOP_PROXY_TARGET_CLASS)) {
map.put(SPRING_AOP_PROXY_TARGET_CLASS, "true");
}
>>>>>>>
if (Boolean.parseBoolean(environment.getProperty("spring.sleuth.enabled", "true"))) {
map.put("logging.pattern.level",
"%5p [${spring.zipkin.service.name:${spring.application.name:-}},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]");
} |
<<<<<<<
import org.springframework.cloud.sleuth.internal.DefaultSpanNamer;
import org.springframework.cloud.sleuth.util.ArrayListSpanReporter;
=======
import org.springframework.cloud.sleuth.DefaultSpanNamer;
>>>>>>>
import org.springframework.cloud.sleuth.internal.DefaultSpanNamer; |
<<<<<<<
import java.util.ArrayList;
=======
import java.util.Collections;
>>>>>>>
<<<<<<<
import brave.baggage.BaggagePropagation;
import brave.propagation.B3Propagation;
import brave.propagation.B3SingleFormat;
=======
import brave.handler.MutableSpan;
import brave.handler.SpanHandler;
>>>>>>>
import brave.baggage.BaggagePropagation;
import brave.handler.MutableSpan;
import brave.handler.SpanHandler;
import brave.propagation.B3Propagation;
import brave.propagation.B3SingleFormat;
<<<<<<<
=======
import brave.test.TestSpanHandler;
import com.netflix.loadbalancer.BaseLoadBalancer;
import com.netflix.loadbalancer.ILoadBalancer;
import com.netflix.loadbalancer.Server;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
>>>>>>>
import brave.test.TestSpanHandler;
<<<<<<<
import org.springframework.cloud.sleuth.util.ArrayListSpanReporter;
=======
import org.springframework.cloud.sleuth.instrument.web.TraceWebServletAutoConfiguration;
>>>>>>>
<<<<<<<
then(getHeader(response, "b3")).isNull();
List<zipkin2.Span> spans = this.reporter.getSpans();
then(spans).isNotEmpty();
Optional<zipkin2.Span> noTraceSpan = new ArrayList<>(spans).stream()
.filter(span -> "get".equals(span.name()) && !span.tags().isEmpty()
=======
then(getHeader(response, TRACE_ID_NAME)).isNull();
then(getHeader(response, SPAN_ID_NAME)).isNull();
then(this.spans).isNotEmpty();
Optional<MutableSpan> noTraceSpan = this.spans.spans().stream()
.filter(span -> "http:/notrace".equals(span.name())
&& !span.tags().isEmpty()
>>>>>>>
then(getHeader(response, "b3")).isNull();
then(this.spans).isNotEmpty();
Optional<MutableSpan> noTraceSpan = this.spans.spans().stream()
.filter(span -> "GET".equals(span.name()) && !span.tags().isEmpty() |
<<<<<<<
private static class UserInfoRestTemplateCustomizerBPP implements BeanPostProcessor {
=======
@Bean
@ConditionalOnMissingBean
UserInfoRestTemplateCustomizer traceUserInfoRestTemplateCustomizer() {
return new TraceUserInfoRestTemplateCustomizer(this.beanFactory);
}
class UserInfoRestTemplateCustomizerBPP implements BeanPostProcessor {
>>>>>>>
@Bean
@ConditionalOnMissingBean
UserInfoRestTemplateCustomizer traceUserInfoRestTemplateCustomizer() {
return new TraceUserInfoRestTemplateCustomizer(this.beanFactory);
}
private static class UserInfoRestTemplateCustomizerBPP implements BeanPostProcessor { |
<<<<<<<
import brave.http.HttpRequest;
=======
import brave.handler.SpanHandler;
>>>>>>>
import brave.handler.SpanHandler;
import brave.http.HttpRequest;
<<<<<<<
import brave.sampler.SamplerFunction;
=======
import brave.test.TestSpanHandler;
>>>>>>>
import brave.sampler.SamplerFunction;
import brave.test.TestSpanHandler;
<<<<<<<
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import zipkin2.Span;
import zipkin2.reporter.Reporter;
=======
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
>>>>>>>
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
<<<<<<<
import org.springframework.cloud.sleuth.instrument.web.HttpClientSampler;
import org.springframework.cloud.sleuth.util.ArrayListSpanReporter;
=======
import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory;
import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
>>>>>>>
import org.springframework.cloud.sleuth.instrument.web.HttpClientSampler; |
<<<<<<<
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
=======
import brave.test.TestSpanHandler;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
>>>>>>>
import brave.test.TestSpanHandler;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
<<<<<<<
import org.springframework.cloud.sleuth.internal.DefaultSpanNamer;
import org.springframework.cloud.sleuth.util.ArrayListSpanReporter;
=======
>>>>>>>
import org.springframework.cloud.sleuth.internal.DefaultSpanNamer; |
<<<<<<<
import brave.propagation.B3SingleFormat;
import brave.propagation.TraceContext;
=======
import brave.handler.SpanHandler;
>>>>>>>
import brave.handler.SpanHandler;
import brave.propagation.B3SingleFormat;
import brave.propagation.TraceContext;
<<<<<<<
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
=======
import brave.test.TestSpanHandler;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
>>>>>>>
import brave.test.TestSpanHandler;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
<<<<<<<
assertThat(extracted.spanIdString()).as("spanId was equal to parent's id")
.isNotEqualTo(expectedSpanId);
=======
String parentId = message.getHeaders().get(TraceMessageHeaders.PARENT_ID_NAME,
String.class);
// [0] - producer
// [1] - http:testsendmessage
assertThat(parentId).as("parentId was not equal to parent's id")
.isEqualTo(this.spans.get(1).id());
>>>>>>>
assertThat(extracted.spanIdString()).as("spanId was equal to parent's id")
.isNotEqualTo(expectedSpanId); |
<<<<<<<
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
=======
import brave.test.TestSpanHandler;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
>>>>>>>
import brave.test.TestSpanHandler;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; |
<<<<<<<
import org.junit.jupiter.api.Test;
=======
import brave.sampler.SamplerFunctions;
import org.junit.Test;
>>>>>>>
import brave.sampler.SamplerFunctions;
import org.junit.jupiter.api.Test;
<<<<<<<
=======
public void configuresClientSkipPattern() throws Exception {
contextRunner()
.withPropertyValues("spring.sleuth.web.client.skip-pattern=foo.*|bar.*")
.run((context) -> {
SamplerFunction<HttpRequest> clientSampler = context
.getBean(HttpTracing.class).clientRequestSampler();
then(clientSampler).isInstanceOf(SkipPatternHttpClientSampler.class);
});
}
@Test
public void configuresUserProvidedDeprecatedClientSampler() {
contextRunner().withUserConfiguration(DeprecatedClientSamplerConfig.class)
.run((context) -> {
SamplerFunction<HttpRequest> clientSampler = context
.getBean(HttpTracing.class).clientRequestSampler();
then(clientSampler).isSameAs(DeprecatedClientSamplerConfig.INSTANCE);
});
}
@Test
>>>>>>>
public void configuresClientSkipPattern() throws Exception {
contextRunner()
.withPropertyValues("spring.sleuth.web.client.skip-pattern=foo.*|bar.*")
.run((context) -> {
SamplerFunction<HttpRequest> clientSampler = context
.getBean(HttpTracing.class).clientRequestSampler();
then(clientSampler).isInstanceOf(SkipPatternHttpClientSampler.class);
});
}
@Test
<<<<<<<
public void defaultsToSkipPatternHttpServerSampler() {
=======
public void prefersUserProvidedHttpClientSampler() {
contextRunner().withUserConfiguration(DeprecatedClientSamplerConfig.class)
.withUserConfiguration(HttpClientSamplerConfig.class).run((context) -> {
SamplerFunction<HttpRequest> clientSampler = context
.getBean(HttpTracing.class).clientRequestSampler();
then(clientSampler).isSameAs(HttpClientSamplerConfig.INSTANCE);
});
}
@Test
public void defaultsServerSamplerToSkipPattern() {
>>>>>>>
public void defaultsServerSamplerToSkipPattern() {
<<<<<<<
=======
public void defaultsServerSamplerToDeferWhenSkipPatternCleared() {
contextRunner().withPropertyValues("spring.sleuth.web.skip-pattern")
.run((context) -> {
SamplerFunction<HttpRequest> clientSampler = context
.getBean(HttpTracing.class).serverRequestSampler();
then(clientSampler).isSameAs(SamplerFunctions.deferDecision());
});
}
@Test
public void wrapsUserProvidedDeprecatedServerSampler() {
contextRunner().withUserConfiguration(DeprecatedServerSamplerConfig.class).run(
thenCompositeHttpServerSamplerOf(DeprecatedServerSamplerConfig.INSTANCE));
}
@Test
>>>>>>>
public void defaultsServerSamplerToDeferWhenSkipPatternCleared() {
contextRunner().withPropertyValues("spring.sleuth.web.skip-pattern")
.run((context) -> {
SamplerFunction<HttpRequest> clientSampler = context
.getBean(HttpTracing.class).serverRequestSampler();
then(clientSampler).isSameAs(SamplerFunctions.deferDecision());
});
}
@Test |
<<<<<<<
import org.springframework.cloud.sleuth.TraceKeys;
import org.springframework.cloud.sleuth.SpanReporter;
=======
>>>>>>>
import org.springframework.cloud.sleuth.TraceKeys;
<<<<<<<
this.traceKeys = traceKeys;
=======
>>>>>>>
this.traceKeys = traceKeys; |
<<<<<<<
=======
import org.springframework.boot.autoconfigure.security.oauth2.resource.UserInfoRestTemplateCustomizer;
import org.springframework.boot.web.client.RestTemplateBuilder;
>>>>>>>
import org.springframework.boot.web.client.RestTemplateBuilder;
<<<<<<<
@ConditionalOnClass(RestTemplate.class)
static class RestTemplateConfig {
=======
@Bean
@ConditionalOnMissingBean
public TraceRestTemplateInterceptor traceRestTemplateInterceptor(Tracer tracer,
HttpSpanInjector spanInjector, HttpTraceKeysInjector httpTraceKeysInjector,
ErrorParser errorParser) {
return new TraceRestTemplateInterceptor(tracer, spanInjector,
httpTraceKeysInjector, errorParser);
}
@Bean
public BeanPostProcessor traceRestTemplateBuilderBPP(BeanFactory beanFactory) {
return new TraceRestTemplateBuilderBPP(beanFactory);
}
private static class TraceRestTemplateBuilderBPP implements BeanPostProcessor {
private final BeanFactory beanFactory;
private TraceRestTemplateBuilderBPP(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
}
@Override public Object postProcessBeforeInitialization(Object o, String s)
throws BeansException {
return o;
}
@Override public Object postProcessAfterInitialization(Object o, String s)
throws BeansException {
if (o instanceof RestTemplateBuilder) {
RestTemplateBuilder builder = (RestTemplateBuilder) o;
return builder.additionalInterceptors(this.beanFactory.getBean(TraceRestTemplateInterceptor.class));
}
return o;
}
}
@Configuration
protected static class TraceInterceptorConfiguration {
@Autowired(required = false)
private Collection<RestTemplate> restTemplates;
@Autowired
private TraceRestTemplateInterceptor traceRestTemplateInterceptor;
@PostConstruct
public void init() {
if (this.restTemplates != null) {
for (RestTemplate restTemplate : this.restTemplates) {
new RestTemplateInterceptorInjector(
this.traceRestTemplateInterceptor).inject(restTemplate);
}
}
}
}
@Configuration
@ConditionalOnClass({ UserInfoRestTemplateCustomizer.class, OAuth2RestTemplate.class })
protected static class TraceOAuthConfiguration {
@Autowired BeanFactory beanFactory;
@Bean
UserInfoRestTemplateCustomizerBPP userInfoRestTemplateCustomizerBeanPostProcessor() {
return new UserInfoRestTemplateCustomizerBPP(this.beanFactory);
}
>>>>>>>
@ConditionalOnClass(RestTemplate.class)
static class RestTemplateConfig { |
<<<<<<<
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.view.Menu;
import android.support.v4.view.MenuItem;
=======
>>>>>>> |
<<<<<<<
import java.net.InetAddress;
=======
import java.net.URL;
>>>>>>>
import java.net.InetAddress;
import java.net.URL;
<<<<<<<
put(InetAddress.class, new InetAddressValueConverter());
=======
put(URL.class, new UrlValueConverter());
>>>>>>>
put(InetAddress.class, new InetAddressValueConverter());
put(URL.class, new UrlValueConverter()); |
<<<<<<<
=======
private final ConfigurationNode configuration;
private LocalVariableTableParameterNameDiscoverer nameDiscoverer = new LocalVariableTableParameterNameDiscoverer();
private Set<WeakReference<Object>> configuredObjects = new HashSet<WeakReference<Object>>();
>>>>>>>
<<<<<<<
private Map<String, String> asMap() {
Map<String, String> properties = new HashMap<String, String>();
for (String key : configuration.keySet()) {
String value = evaluateTo(key, NULL_STRING);
if (!value.equals(NULL_STRING)) {
properties.put(key, value);
=======
private Map<String, String> asMap() {
Map<String, String> properties = new HashMap<String, String>();
extractProperties(configuration, properties);
return properties;
}
private void extractProperties(ConfigurationNode currentNode, Map<String, String> properties) {
String value = evaluateTo(currentNode.getExpression(), NULL_STRING);
if (!value.equals(NULL_STRING)) {
properties.put(currentNode.getExpression(), value);
}
if (currentNode.hasChildren()) {
for (ConfigurationNode child : currentNode.children()) {
extractProperties(child, properties);
>>>>>>>
private Map<String, String> asMap() {
Map<String, String> properties = new HashMap<String, String>();
for (String key : configuration.keySet()) {
String value = evaluateTo(key, NULL_STRING);
if (!value.equals(NULL_STRING)) {
properties.put(key, value);
<<<<<<<
private void reconfigure() {
WeakReference[] references = configuredObjects.toArray(new WeakReference[configuredObjects.size()]);
for (WeakReference reference : references) {
if (reference != null && reference.get() != null) {
on(reference.get());
}
}
}
private ConfigurationValue findElementOrThrowException(String expression) {
if (!configuration.containsKey(expression)) {
throw new ConstrettoExpressionException(expression, currentTags);
}
List<ConfigurationValue> values = configuration.get(expression);
ConfigurationValue resolvedNode = resolveMatch(values);
=======
private void reconfigure() {
WeakReference[] references = configuredObjects.toArray(new WeakReference[configuredObjects.size()]);
for (WeakReference reference : references) {
if (reference != null && reference.get() != null) {
on(reference.get());
}
}
}
private ConfigurationNode findElementOrThrowException(String expression) {
List<ConfigurationNode> node = configuration.findAllBy(expression);
ConfigurationNode resolvedNode = resolveMatch(node);
>>>>>>>
private void reconfigure() {
WeakReference[] references = configuredObjects.toArray(new WeakReference[configuredObjects.size()]);
for (WeakReference reference : references) {
if (reference != null && reference.get() != null) {
on(reference.get());
}
}
}
private ConfigurationValue findElementOrThrowException(String expression) {
if (!configuration.containsKey(expression)) {
throw new ConstrettoExpressionException(expression, currentTags);
}
List<ConfigurationValue> values = configuration.get(expression);
ConfigurationValue resolvedNode = resolveMatch(values);
<<<<<<<
Field[] fields = objectToConfigure.getClass().getDeclaredFields();
for (Field field : fields) {
try {
if (field.isAnnotationPresent(Configuration.class)) {
Configuration configurationAnnotation = field.getAnnotation(Configuration.class);
String expression = "".equals(configurationAnnotation.expression()) ? field.getName() : configurationAnnotation.expression();
field.setAccessible(true);
Class<?> fieldType = field.getType();
if (hasValue(expression)) {
ConfigurationValue node = findElementOrThrowException(expression);
field.set(objectToConfigure, processAndConvert(fieldType, expression));
} else {
if (hasAnnotationDefaults(configurationAnnotation)) {
if (configurationAnnotation.defaultValueFactory().equals(Configuration.EmptyValueFactory.class)) {
field.set(objectToConfigure, ValueConverterRegistry.convert(fieldType, configurationAnnotation.defaultValue()));
} else {
ConfigurationDefaultValueFactory valueFactory = configurationAnnotation.defaultValueFactory().newInstance();
field.set(objectToConfigure, valueFactory.getDefaultValue());
=======
Class objectToConfigureClass = objectToConfigure.getClass();
do {
Field[] fields = objectToConfigureClass.getDeclaredFields();
for (Field field : fields) {
try {
if (field.isAnnotationPresent(Configuration.class)) {
Configuration configurationAnnotation = field.getAnnotation(Configuration.class);
String expression = "".equals(configurationAnnotation.expression()) ? field.getName() : configurationAnnotation.expression();
field.setAccessible(true);
Class<?> fieldType = field.getType();
if (hasValue(expression)) {
ConfigurationNode node = findElementOrThrowException(expression);
field.set(objectToConfigure, processAndConvert(fieldType, node.getExpression()));
} else {
if (hasAnnotationDefaults(configurationAnnotation)) {
if (configurationAnnotation.defaultValueFactory().equals(Configuration.EmptyValueFactory.class)) {
field.set(objectToConfigure, ValueConverterRegistry.convert(fieldType, configurationAnnotation.defaultValue()));
} else {
ConfigurationDefaultValueFactory valueFactory = configurationAnnotation.defaultValueFactory().newInstance();
field.set(objectToConfigure, valueFactory.getDefaultValue());
}
} else if (configurationAnnotation.required()) {
throw new ConstrettoException("Missing value or default value for expression [" + expression + "] for field [" + field.getName() + "], in class [" + objectToConfigure.getClass().getName() + "] with tags " + currentTags + ".");
>>>>>>>
Class objectToConfigureClass = objectToConfigure.getClass();
do {
Field[] fields = objectToConfigureClass.getDeclaredFields();
for (Field field : fields) {
try {
if (field.isAnnotationPresent(Configuration.class)) {
Configuration configurationAnnotation = field.getAnnotation(Configuration.class);
String expression = "".equals(configurationAnnotation.expression()) ? field.getName() : configurationAnnotation.expression();
field.setAccessible(true);
Class<?> fieldType = field.getType();
if (hasValue(expression)) {
ConfigurationValue node = findElementOrThrowException(expression);
field.set(objectToConfigure, processAndConvert(fieldType, expression));
} else {
if (hasAnnotationDefaults(configurationAnnotation)) {
if (configurationAnnotation.defaultValueFactory().equals(Configuration.EmptyValueFactory.class)) {
field.set(objectToConfigure, ValueConverterRegistry.convert(fieldType, configurationAnnotation.defaultValue()));
} else {
ConfigurationDefaultValueFactory valueFactory = configurationAnnotation.defaultValueFactory().newInstance();
field.set(objectToConfigure, valueFactory.getDefaultValue());
}
} else if (configurationAnnotation.required()) {
throw new ConstrettoException("Missing value or default value for expression [" + expression + "] for field [" + field.getName() + "], in class [" + objectToConfigure.getClass().getName() + "] with tags " + currentTags + "."); |
<<<<<<<
=======
private ImageView sketchBackground;
public static int decorHight;
public static int decorWidth;
>>>>>>>
private ImageView sketchBackground;
public static int decorHight;
public static int decorWidth; |
<<<<<<<
public String getSql() {
return this.sql;
}
=======
@Override
public DecodeContext decodeContext() {
return DecodeContext.textResult();
}
>>>>>>>
public String getSql() {
return this.sql;
}
@Override
public DecodeContext decodeContext() {
return DecodeContext.textResult();
} |
<<<<<<<
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.Style;
=======
>>>>>>>
import net.minecraft.client.util.math.MatrixStack;
<<<<<<<
wrappedLines = font.getTextHandler().wrapLines(text, width, Style.EMPTY);
=======
wrappedLines = font.wrapLines(text, width);
>>>>>>>
wrappedLines = font.wrapLines(text, width);
<<<<<<<
return font.trimToWidth(line, x);
=======
return font.getTextHandler().trimToWidth(line, x);
>>>>>>>
return font.trimToWidth(line, x); |
<<<<<<<
* @version 2.0 — <em>$Date: 2013-05-27 $</em>
=======
* @version 1.0 — <em>$Date: 2013-06-05 $</em>
>>>>>>>
* @version 2.0 — <em>$Date: 2013-07-12 $</em>
<<<<<<<
=======
/**
* Return a more specific view of this chromosome factory.
*
* @return a more specific view of this chromosome factory.
*
* @deprecated No longer needed after adding new factory methods to the
* {@link Array} class.
*/
@Deprecated
@SuppressWarnings("unchecked")
public Factory<CharacterChromosome> asFactory() {
return (Factory<CharacterChromosome>)(Object)this;
}
>>>>>>>
<<<<<<<
final CharacterGene gene = CharacterGene.valueOf(
Character.valueOf(in.readChar()), _validCharacters
);
genes.set(i, gene);
=======
final CharacterGene gene = CharacterGene.valueOf(
Character.valueOf(in.readChar()),
_validCharacters
);
genes.set(i, gene);
>>>>>>>
final CharacterGene gene = CharacterGene.valueOf(
Character.valueOf(in.readChar()),
_validCharacters
);
genes.set(i, gene); |
<<<<<<<
* @version 1.0 — <em>$Date: 2013-03-26 $</em>
=======
* @version 1.3 — <em>$Date: 2013-06-21 $</em>
>>>>>>>
* @version 1.3 — <em>$Date: 2013-07-12 $</em>
<<<<<<<
public void foreach(final Consumer<? super T> consumer) {
=======
public <R> void foreach(final Function<? super T, ? extends R> function) {
forEach(function);
}
@Override
public <R> void forEach(final Function<? super T, ? extends R> function) {
requireNonNull(function, "Function");
>>>>>>>
public void forEach(final Consumer<? super T> consumer) {
<<<<<<<
public boolean forall(final Predicate<? super T> predicate) {
=======
public boolean forall(final Function<? super T, Boolean> predicate) {
return forAll(predicate);
}
@Override
public boolean forAll(final Function<? super T, Boolean> predicate) {
requireNonNull(predicate, "Predicate");
>>>>>>>
public boolean forAll(final Predicate<? super T> predicate) {
<<<<<<<
=======
requireNonNull(converter, "Converter");
>>>>>>> |
<<<<<<<
=======
import dr.evolution.tree.TreeTrait;
>>>>>>>
import dr.evolution.tree.TreeTrait;
<<<<<<<
import dr.math.matrixAlgebra.WrappedVector;
=======
import dr.math.matrixAlgebra.missingData.InversionResult;
import dr.math.matrixAlgebra.missingData.MissingOps;
>>>>>>>
import dr.math.matrixAlgebra.WrappedVector;
import dr.math.matrixAlgebra.missingData.MissingOps; |
<<<<<<<
* @version 1.0 — <em>$Date: 2013-02-27 $</em>
=======
* @version 1.2 — <em>$Date: 2013-03-11 $</em>
>>>>>>>
* @version 1.2 — <em>$Date: 2013-03-26 $</em>
<<<<<<<
/**
* Combine the given alterers.
*
* @param alterers the alterers to combine.
* @throws NullPointerException if one of the alterers is {@code null}.
*/
public CompositeAlterer(final Seq<Alterer<G>> alterers) {
super(1.0);
alterers.foreach(NonNull("Alterer"));
_alterers = normalize(alterers).toISeq();
}
=======
>>>>>>> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.