honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Rename] test framework remaining tests (#375) 

This commit refactors the remaining tests in the test/framework module. All
other references throughout the codebase are also refactored.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
This commit is contained in:
Nick Knize 2021-03-18 00:20:17 -05:00 committed by Nick Knize
parent 5b46a05702
commit 2df59c4a4b
38 changed files with 76 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/framework/src/main/java/org/opensearch/test/rest/package-info.java
View File

@ -18,7 +18,7 @@
*/
/**
* Infrastructure for testing REST. See {@link OpenSearchRestTestCase} for running tests against an OpenSearch cluster using the REST tests and
* the rest of the package for mocking utilities.
* Infrastructure for testing REST. See {@link OpenSearchRestTestCase} for running tests against an OpenSearch cluster using the
* REST tests and the rest of the package for mocking utilities.
*/
package org.opensearch.test.rest;

2
test/framework/src/test/java/org/elasticsearch/ingest/IngestDocumentMatcherTests.java → test/framework/src/test/java/org/opensearch/ingest/IngestDocumentMatcherTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.ingest;
package org.opensearch.ingest;
import org.opensearch.test.OpenSearchTestCase;

2
test/framework/src/test/java/org/elasticsearch/test/AbstractQueryTestCaseTests.java → test/framework/src/test/java/org/opensearch/test/AbstractQueryTestCaseTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test;
package org.opensearch.test;
import org.opensearch.common.collect.Tuple;
import org.opensearch.common.util.set.Sets;

2
test/framework/src/test/java/org/elasticsearch/test/AbstractXContentTestCaseTests.java → test/framework/src/test/java/org/opensearch/test/AbstractXContentTestCaseTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test;
package org.opensearch.test;
import com.carrotsearch.randomizedtesting.RandomizedContext;

2
test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java → test/framework/src/test/java/org/opensearch/test/VersionUtilsTests.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test;
package org.opensearch.test;
import org.opensearch.Version;
import org.opensearch.common.Booleans;

2
test/framework/src/test/java/org/elasticsearch/test/XContentTestUtilsTests.java → test/framework/src/test/java/org/opensearch/test/XContentTestUtilsTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test;
package org.opensearch.test;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.xcontent.DeprecationHandler;

3
test/framework/src/test/java/org/elasticsearch/test/disruption/DisruptableMockTransportTests.java → test/framework/src/test/java/org/opensearch/test/disruption/DisruptableMockTransportTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.disruption;
package org.opensearch.test.disruption;
import org.opensearch.Version;
import org.opensearch.action.support.PlainActionFuture;
@ -29,7 +29,6 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.node.Node;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.disruption.DisruptableMockTransport;
import org.opensearch.test.disruption.DisruptableMockTransport.ConnectionStatus;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.ConnectTransportException;

2
test/framework/src/test/java/org/elasticsearch/test/disruption/LongGCDisruptionTests.java → test/framework/src/test/java/org/opensearch/test/disruption/LongGCDisruptionTests.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.disruption;
package org.opensearch.test.disruption;
import org.opensearch.common.Nullable;
import org.opensearch.test.OpenSearchTestCase;

2
test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java → test/framework/src/test/java/org/opensearch/test/disruption/NetworkDisruptionIT.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.disruption;
package org.opensearch.test.disruption;
import org.opensearch.action.admin.cluster.health.ClusterHealthAction;
import org.opensearch.action.admin.cluster.health.ClusterHealthRequest;

2
test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionTests.java → test/framework/src/test/java/org/opensearch/test/disruption/NetworkDisruptionTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.disruption;
package org.opensearch.test.disruption;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.disruption.NetworkDisruption;

2
test/framework/src/test/java/org/elasticsearch/test/hamcrest/OpenSearchAssertionsTests.java → test/framework/src/test/java/org/opensearch/test/hamcrest/OpenSearchAssertionsTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.hamcrest;
package org.opensearch.test.hamcrest;
import org.opensearch.action.support.DefaultShardOperationFailedException;
import org.opensearch.action.support.broadcast.BroadcastResponse;

2
test/framework/src/test/java/org/elasticsearch/test/rest/OpenSearchRestTestCaseTests.java → test/framework/src/test/java/org/opensearch/test/rest/OpenSearchRestTestCaseTests.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.rest;
package org.opensearch.test.rest;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.rest.OpenSearchRestTestCase;

2
test/framework/src/test/java/org/elasticsearch/test/rest/VersionSensitiveWarningsHandlerTests.java → test/framework/src/test/java/org/opensearch/test/rest/VersionSensitiveWarningsHandlerTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.rest;
package org.opensearch.test.rest;
import org.opensearch.Version;
import org.opensearch.client.WarningsHandler;

2
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/BlacklistedPathPatternMatcherTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/BlacklistedPathPatternMatcherTests.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.rest.yaml;
package org.opensearch.test.rest.yaml;
import org.opensearch.test.OpenSearchTestCase;

2
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.rest.yaml;
package org.opensearch.test.rest.yaml;
import org.apache.http.HttpEntity;
import org.opensearch.Version;

2
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ObjectPathTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/ObjectPathTests.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.rest.yaml;
package org.opensearch.test.rest.yaml;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.xcontent.XContentBuilder;

2
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/OpenSearchClientYamlSuiteTestCaseTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/OpenSearchClientYamlSuiteTestCaseTests.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.rest.yaml;
package org.opensearch.test.rest.yaml;
import java.nio.file.Files;
import java.nio.file.Path;

2
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/StashTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/StashTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.rest.yaml;
package org.opensearch.test.rest.yaml;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.rest.yaml.Stash;

3
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParserFailingTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParserFailingTests.java
View File

@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.rest.yaml.restspec;
package org.opensearch.test.rest.yaml.restspec;
import org.opensearch.common.ParsingException;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.yaml.YamlXContent;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestApiParser;
import static org.hamcrest.Matchers.containsString;

6
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParserTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParserTests.java
View File

@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.rest.yaml.restspec;
package org.opensearch.test.rest.yaml.restspec;
import org.opensearch.common.xcontent.yaml.YamlXContent;
import org.elasticsearch.test.rest.yaml.section.AbstractClientYamlTestFragmentParserTestCase;
import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi;
import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestApiParser;
import org.opensearch.test.rest.yaml.section.AbstractClientYamlTestFragmentParserTestCase;
import java.util.Iterator;

2
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiTests.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.rest.yaml.restspec;
package org.opensearch.test.rest.yaml.restspec;
import org.opensearch.common.util.set.Sets;
import org.opensearch.common.xcontent.XContentParser;

2
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/AbstractClientYamlTestFragmentParserTestCase.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/section/AbstractClientYamlTestFragmentParserTestCase.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.rest.yaml.section;
package org.opensearch.test.rest.yaml.section;
import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.opensearch.common.xcontent.XContentParser;

9
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/AssertionTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/section/AssertionTests.java
View File

@ -16,16 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.rest.yaml.section;
package org.opensearch.test.rest.yaml.section;
import org.opensearch.common.xcontent.yaml.YamlXContent;
import org.opensearch.test.rest.yaml.section.ContainsAssertion;
import org.opensearch.test.rest.yaml.section.GreaterThanAssertion;
import org.opensearch.test.rest.yaml.section.IsFalseAssertion;
import org.opensearch.test.rest.yaml.section.IsTrueAssertion;
import org.opensearch.test.rest.yaml.section.LengthAssertion;
import org.opensearch.test.rest.yaml.section.LessThanAssertion;
import org.opensearch.test.rest.yaml.section.MatchAssertion;
import java.util.List;
import java.util.Map;

12
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSectionTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/section/ClientYamlTestSectionTests.java
View File

@ -17,22 +17,12 @@
* under the License.
*/
package org.elasticsearch.test.rest.yaml.section;
package org.opensearch.test.rest.yaml.section;
import org.opensearch.Version;
import org.opensearch.common.ParsingException;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.yaml.YamlXContent;
import org.opensearch.test.rest.yaml.section.ClientYamlTestSection;
import org.opensearch.test.rest.yaml.section.DoSection;
import org.opensearch.test.rest.yaml.section.GreaterThanAssertion;
import org.opensearch.test.rest.yaml.section.IsFalseAssertion;
import org.opensearch.test.rest.yaml.section.IsTrueAssertion;
import org.opensearch.test.rest.yaml.section.LengthAssertion;
import org.opensearch.test.rest.yaml.section.LessThanAssertion;
import org.opensearch.test.rest.yaml.section.MatchAssertion;
import org.opensearch.test.rest.yaml.section.SetSection;
import org.opensearch.test.rest.yaml.section.SkipSection;
import java.io.IOException;
import java.util.Map;

13
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuiteTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/section/ClientYamlTestSuiteTests.java
View File

@ -17,24 +17,13 @@
* under the License.
*/
package org.elasticsearch.test.rest.yaml.section;
package org.opensearch.test.rest.yaml.section;
import org.opensearch.Version;
import org.opensearch.client.NodeSelector;
import org.opensearch.common.ParsingException;
import org.opensearch.common.xcontent.XContentLocation;
import org.opensearch.common.xcontent.yaml.YamlXContent;
import org.opensearch.test.rest.yaml.section.ApiCallSection;
import org.opensearch.test.rest.yaml.section.ClientYamlTestSection;
import org.opensearch.test.rest.yaml.section.ClientYamlTestSuite;
import org.opensearch.test.rest.yaml.section.ContainsAssertion;
import org.opensearch.test.rest.yaml.section.DoSection;
import org.opensearch.test.rest.yaml.section.ExecutableSection;
import org.opensearch.test.rest.yaml.section.IsTrueAssertion;
import org.opensearch.test.rest.yaml.section.MatchAssertion;
import org.opensearch.test.rest.yaml.section.SetupSection;
import org.opensearch.test.rest.yaml.section.SkipSection;
import org.opensearch.test.rest.yaml.section.TeardownSection;
import java.util.ArrayList;
import java.util.Collections;

4
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/section/DoSectionTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.rest.yaml.section;
package org.opensearch.test.rest.yaml.section;
import org.apache.http.HttpHost;
import org.opensearch.Version;
@ -31,8 +31,6 @@ import org.opensearch.common.xcontent.yaml.YamlXContent;
import org.opensearch.test.rest.yaml.ClientYamlTestExecutionContext;
import org.opensearch.test.rest.yaml.ClientYamlTestResponse;
import org.hamcrest.MatcherAssert;
import org.opensearch.test.rest.yaml.section.ApiCallSection;
import org.opensearch.test.rest.yaml.section.DoSection;
import java.io.IOException;
import java.util.ArrayList;

2
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/MatchAssertionTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/section/MatchAssertionTests.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.rest.yaml.section;
package org.opensearch.test.rest.yaml.section;
import org.opensearch.common.xcontent.XContentLocation;
import org.opensearch.test.OpenSearchTestCase;

3
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SetSectionTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/section/SetSectionTests.java
View File

@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.rest.yaml.section;
package org.opensearch.test.rest.yaml.section;
import org.opensearch.common.ParsingException;
import org.opensearch.common.xcontent.yaml.YamlXContent;
import org.opensearch.test.rest.yaml.section.SetSection;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;

5
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SetupSectionTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/section/SetupSectionTests.java
View File

@ -16,13 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.rest.yaml.section;
package org.opensearch.test.rest.yaml.section;
import org.opensearch.Version;
import org.opensearch.common.xcontent.yaml.YamlXContent;
import org.opensearch.test.rest.yaml.section.DoSection;
import org.opensearch.test.rest.yaml.section.SetSection;
import org.opensearch.test.rest.yaml.section.SetupSection;
import java.io.IOException;

3
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SkipSectionTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/section/SkipSectionTests.java
View File

@ -17,13 +17,12 @@
* under the License.
*/
package org.elasticsearch.test.rest.yaml.section;
package org.opensearch.test.rest.yaml.section;
import org.opensearch.Version;
import org.opensearch.common.ParsingException;
import org.opensearch.common.xcontent.yaml.YamlXContent;
import org.opensearch.test.VersionUtils;
import org.opensearch.test.rest.yaml.section.SkipSection;
import java.util.Collections;

4
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/TeardownSectionTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/section/TeardownSectionTests.java
View File

@ -17,12 +17,10 @@
* under the License.
*/
package org.elasticsearch.test.rest.yaml.section;
package org.opensearch.test.rest.yaml.section;
import org.opensearch.Version;
import org.opensearch.common.xcontent.yaml.YamlXContent;
import org.opensearch.test.rest.yaml.section.DoSection;
import org.opensearch.test.rest.yaml.section.TeardownSection;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;

3
test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/TransformAndSetSectionTests.java → test/framework/src/test/java/org/opensearch/test/rest/yaml/section/TransformAndSetSectionTests.java
View File

@ -17,13 +17,12 @@
* under the License.
*/
package org.elasticsearch.test.rest.yaml.section;
package org.opensearch.test.rest.yaml.section;
import org.opensearch.common.ParsingException;
import org.opensearch.common.xcontent.yaml.YamlXContent;
import org.opensearch.test.rest.yaml.ClientYamlTestExecutionContext;
import org.opensearch.test.rest.yaml.Stash;
import org.opensearch.test.rest.yaml.section.TransformAndSetSection;
import java.nio.charset.StandardCharsets;
import java.util.Base64;

2
test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterIT.java → test/framework/src/test/java/org/opensearch/test/test/InternalTestClusterIT.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.test;
package org.opensearch.test.test;
import org.opensearch.client.node.NodeClient;
import org.opensearch.common.settings.Settings;

2
test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java → test/framework/src/test/java/org/opensearch/test/test/InternalTestClusterTests.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.test;
package org.opensearch.test.test;
import org.apache.lucene.util.LuceneTestCase;
import org.opensearch.client.Client;

2
test/framework/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java → test/framework/src/test/java/org/opensearch/test/test/LoggingListenerTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.test;
package org.opensearch.test.test;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;

2
test/framework/src/test/java/org/elasticsearch/test/test/OpenSearchTestCaseTests.java → test/framework/src/test/java/org/opensearch/test/test/OpenSearchTestCaseTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.test;
package org.opensearch.test.test;
import junit.framework.AssertionFailedError;

2
test/framework/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java → test/framework/src/test/java/org/opensearch/test/test/SuiteScopeClusterIT.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.test;
package org.opensearch.test.test;
import com.carrotsearch.randomizedtesting.annotations.Repeat;
import org.opensearch.common.SuppressForbidden;

2
test/framework/src/test/java/org/elasticsearch/test/test/TestScopeClusterIT.java → test/framework/src/test/java/org/opensearch/test/test/TestScopeClusterIT.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.test.test;
package org.opensearch.test.test;
import org.opensearch.test.OpenSearchIntegTestCase;
import org.opensearch.test.TestCluster;