Skip to content
Snippets Groups Projects
Commit a6639155 authored by Sherman Yang's avatar Sherman Yang
Browse files

remove DeleteSchema and GetSchema integration tests and update maven settings

parent 380efa3e
No related branches found
No related tags found
1 merge request!6Trusted ibm
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 333 deletions
provider/indexer-gcp/maven/settings.xml
+ 12
− 12
View file @ a6639155
<?xml version="1.0" encoding="UTF-8"?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>dev-azure-com-slb-des-ext-collaboration-os-core</id>
<username>os-core</username>
<!-- Treat this auth token like a password. Do not share it with anyone, including Microsoft support. -->
<!-- The generated token expires on or before 10/8/2019 -->
<password>${VSTS_FEED_TOKEN}</password>
</server>
</servers>
</settings>
\ No newline at end of file
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>os-core</id>
<username>slb-des-ext-collaboration</username>
<!-- Treat this auth token like a password. Do not share it with anyone, including Microsoft support. -->
<!-- The generated token expires on or before 11/14/2019 -->
<password>${VSTS_FEED_TOKEN}</password>
</server>
</servers>
</settings>
testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/RunTest.java deleted 100644 → 0
+ 0
− 27
View file @ 380efa3e
// Copyright © Amazon Web Services
//
// 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 org.opengroup.osdu.step_definitions.index.deleteschema;
import cucumber.api.CucumberOptions;
import cucumber.api.junit.Cucumber;
import org.junit.runner.RunWith;
@RunWith(Cucumber.class)
@CucumberOptions(
features = "classpath:features/delete/Delete.feature",
glue={"classpath:org.opengroup.osdu.step_definitions/index/deleteschema"},
format = {"pretty", "junit:target/cucumber-reports/TEST-deleteschema.xml"})
public class RunTest {
}
\ No newline at end of file
testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/Steps.java deleted 100644 → 0
+ 0
− 64
View file @ 380efa3e
// Copyright © Amazon Web Services
//
// 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 org.opengroup.osdu.step_definitions.index.deleteschema;
import cucumber.api.Scenario;
import cucumber.api.java.Before;
import org.opengroup.osdu.common.DeleteSchemaSteps;
import org.opengroup.osdu.util.AWSHTTPClient;
import cucumber.api.DataTable;
import cucumber.api.java.en.Given;
import cucumber.api.java.en.Then;
import cucumber.api.java.en.When;
import org.opengroup.osdu.util.ElasticUtils;
import org.opengroup.osdu.util.ElasticUtilsAws;
import java.util.List;
public class Steps extends DeleteSchemaSteps {
public Steps() {
super(new AWSHTTPClient(), new ElasticUtilsAws());
}
@Before
public void before(Scenario scenario) {
this.scenario = scenario;
this.httpClient = new AWSHTTPClient();
}
@Given("^the elastic search is initialized with the following data$")
public void the_elastic_search_is_initialized_with_the_following_data(DataTable dataTable) throws Throwable {
super.the_elastic_search_is_initialized_with_the_following_data(dataTable);
}
@When("^I send a delete request with \"([^\"]*)\"$")
public void i_send_a_delete_request_with(String kind) throws Throwable {
super.i_send_a_delete_request_with(kind);
}
@Then("^the index should get delete and I should get (\\d+) response$")
public void the_index_should_get_delete_and_I_should_get_response(int code) throws Throwable {
super.the_index_should_get_delete_and_I_should_get_response(code);
}
@Then("^I should get ([^\"]*) response with reason: \"(.*?)\", message: \"(.*?)\" and errors: \"(.*?)\"$")
public void i_should_get_response_with_reason_message_and_errors(List<Integer> codes, String type, String msg,
String error) throws Throwable {
super.i_should_get_response_with_reason_message_and_errors(codes, type, msg, error);
}
}
testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/RunTest.java deleted 100644 → 0
+ 0
− 28
View file @ 380efa3e
// Copyright © Amazon Web Services
//
// 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 org.opengroup.osdu.step_definitions.index.getschema;
import cucumber.api.CucumberOptions;
import cucumber.api.junit.Cucumber;
import org.junit.runner.RunWith;
@RunWith(Cucumber.class)
@CucumberOptions(
features = "classpath:features/kindschema/KindSchema.feature",
glue = {"classpath:org.opengroup.osdu.step_definitions/index/getschema"},
format = {"pretty", "junit:target/cucumber-reports/TEST-getschema.xml"})
public class RunTest {
}
\ No newline at end of file
testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/Steps.java deleted 100644 → 0
+ 0
− 65
View file @ 380efa3e
// Copyright © Amazon Web Services
//
// 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 org.opengroup.osdu.step_definitions.index.getschema;
import org.opengroup.osdu.common.GetSchemaSteps;
import org.opengroup.osdu.util.AWSHTTPClient;
import cucumber.api.Scenario;
import cucumber.api.java.Before;
import cucumber.api.DataTable;
import cucumber.api.java.en.Given;
import cucumber.api.java.en.Then;
import cucumber.api.java.en.When;
import org.opengroup.osdu.util.ElasticUtilsAws;
public class Steps extends GetSchemaSteps {
public Steps() {
super(new AWSHTTPClient(), new ElasticUtilsAws());
}
@Before
public void before(Scenario scenario) {
this.scenario = scenario;
this.httpClient = new AWSHTTPClient();
}
@Given("^the elastic search is initialized with the following data$")
public void the_elastic_search_is_initialized_with_the_following_data(DataTable dataTable) throws Throwable {
super.the_elastic_search_is_initialized_with_the_following_data(dataTable);
}
@When("^I send get schema request with \"([^\"]*)\"$")
public void i_send_get_schema_request_with(String kind) throws Throwable {
super.i_send_get_schema_request_with(kind);
}
@When("^I send request to tenant \"(.*?)\"$")
public void i_send_request_to_tenant(String tenant) throws Throwable {
super.i_send_request_to_tenant(tenant);
}
@Then("^I should get ([^\"]*) response with reason: \"(.*?)\", message: \"(.*?)\" and errors: \"(.*?)\"$")
public void i_should_get_response_with_reason_message_and_errors(int responseCode, String type, String msg,
String error) throws Throwable {
super.i_should_get_response_with_reason_message_and_errors(responseCode, type, msg, error);
}
@Then("^I should get (\\d+) status with response \"(.*?)\"$")
public void i_should_get_status_with_response(int statusCode, String response) throws Throwable {
super.i_should_get_status_with_response(statusCode, response);
}
}
\ No newline at end of file
testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/RunTest.java deleted 100644 → 0
+ 0
− 13
View file @ 380efa3e
package org.opengroup.osdu.step_definitions.index.deleteschema;
import cucumber.api.CucumberOptions;
import cucumber.api.junit.Cucumber;
import org.junit.runner.RunWith;
@RunWith(Cucumber.class)
@CucumberOptions(
features = "classpath:features/delete/Delete.feature",
glue={"classpath:org.opengroup.osdu.step_definitions/index/deleteschema"},
format = {"pretty", "junit:target/cucumber-reports/TEST-deleteschema.xml"})
public class RunTest {
}
\ No newline at end of file
testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/Steps.java deleted 100644 → 0
+ 0
− 48
View file @ 380efa3e
package org.opengroup.osdu.step_definitions.index.deleteschema;
import cucumber.api.Scenario;
import cucumber.api.java.Before;
import org.opengroup.osdu.common.DeleteSchemaSteps;
import org.opengroup.osdu.util.GCPHTTPClient;
import cucumber.api.DataTable;
import cucumber.api.java.en.Given;
import cucumber.api.java.en.Then;
import cucumber.api.java.en.When;
import java.util.List;
public class Steps extends DeleteSchemaSteps {
public Steps() {
super(new GCPHTTPClient());
}
@Before
public void before(Scenario scenario) {
this.scenario = scenario;
this.httpClient = new GCPHTTPClient();
}
@Given("^the elastic search is initialized with the following data$")
public void the_elastic_search_is_initialized_with_the_following_data(DataTable dataTable) throws Throwable {
super.the_elastic_search_is_initialized_with_the_following_data(dataTable);
}
@When("^I send a delete request with \"([^\"]*)\"$")
public void i_send_a_delete_request_with(String kind) throws Throwable {
super.i_send_a_delete_request_with(kind);
}
@Then("^the index should get delete and I should get (\\d+) response$")
public void the_index_should_get_delete_and_I_should_get_response(int code) throws Throwable {
super.the_index_should_get_delete_and_I_should_get_response(code);
}
@Then("^I should get ([^\"]*) response with reason: \"(.*?)\", message: \"(.*?)\" and errors: \"(.*?)\"$")
public void i_should_get_response_with_reason_message_and_errors(List<Integer> codes, String type, String msg,
String error) throws Throwable {
super.i_should_get_response_with_reason_message_and_errors(codes, type, msg, error);
}
}
testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/RunTest.java deleted 100644 → 0
+ 0
− 14
View file @ 380efa3e
package org.opengroup.osdu.step_definitions.index.getschema;
import cucumber.api.CucumberOptions;
import cucumber.api.junit.Cucumber;
import org.junit.runner.RunWith;
@RunWith(Cucumber.class)
@CucumberOptions(
features = "classpath:features/kindschema/KindSchema.feature",
glue = {"classpath:org.opengroup.osdu.step_definitions/index/getschema"},
format = {"pretty", "junit:target/cucumber-reports/TEST-getschema.xml"})
public class RunTest {
}
\ No newline at end of file
testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/Steps.java deleted 100644 → 0
+ 0
− 50
View file @ 380efa3e
package org.opengroup.osdu.step_definitions.index.getschema;
import org.opengroup.osdu.common.GetSchemaSteps;
import org.opengroup.osdu.util.GCPHTTPClient;
import cucumber.api.Scenario;
import cucumber.api.java.Before;
import cucumber.api.DataTable;
import cucumber.api.java.en.Given;
import cucumber.api.java.en.Then;
import cucumber.api.java.en.When;
public class Steps extends GetSchemaSteps {
public Steps() {
super(new GCPHTTPClient());
}
@Before
public void before(Scenario scenario) {
this.scenario = scenario;
this.httpClient = new GCPHTTPClient();
}
@Given("^the elastic search is initialized with the following data$")
public void the_elastic_search_is_initialized_with_the_following_data(DataTable dataTable) throws Throwable {
super.the_elastic_search_is_initialized_with_the_following_data(dataTable);
}
@When("^I send get schema request with \"([^\"]*)\"$")
public void i_send_get_schema_request_with(String kind) throws Throwable {
super.i_send_get_schema_request_with(kind);
}
@When("^I send request to tenant \"(.*?)\"$")
public void i_send_request_to_tenant(String tenant) throws Throwable {
super.i_send_request_to_tenant(tenant);
}
@Then("^I should get ([^\"]*) response with reason: \"(.*?)\", message: \"(.*?)\" and errors: \"(.*?)\"$")
public void i_should_get_response_with_reason_message_and_errors(int responseCode, String type, String msg,
String error) throws Throwable {
super.i_should_get_response_with_reason_message_and_errors(responseCode, type, msg, error);
}
@Then("^I should get (\\d+) status with response \"(.*?)\"$")
public void i_should_get_status_with_response(int statusCode, String response) throws Throwable {
super.i_should_get_status_with_response(statusCode, response);
}
}
\ No newline at end of file
testing/maven/settings.xml
+ 12
− 12
View file @ a6639155
<?xml version="1.0" encoding="UTF-8"?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>dev-azure-com-slb-des-ext-collaboration-os-core</id>
<username>os-core</username>
<!-- Treat this auth token like a password. Do not share it with anyone, including Microsoft support. -->
<!-- The generated token expires on or before 10/8/2019 -->
<password>${VSTS_FEED_TOKEN}</password>
</server>
</servers>
</settings>
\ No newline at end of file
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>os-core</id>
<username>slb-des-ext-collaboration</username>
<!-- Treat this auth token like a password. Do not share it with anyone, including Microsoft support. -->
<!-- The generated token expires on or before 11/14/2019 -->
<password>${VSTS_FEED_TOKEN}</password>
</server>
</servers>
</settings>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment