Skip to content

Commit

Permalink
addressed comments
Browse files Browse the repository at this point in the history
  • Loading branch information
AnkitCLI committed Mar 14, 2024
1 parent aa4d62a commit cd695ca
Show file tree
Hide file tree
Showing 13 changed files with 119 additions and 61 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
)
strategy:
matrix:
tests: [bigquery, common, gcs, pubsub, spanner, gcscreate, gcsdelete, gcsmove, bigqueryexecute, gcscopy]
tests: [bigquery, common, gcs, pubsub, spanner, gcscreate, gcsdelete, gcsmove, bigqueryexecute, gcscopy, datastore]
fail-fast: false
steps:
# Pinned 1.0.0 version
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2021 Cask Data, Inc.
* Copyright © 2024 Cask Data, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
Expand All @@ -25,8 +25,8 @@
@RunWith(Cucumber.class)
@CucumberOptions(
features = {"src/e2e-test/features"},
glue = {"io.cdap.plugin.datastore.stepsdesign", "io.cdap.plugin.gcs.stepsdesign",
"io.cdap.plugin.common.stepsdesign", "io.cdap.plugin.bigquery.stepsdesign", "stepsdesign"},
glue = {"io.cdap.plugin.datastore.stepsdesign", "io.cdap.plugin.common.stepsdesign",
"stepsdesign"},
tags = {"@DataStore"},
monochrome = true,
plugin = {"pretty", "html:target/cucumber-html-report/datastore",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2021 Cask Data, Inc.
* Copyright © 2024 Cask Data, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
Expand All @@ -25,8 +25,8 @@
@RunWith(Cucumber.class)
@CucumberOptions(
features = {"src/e2e-test/features"},
glue = {"io.cdap.plugin.datastore.stepsdesign", "io.cdap.plugin.gcs.stepsdesign",
"io.cdap.plugin.common.stepsdesign", "io.cdap.plugin.bigquery.stepsdesign", "stepsdesign"},
glue = {"io.cdap.plugin.datastore.stepsdesign", "io.cdap.plugin.common.stepsdesign",
"stepsdesign"},
tags = {"@datastore_Required"},
monochrome = true,
plugin = {"pretty", "html:target/cucumber-html-report/datastore-required",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* Copyright © 2024 Cask Data, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/

package io.cdap.plugin.datastore.stepsdesign.Actions;

import io.cdap.e2e.utils.ElementHelper;
import io.cdap.e2e.utils.SeleniumHelper;
import io.cdap.plugin.datastore.stepsdesign.Locators.DataStoreLocators;
import io.cdap.plugin.utils.DataStoreClient;

public class DataStoreActions {
static {

SeleniumHelper.getPropertiesLocators(DataStoreLocators.class);
}
public static void enterKind(String kindName) {
ElementHelper.sendKeys(DataStoreLocators.kind, kindName);
}

public static void enterAncestor()
{
ElementHelper.sendKeys(DataStoreLocators.ancestor, DataStoreClient.getKeyLiteral());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/**
* Package contains the actions for the DataStore features.
*/
package io.cdap.plugin.datastore.stepsdesign.Actions;

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
* Copyright © 2024 Cask Data, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/

package io.cdap.plugin.datastore.stepsdesign.Locators;

import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;
import org.openqa.selenium.support.How;

public class DataStoreLocators {
@FindBy(how = How.XPATH, using = "//input[@data-testid='kind']")
public static WebElement kind;

@FindBy(how = How.XPATH, using = "//input[@data-testid='ancestor']")
public static WebElement ancestor;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/**
* Package contains the locators for the DataStore features.
*/
package io.cdap.plugin.datastore.stepsdesign.Locators;

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright © 2024 Cask Data, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/

package io.cdap.plugin.datastore.stepsdesign.Stepdesigns;
import io.cdap.plugin.common.stepsdesign.TestSetupHooks;

import io.cdap.plugin.datastore.stepsdesign.Actions.DataStoreActions;
import io.cucumber.java.en.Then;

public class StepDesigns {
@Then("Enter kind for datastore plugin")
public void enterKindForDatastorePlugin() {
DataStoreActions.enterKind(TestSetupHooks.kindName);

}

@Then("Enter Ancestor for the datastore plugin")
public void enterAncestorForTheDatastorePlugin() {
DataStoreActions.enterAncestor();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/**
* Package contains the stepDesign for the DataStore features.
*/
package io.cdap.plugin.datastore.stepsdesign.Stepdesigns;

This file was deleted.

0 comments on commit cd695ca

Please sign in to comment.