diff --git a/pom.xml b/pom.xml index 0df4dbe..cd881c1 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ browserstack-integration - 1.2.1-SNAPSHOT + 1.2.2-debug-4 hpi BrowserStack @@ -250,14 +250,6 @@ 2.1.0 - - - com.squareup.okhttp3 - okhttp - 3.14.9 - - - commons-io diff --git a/src/main/java/com/browserstack/automate/ci/common/tracking/PluginsTracker.java b/src/main/java/com/browserstack/automate/ci/common/tracking/PluginsTracker.java deleted file mode 100644 index 27120e5..0000000 --- a/src/main/java/com/browserstack/automate/ci/common/tracking/PluginsTracker.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.browserstack.automate.ci.common.tracking; - - -import com.browserstack.automate.ci.common.Tools; -import com.browserstack.automate.ci.common.constants.Constants; -import com.browserstack.automate.ci.common.proxysettings.JenkinsProxySettings; -import okhttp3.Authenticator; -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.Credentials; -import okhttp3.MediaType; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; -import okhttp3.Route; -import org.json.JSONObject; - -import javax.annotation.Nullable; -import java.io.IOException; -import java.net.Proxy; -import java.time.Instant; -import java.util.Optional; - -public class PluginsTracker { - private static final MediaType JSON = MediaType.get("application/json; charset=utf-8"); - private static final String URL = "https://api.browserstack.com/ci_plugins/track"; - private final String trackingId; - private transient OkHttpClient client; - private String username; - private String accessKey; - private String customProxy; - - public PluginsTracker(final String username, final String accessKey, @Nullable final String customProxy) { - this.username = username; - this.accessKey = accessKey; - this.customProxy = customProxy; - this.trackingId = Tools.getUniqueString(true, true); - initializeClient(); - } - - public PluginsTracker() { - this(null); - } - - public PluginsTracker(@Nullable final String customProxy) { - this.username = null; - this.accessKey = null; - this.customProxy = customProxy; - this.trackingId = Tools.getUniqueString(true, true); - initializeClient(); - } - - private void asyncPostRequestSilent(final String url, final String json) { - RequestBody body = RequestBody.create(JSON, json); - Request request = new Request.Builder() - .url(url) - .post(body) - .build(); - - client.newCall(request).enqueue(new Callback() { - @Override - public void onFailure(Call call, IOException e) { - } - - @Override - public void onResponse(Call call, Response response) throws IOException { - // closing the response body is important, else it will start leaking - if (response != null && response.body() != null) { - response.body().close(); - } - } - }); - } - - private void initializeClient() { - - JenkinsProxySettings jenkinsProxy; - if (customProxy != null) { - jenkinsProxy = new JenkinsProxySettings(customProxy, null); - } else { - jenkinsProxy = new JenkinsProxySettings(null); - } - - final Proxy proxy = jenkinsProxy.getJenkinsProxy(); - if (proxy != Proxy.NO_PROXY) { - if (jenkinsProxy.hasAuth()) { - final String username = jenkinsProxy.getUsername(); - final String password = jenkinsProxy.getPassword(); - Authenticator proxyAuthenticator = new Authenticator() { - @Override - public Request authenticate(Route route, Response response) throws IOException { - final String credential = Credentials.basic(username, password); - return response.request().newBuilder() - .header("Proxy-Authorization", credential) - .build(); - } - }; - client = new OkHttpClient.Builder().proxy(proxy).proxyAuthenticator(proxyAuthenticator).build(); - } else { - client = new OkHttpClient.Builder().proxy(proxy).build(); - } - } else { - client = new OkHttpClient.Builder().build(); - } - } - - public void trackOperation(String operationType, JSONObject data) { - JSONObject requestData = new JSONObject(); - requestData.put("source", Constants.JENKINS_CI_PLUGIN); - requestData.put("product", Constants.AUTOMATE); - requestData.put("team", Constants.AUTOMATE); - requestData.put("data", data); - requestData.put("event_timestamp", Instant.now().getEpochSecond()); - requestData.put("track_operation_type", operationType); - requestData.put("tracking_id", trackingId); - - Optional.ofNullable(username) - .ifPresent(userName -> requestData.put("username", userName)); - Optional.ofNullable(accessKey) - .ifPresent(accessKey -> requestData.put("access_key", accessKey)); - - asyncPostRequestSilent(URL, requestData.toString()); - } - - public void sendError(String errorMessage, boolean pipelineStatus, String phase) { - JSONObject trackingData = new JSONObject(); - trackingData.put("error", errorMessage); - trackingData.put("pipeline", pipelineStatus); - trackingData.put("phase", phase); - trackOperation(PluginsTrackerEvents.CI_PLUGIN_ERROR, trackingData); - } - - public void pluginInitialized(String buildName, boolean localStatus, boolean pipelineStatus) { - JSONObject trackingData = new JSONObject(); - trackingData.put("build_name", buildName); - trackingData.put("local", localStatus); - trackingData.put("pipeline", pipelineStatus); - trackOperation(PluginsTrackerEvents.CI_PLUGIN_INITIALIZED, trackingData); - } - - public void reportGenerationInitialized(String buildName, String product, boolean pipelineStatus) { - JSONObject trackingData = new JSONObject(); - trackingData.put("build_name", buildName); - trackingData.put("product", product); - trackingData.put("pipeline", pipelineStatus); - trackOperation(PluginsTrackerEvents.CI_PLUGIN_REPORT_GENERATION_STARTED, trackingData); - } - - public void reportGenerationCompleted(String status, String product, boolean pipelineStatus, String buildName, String buildId) { - JSONObject dataToTrack = new JSONObject(); - dataToTrack.put("status", status); - dataToTrack.put("product", product); - dataToTrack.put("pipeline", pipelineStatus); - dataToTrack.put("build_name", buildName); - dataToTrack.put("build_id", buildId); - trackOperation(PluginsTrackerEvents.CI_PLUGIN_REPORT_PUBLISHED, dataToTrack); - } - - public void setCredentials(String username, String accessKey) { - this.username = Optional.ofNullable(this.username) - .orElse(username); - this.accessKey = Optional.ofNullable(this.accessKey) - .orElse(accessKey); - } -} diff --git a/src/main/java/com/browserstack/automate/ci/common/tracking/PluginsTrackerEvents.java b/src/main/java/com/browserstack/automate/ci/common/tracking/PluginsTrackerEvents.java deleted file mode 100644 index c1ee36b..0000000 --- a/src/main/java/com/browserstack/automate/ci/common/tracking/PluginsTrackerEvents.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.browserstack.automate.ci.common.tracking; - -public class PluginsTrackerEvents { - public static final String CI_PLUGIN_INITIALIZED = "CI_PLUGIN_INITIALIZED"; - public static final String CI_PLUGIN_REPORT_GENERATION_STARTED = "CI_PLUGIN_REPORT_GENERATION_STARTED"; - public static final String CI_PLUGIN_REPORT_PUBLISHED = "CI_PLUGIN_REPORT_PUBLISHED"; - public static final String CI_PLUGIN_ERROR = "CI_PLUGIN_ERROR"; -} diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackBuildWrapper.java b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackBuildWrapper.java index cd7d93d..2ea05d7 100644 --- a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackBuildWrapper.java +++ b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackBuildWrapper.java @@ -3,7 +3,7 @@ import com.browserstack.automate.ci.common.BrowserStackBuildWrapperOperations; import com.browserstack.automate.ci.common.analytics.Analytics; import com.browserstack.automate.ci.common.constants.Constants; -import com.browserstack.automate.ci.common.tracking.PluginsTracker; +//import com.browserstack.automate.ci.common.tracking.PluginsTracker; import com.browserstack.automate.ci.jenkins.local.BrowserStackLocalUtils; import com.browserstack.automate.ci.jenkins.local.JenkinsBrowserStackLocal; import com.browserstack.automate.ci.jenkins.local.LocalConfig; @@ -77,7 +77,7 @@ private static BuildWrapperItem findItemWithBuildWra public Environment setUp(final AbstractBuild build, final Launcher launcher, final BuildListener listener) throws IOException, InterruptedException { final PrintStream logger = listener.getLogger(); - final PluginsTracker tracker = new PluginsTracker(); +// final PluginsTracker tracker = new PluginsTracker(); final BrowserStackCredentials credentials = BrowserStackCredentials.getCredentials(build.getProject(), credentialsId); @@ -91,9 +91,9 @@ public Environment setUp(final AbstractBuild build, final Launcher launcher, if (credentials != null) { this.username = credentials.getUsername(); this.accesskey = credentials.getDecryptedAccesskey(); - tracker.setCredentials(this.username, this.accesskey); +// tracker.setCredentials(this.username, this.accesskey); } else { - tracker.sendError("No Credentials Available", false, "PluginInitialization"); +// tracker.sendError("No Credentials Available", false, "PluginInitialization"); } AutomateBuildEnvironment buildEnv = new AutomateBuildEnvironment(credentials, launcher, logger); @@ -102,15 +102,15 @@ public Environment setUp(final AbstractBuild build, final Launcher launcher, buildEnv.startBrowserStackLocal(build.getFullDisplayName(), build.getEnvironment(listener)); } catch (Exception e) { listener.fatalError(e.getMessage()); - tracker.sendError(e.getMessage().substring(0, Math.min(100, e.getMessage().length())), - false, "LocalInitialization"); +// tracker.sendError(e.getMessage().substring(0, Math.min(100, e.getMessage().length())), +// false, "LocalInitialization"); throw new IOException(e.getCause()); } } recordBuildStats(); EnvVars envs = build.getEnvironment(listener); - tracker.pluginInitialized(envs.get(Constants.JENKINS_BUILD_TAG), (this.localConfig != null), false); +// tracker.pluginInitialized(envs.get(Constants.JENKINS_BUILD_TAG), (this.localConfig != null), false); return buildEnv; } diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportForBuild.java b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportForBuild.java index fc56574..5591c4f 100644 --- a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportForBuild.java +++ b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportForBuild.java @@ -4,7 +4,7 @@ import com.browserstack.automate.ci.common.clienthandler.ClientHandler; import com.browserstack.automate.ci.common.constants.Constants; import com.browserstack.automate.ci.common.enums.ProjectType; -import com.browserstack.automate.ci.common.tracking.PluginsTracker; +//import com.browserstack.automate.ci.common.tracking.PluginsTracker; import com.browserstack.automate.exception.BuildNotFound; import com.browserstack.automate.model.Build; import com.browserstack.automate.model.Session; @@ -37,7 +37,7 @@ public class BrowserStackReportForBuild extends AbstractBrowserStackReportForBui private final ProjectType projectType; private final transient PrintStream logger; private final String customProxy; - private final transient PluginsTracker tracker; +// private final transient PluginsTracker tracker; private final boolean pipelineStatus; // to make them available in jelly private final String errorConst = Constants.SessionStatus.ERROR; @@ -49,7 +49,7 @@ public BrowserStackReportForBuild(final Run build, final ProjectType projectType, final String buildName, final PrintStream logger, - final PluginsTracker tracker, +// final PluginsTracker tracker, final boolean pipelineStatus, final String customProxy) { super(); @@ -61,7 +61,7 @@ public BrowserStackReportForBuild(final Run build, this.projectType = projectType; this.logger = logger; this.customProxy = customProxy; - this.tracker = tracker; +// this.tracker = tracker; this.pipelineStatus = pipelineStatus; fetchBuildAndSessions(); } @@ -70,18 +70,18 @@ private void fetchBuildAndSessions() { final BrowserStackBuildAction browserStackBuildAction = getBuild().getAction(BrowserStackBuildAction.class); if (browserStackBuildAction == null) { logError(logger, "No BrowserStackBuildAction found"); - tracker.sendError("BrowserStackBuildAction Not Found", pipelineStatus, "ReportGeneration"); +// tracker.sendError("BrowserStackBuildAction Not Found", pipelineStatus, "ReportGeneration"); return; } final BrowserStackCredentials credentials = browserStackBuildAction.getBrowserStackCredentials(); if (credentials == null) { logError(logger, "BrowserStack credentials could not be fetched"); - tracker.sendError("No Credentials Available", pipelineStatus, "ReportGeneration"); +// tracker.sendError("No Credentials Available", pipelineStatus, "ReportGeneration"); return; } - tracker.setCredentials(credentials.getUsername(), credentials.getDecryptedAccesskey()); +// tracker.setCredentials(credentials.getUsername(), credentials.getDecryptedAccesskey()); BrowserStackClient client = ClientHandler.getBrowserStackClient(projectType, credentials.getUsername(), credentials.getDecryptedAccesskey(), customProxy, logger); diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportPublisher.java b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportPublisher.java index c0be23f..f2f0efb 100644 --- a/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportPublisher.java +++ b/src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackReportPublisher.java @@ -3,7 +3,7 @@ import com.browserstack.automate.ci.common.BrowserStackEnvVars; import com.browserstack.automate.ci.common.constants.Constants; import com.browserstack.automate.ci.common.enums.ProjectType; -import com.browserstack.automate.ci.common.tracking.PluginsTracker; +//import com.browserstack.automate.ci.common.tracking.PluginsTracker; import hudson.EnvVars; import hudson.Extension; import hudson.FilePath; @@ -39,7 +39,7 @@ public BuildStepMonitor getRequiredMonitorService() { @Override public void perform(@Nonnull Run build, @Nonnull FilePath workspace, @Nonnull Launcher launcher, @Nonnull TaskListener listener) throws InterruptedException, IOException { final PrintStream logger = listener.getLogger(); - final PluginsTracker tracker = new PluginsTracker(); +// final PluginsTracker tracker = new PluginsTracker(); final boolean pipelineStatus = false; log(logger, "Generating BrowserStack Test Report"); @@ -54,19 +54,22 @@ public void perform(@Nonnull Run build, @Nonnull FilePath workspace, @Nonn product = ProjectType.APP_AUTOMATE; } - tracker.reportGenerationInitialized(browserStackBuildName, product.name(), pipelineStatus); +// tracker.reportGenerationInitialized(browserStackBuildName, product.name(), pipelineStatus); log(logger, "BrowserStack Project identified as : " + product.name()); +// final BrowserStackReportForBuild bstackReportAction = +// new BrowserStackReportForBuild(build, product, browserStackBuildName, logger, tracker, pipelineStatus, null); + final BrowserStackReportForBuild bstackReportAction = - new BrowserStackReportForBuild(build, product, browserStackBuildName, logger, tracker, pipelineStatus, null); + new BrowserStackReportForBuild(build, product, browserStackBuildName, logger, pipelineStatus, null); final boolean reportResult = bstackReportAction.generateBrowserStackReport(); build.addAction(bstackReportAction); String reportStatus = reportResult ? Constants.ReportStatus.SUCCESS : Constants.ReportStatus.FAILED; log(logger, "BrowserStack Report Status: " + reportStatus); - tracker.reportGenerationCompleted(reportStatus, product.name(), pipelineStatus, - browserStackBuildName, bstackReportAction.getBrowserStackBuildID()); +// tracker.reportGenerationCompleted(reportStatus, product.name(), pipelineStatus, +// browserStackBuildName, bstackReportAction.getBrowserStackBuildID()); } @Extension diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackPipelineStepExecution.java b/src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackPipelineStepExecution.java index 1192dcb..e9272e8 100644 --- a/src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackPipelineStepExecution.java +++ b/src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackPipelineStepExecution.java @@ -2,7 +2,7 @@ import com.browserstack.automate.ci.common.BrowserStackBuildWrapperOperations; import com.browserstack.automate.ci.common.constants.Constants; -import com.browserstack.automate.ci.common.tracking.PluginsTracker; +//import com.browserstack.automate.ci.common.tracking.PluginsTracker; import com.browserstack.automate.ci.jenkins.BrowserStackBuildAction; import com.browserstack.automate.ci.jenkins.BrowserStackCredentials; import com.browserstack.automate.ci.jenkins.local.BrowserStackLocalUtils; @@ -53,20 +53,20 @@ public boolean start() throws Exception { String customProxy = parentContextEnvVars.get("https_proxy"); customProxy = Optional.ofNullable(customProxy).orElse(parentContextEnvVars.get("http_proxy")); - final PluginsTracker tracker = new PluginsTracker(customProxy); +// final PluginsTracker tracker = new PluginsTracker(customProxy); BrowserStackCredentials credentials = BrowserStackCredentials.getCredentials(run.getParent(), credentialsId); if (credentials == null) { logError(logger, "Credentials id is invalid. Aborting!!!"); - tracker.sendError("No Credentials Available", true, "PipelineExecution"); +// tracker.sendError("No Credentials Available", true, "PipelineExecution"); context.onFailure(new Exception("No Credentials Available")); return true; } if (credentials.hasUsername() && credentials.hasAccesskey()) { - tracker.setCredentials(credentials.getUsername(), credentials.getDecryptedAccesskey()); +// tracker.setCredentials(credentials.getUsername(), credentials.getDecryptedAccesskey()); } BrowserStackBuildAction action = run.getAction(BrowserStackBuildAction.class); @@ -83,8 +83,8 @@ public boolean start() throws Exception { launcher, getContext().get(EnvVars.class)); } catch (Exception e) { taskListener.fatalError(e.getMessage()); - tracker.sendError(e.getMessage().substring(0, Math.min(100, e.getMessage().length())), - true, "LocalInitialization"); +// tracker.sendError(e.getMessage().substring(0, Math.min(100, e.getMessage().length())), +// true, "LocalInitialization"); throw new IOException(e.getCause()); } } @@ -103,8 +103,8 @@ public boolean start() throws Exception { .merge(getContext().get(EnvironmentExpander.class), new ExpanderImpl(overridesMap))) .withCallback(new Callback(browserStackLocal)).start(); - tracker.pluginInitialized(overrides.get(Constants.JENKINS_BUILD_TAG), - (this.localConfig != null), true); +// tracker.pluginInitialized(overrides.get(Constants.JENKINS_BUILD_TAG), +// (this.localConfig != null), true); return false; } diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackReportStepExecution.java b/src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackReportStepExecution.java index 30c7244..732ef2a 100644 --- a/src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackReportStepExecution.java +++ b/src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackReportStepExecution.java @@ -3,7 +3,7 @@ import com.browserstack.automate.ci.common.BrowserStackEnvVars; import com.browserstack.automate.ci.common.constants.Constants; import com.browserstack.automate.ci.common.enums.ProjectType; -import com.browserstack.automate.ci.common.tracking.PluginsTracker; +//import com.browserstack.automate.ci.common.tracking.PluginsTracker; import com.browserstack.automate.ci.jenkins.BrowserStackReportForBuild; import hudson.EnvVars; import hudson.model.Run; @@ -36,25 +36,28 @@ protected Void run() throws Exception { String customProxy = parentContextEnvVars.get("https_proxy"); customProxy = Optional.ofNullable(customProxy).orElse(parentContextEnvVars.get("http_proxy")); - final PluginsTracker tracker = new PluginsTracker(customProxy); +// final PluginsTracker tracker = new PluginsTracker(customProxy); log(logger, "Generating BrowserStack Test Report via Pipeline for : " + product.name()); String browserStackBuildName = parentContextEnvVars.get(BrowserStackEnvVars.BROWSERSTACK_BUILD_NAME); browserStackBuildName = Optional.ofNullable(browserStackBuildName).orElse(parentEnvs.get(Constants.JENKINS_BUILD_TAG)); - tracker.reportGenerationInitialized(browserStackBuildName, product.name(), true); +// tracker.reportGenerationInitialized(browserStackBuildName, product.name(), true); + +// final BrowserStackReportForBuild bstackReportAction = +// new BrowserStackReportForBuild(run, product, browserStackBuildName, logger, tracker, true, customProxy); final BrowserStackReportForBuild bstackReportAction = - new BrowserStackReportForBuild(run, product, browserStackBuildName, logger, tracker, true, customProxy); + new BrowserStackReportForBuild(run, product, browserStackBuildName, logger, true, customProxy); final boolean reportResult = bstackReportAction.generateBrowserStackReport(); run.addAction(bstackReportAction); String reportStatus = reportResult ? Constants.ReportStatus.SUCCESS : Constants.ReportStatus.FAILED; log(logger, "BrowserStack Report Status via Pipeline: " + reportStatus); - tracker.reportGenerationCompleted(reportStatus, product.name(), true, - browserStackBuildName, bstackReportAction.getBrowserStackBuildID()); +// tracker.reportGenerationCompleted(reportStatus, product.name(), true, +// browserStackBuildName, bstackReportAction.getBrowserStackBuildID()); return null; } } diff --git a/src/test/java/com/browserstack/automate/ci/jenkins/AutomateTestActionTest.java b/src/test/java/com/browserstack/automate/ci/jenkins/AutomateTestActionTest.java index cccd9bb..964e327 100644 --- a/src/test/java/com/browserstack/automate/ci/jenkins/AutomateTestActionTest.java +++ b/src/test/java/com/browserstack/automate/ci/jenkins/AutomateTestActionTest.java @@ -2,7 +2,7 @@ import com.browserstack.automate.AutomateClient; import com.browserstack.automate.ci.common.model.BrowserStackSession; -import com.browserstack.automate.ci.common.tracking.PluginsTracker; +//import com.browserstack.automate.ci.common.tracking.PluginsTracker; import com.browserstack.automate.ci.jenkins.local.JenkinsBrowserStackLocal; import com.browserstack.automate.ci.jenkins.local.LocalConfig; import com.browserstack.automate.exception.AutomateException; @@ -72,7 +72,7 @@ public void setUp() throws Exception { public void testAutomateExceptionIsHandled() throws Exception { /* =================== Prepare ================= */ new MockAutomateClientThatThrowsAutomateException(); - new MockPluginsTracker(); +// new MockPluginsTracker(); addBuildStep(); project.getBuildersList().add(new TouchBuilder()); @@ -96,7 +96,7 @@ public void testAutomateExceptionIsHandled() throws Exception { public void testSessionNotFoundExceptionIsHandled() throws Exception { /* =================== Prepare ================= */ new MockAutomateClientThatThrowsSessionNotFoundException(); - new MockPluginsTracker(); +// new MockPluginsTracker(); addBuildStep(); project.getBuildersList().add(new TouchBuilder()); @@ -148,26 +148,26 @@ public Session getSession(String sessionId) throws Exception { } - private static final class MockPluginsTracker extends MockUp { - @Mock - public void sendError(String errorMessage, boolean pipelineStatus, String phase) { - return; - } - - @Mock - public void pluginInitialized(String buildName, boolean localStatus, boolean pipelineStatus) { - return; - } - - @Mock - public void reportGenerationInitialized(String buildName, String product, boolean pipelineStatus) { - return; - } - - @Mock - public void reportGenerationCompleted(String status, String product, boolean pipelineStatus, String buildName, String buildId) { - return; - } - } +// private static final class MockPluginsTracker extends MockUp { +// @Mock +// public void sendError(String errorMessage, boolean pipelineStatus, String phase) { +// return; +// } +// +// @Mock +// public void pluginInitialized(String buildName, boolean localStatus, boolean pipelineStatus) { +// return; +// } +// +// @Mock +// public void reportGenerationInitialized(String buildName, String product, boolean pipelineStatus) { +// return; +// } +// +// @Mock +// public void reportGenerationCompleted(String status, String product, boolean pipelineStatus, String buildName, String buildId) { +// return; +// } +// } } diff --git a/src/test/java/com/browserstack/automate/ci/jenkins/AutomateTestDataPublisherTest.java b/src/test/java/com/browserstack/automate/ci/jenkins/AutomateTestDataPublisherTest.java index e0ea504..50301db 100644 --- a/src/test/java/com/browserstack/automate/ci/jenkins/AutomateTestDataPublisherTest.java +++ b/src/test/java/com/browserstack/automate/ci/jenkins/AutomateTestDataPublisherTest.java @@ -1,7 +1,7 @@ package com.browserstack.automate.ci.jenkins; import com.browserstack.automate.AutomateClient; -import com.browserstack.automate.ci.common.tracking.PluginsTracker; +//import com.browserstack.automate.ci.common.tracking.PluginsTracker; import com.browserstack.automate.ci.jenkins.local.JenkinsBrowserStackLocal; import com.browserstack.automate.ci.jenkins.local.LocalConfig; import com.browserstack.automate.jenkins.helpers.CopyResourceFileToWorkspaceTarget; @@ -73,7 +73,7 @@ public void setUp() throws Exception { @Test public void testThatReportsArePresent() throws Exception { /* =================== Prepare ================= */ - new MockPluginsTracker(); +// new MockPluginsTracker(); new MockAutomateClient(); addBuildStep(); @@ -134,27 +134,27 @@ public Session getSession(String sessionId) { } } - private static final class MockPluginsTracker extends MockUp { - @Mock - public void sendError(String errorMessage, boolean pipelineStatus, String phase) { - return; - } - - @Mock - public void pluginInitialized(String buildName, boolean localStatus, boolean pipelineStatus) { - return; - } - - @Mock - public void reportGenerationInitialized(String buildName, String product, boolean pipelineStatus) { - return; - } - - @Mock - public void reportGenerationCompleted(String status, String product, boolean pipelineStatus, String buildName, String buildId) { - return; - } - } +// private static final class MockPluginsTracker extends MockUp { +// @Mock +// public void sendError(String errorMessage, boolean pipelineStatus, String phase) { +// return; +// } +// +// @Mock +// public void pluginInitialized(String buildName, boolean localStatus, boolean pipelineStatus) { +// return; +// } +// +// @Mock +// public void reportGenerationInitialized(String buildName, String product, boolean pipelineStatus) { +// return; +// } +// +// @Mock +// public void reportGenerationCompleted(String status, String product, boolean pipelineStatus, String buildName, String buildId) { +// return; +// } +// } } diff --git a/src/test/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackPipelineStepTest.java b/src/test/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackPipelineStepTest.java index 1e30cc8..81d92a1 100644 --- a/src/test/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackPipelineStepTest.java +++ b/src/test/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackPipelineStepTest.java @@ -1,6 +1,6 @@ package com.browserstack.automate.ci.jenkins.pipeline; -import com.browserstack.automate.ci.common.tracking.PluginsTracker; +//import com.browserstack.automate.ci.common.tracking.PluginsTracker; import com.browserstack.automate.jenkins.helpers.TempCredentialIdGenerator; import mockit.Mock; import mockit.MockUp; @@ -21,7 +21,7 @@ public class BrowserStackPipelineStepTest { @Test public void testBrowserStepWithoutLocal() throws Exception { - new MockPluginsTracker(); +// new MockPluginsTracker(); String credentialsId = TempCredentialIdGenerator.generateTempCredentialId(DUMMY_BSTACK_USERNAME, DUMMY_BSTACK_ACCESS_KEY); @@ -40,7 +40,7 @@ public void testBrowserStepWithoutLocal() throws Exception { @Test public void testBrowserStepWithLocal() throws Exception { - new MockPluginsTracker(); +// new MockPluginsTracker(); String username = System.getenv("BROWSERSTACK_USERNAME"); String accessKey = System.getenv("BROWSERSTACK_ACCESS_KEY"); @@ -63,27 +63,27 @@ public void testBrowserStepWithLocal() throws Exception { jenkinsRule.assertLogContains("BROWSERSTACK_LOCAL = true", run); } - private static final class MockPluginsTracker extends MockUp { - @Mock - public void sendError(String errorMessage, boolean pipelineStatus, String phase) { - return; - } - - @Mock - public void pluginInitialized(String buildName, boolean localStatus, boolean pipelineStatus) { - return; - } - - @Mock - public void reportGenerationInitialized(String buildName, String product, boolean pipelineStatus) { - return; - } - - @Mock - public void reportGenerationCompleted(String status, String product, boolean pipelineStatus, String buildName, String buildId) { - return; - } - } +// private static final class MockPluginsTracker extends MockUp { +// @Mock +// public void sendError(String errorMessage, boolean pipelineStatus, String phase) { +// return; +// } +// +// @Mock +// public void pluginInitialized(String buildName, boolean localStatus, boolean pipelineStatus) { +// return; +// } +// +// @Mock +// public void reportGenerationInitialized(String buildName, String product, boolean pipelineStatus) { +// return; +// } +// +// @Mock +// public void reportGenerationCompleted(String status, String product, boolean pipelineStatus, String buildName, String buildId) { +// return; +// } +// } }