Skip to content

Commit

Permalink
Move logsdb tests to logsdb plugin (#114952)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lkts
lkts authored Oct 17, 2024
1 parent 1ebe1b3 commit 441eea7
Show file tree
Hide file tree
Showing 25 changed files with 120 additions and 170 deletions.
10 changes: 4 additions & 6 deletions ...logsdb/LogsIndexModeCustomSettingsIT.java → ...logsdb/LogsIndexModeCustomSettingsIT.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb;
package org.elasticsearch.xpack.logsdb;

import org.elasticsearch.client.Request;
import org.elasticsearch.client.ResponseException;
Expand Down
10 changes: 4 additions & 6 deletions ...gsdb/LogsIndexModeDisabledRestTestIT.java → ...gsdb/LogsIndexModeDisabledRestTestIT.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb;
package org.elasticsearch.xpack.logsdb;

import org.elasticsearch.client.RestClient;
import org.elasticsearch.index.IndexMode;
Expand Down
10 changes: 4 additions & 6 deletions ...ogsdb/LogsIndexModeEnabledRestTestIT.java → ...ogsdb/LogsIndexModeEnabledRestTestIT.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb;
package org.elasticsearch.xpack.logsdb;

import org.elasticsearch.client.Response;
import org.elasticsearch.client.ResponseException;
Expand Down
10 changes: 4 additions & 6 deletions ...reams/logsdb/LogsIndexModeRestTestIT.java → ...xpack/logsdb/LogsIndexModeRestTestIT.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb;
package org.elasticsearch.xpack.logsdb;

import org.elasticsearch.client.Request;
import org.elasticsearch.client.Response;
Expand Down
10 changes: 4 additions & 6 deletions .../logsdb/qa/AbstractChallengeRestTest.java → .../logsdb/qa/AbstractChallengeRestTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa;
package org.elasticsearch.xpack.logsdb.qa;

import org.elasticsearch.client.Request;
import org.elasticsearch.client.Response;
Expand Down
10 changes: 4 additions & 6 deletions ...reams/logsdb/qa/DataGenerationHelper.java → ...xpack/logsdb/qa/DataGenerationHelper.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa;
package org.elasticsearch.xpack.logsdb.qa;

import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.mapper.Mapper;
Expand Down
10 changes: 4 additions & 6 deletions ...dexedIntoStandardModeChallengeRestIT.java → ...dexedIntoStandardModeChallengeRestIT.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa;
package org.elasticsearch.xpack.logsdb.qa;

import org.elasticsearch.client.Request;
import org.elasticsearch.client.Response;
Expand Down
10 changes: 4 additions & 6 deletions ...VersusReindexedLogsDbChallengeRestIT.java → ...VersusReindexedLogsDbChallengeRestIT.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa;
package org.elasticsearch.xpack.logsdb.qa;

import org.elasticsearch.client.Request;
import org.elasticsearch.client.Response;
Expand Down
10 changes: 4 additions & 6 deletions ...ams/logsdb/qa/ReindexChallengeRestIT.java → ...ack/logsdb/qa/ReindexChallengeRestIT.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa;
package org.elasticsearch.xpack.logsdb.qa;

import org.elasticsearch.client.Request;
import org.elasticsearch.client.Response;
Expand Down
14 changes: 6 additions & 8 deletions ...rdVersusLogsIndexModeChallengeRestIT.java → ...rdVersusLogsIndexModeChallengeRestIT.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa;
package org.elasticsearch.xpack.logsdb.qa;

import org.elasticsearch.client.Request;
import org.elasticsearch.client.Response;
Expand All @@ -18,8 +16,6 @@
import org.elasticsearch.common.time.DateFormatter;
import org.elasticsearch.common.time.FormatNames;
import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.datastreams.logsdb.qa.matchers.MatchResult;
import org.elasticsearch.datastreams.logsdb.qa.matchers.Matcher;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.search.aggregations.AggregationBuilders;
Expand All @@ -31,6 +27,8 @@
import org.elasticsearch.xcontent.XContentBuilder;
import org.elasticsearch.xcontent.XContentFactory;
import org.elasticsearch.xcontent.XContentType;
import org.elasticsearch.xpack.logsdb.qa.matchers.MatchResult;
import org.elasticsearch.xpack.logsdb.qa.matchers.Matcher;
import org.hamcrest.Matchers;

import java.io.IOException;
Expand Down
10 changes: 4 additions & 6 deletions ...gsIndexModeRandomDataChallengeRestIT.java → ...gsIndexModeRandomDataChallengeRestIT.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa;
package org.elasticsearch.xpack.logsdb.qa;

import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.time.DateFormatter;
Expand Down
10 changes: 4 additions & 6 deletions ...domDataDynamicMappingChallengeRestIT.java → ...domDataDynamicMappingChallengeRestIT.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa;
package org.elasticsearch.xpack.logsdb.qa;

import org.elasticsearch.common.settings.Settings;

Expand Down
10 changes: 4 additions & 6 deletions ...rdReindexedIntoLogsDbChallengeRestIT.java → ...rdReindexedIntoLogsDbChallengeRestIT.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa;
package org.elasticsearch.xpack.logsdb.qa;

import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.xcontent.XContentBuilder;
Expand Down
14 changes: 6 additions & 8 deletions ...logsdb/qa/matchers/ArrayEqualMatcher.java → ...logsdb/qa/matchers/ArrayEqualMatcher.java
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa.matchers;
package org.elasticsearch.xpack.logsdb.qa.matchers;

import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.xcontent.XContentBuilder;

import java.util.Arrays;
import java.util.List;

import static org.elasticsearch.datastreams.logsdb.qa.matchers.Messages.formatErrorMessage;
import static org.elasticsearch.datastreams.logsdb.qa.matchers.Messages.prettyPrintArrays;
import static org.elasticsearch.xpack.logsdb.qa.matchers.Messages.formatErrorMessage;
import static org.elasticsearch.xpack.logsdb.qa.matchers.Messages.prettyPrintArrays;

class ArrayEqualMatcher extends GenericEqualsMatcher<Object[]> {
ArrayEqualMatcher(
Expand Down
12 changes: 5 additions & 7 deletions ...sdb/qa/matchers/GenericEqualsMatcher.java → ...sdb/qa/matchers/GenericEqualsMatcher.java
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa.matchers;
package org.elasticsearch.xpack.logsdb.qa.matchers;

import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.xcontent.XContentBuilder;

import java.util.List;

import static org.elasticsearch.datastreams.logsdb.qa.matchers.Messages.formatErrorMessage;
import static org.elasticsearch.xpack.logsdb.qa.matchers.Messages.formatErrorMessage;

public class GenericEqualsMatcher<T> extends Matcher {
protected final XContentBuilder actualMappings;
Expand Down
14 changes: 6 additions & 8 deletions .../logsdb/qa/matchers/ListEqualMatcher.java → .../logsdb/qa/matchers/ListEqualMatcher.java
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa.matchers;
package org.elasticsearch.xpack.logsdb.qa.matchers;

import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.xcontent.XContentBuilder;

import java.util.List;

import static org.elasticsearch.datastreams.logsdb.qa.matchers.Messages.formatErrorMessage;
import static org.elasticsearch.datastreams.logsdb.qa.matchers.Messages.prettyPrintCollections;
import static org.elasticsearch.xpack.logsdb.qa.matchers.Messages.formatErrorMessage;
import static org.elasticsearch.xpack.logsdb.qa.matchers.Messages.prettyPrintCollections;

public class ListEqualMatcher extends GenericEqualsMatcher<List<?>> {
public ListEqualMatcher(
Expand Down
10 changes: 4 additions & 6 deletions ...reams/logsdb/qa/matchers/MatchResult.java → ...xpack/logsdb/qa/matchers/MatchResult.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa.matchers;
package org.elasticsearch.xpack.logsdb.qa.matchers;

import java.util.Objects;

Expand Down
12 changes: 5 additions & 7 deletions ...tastreams/logsdb/qa/matchers/Matcher.java → ...rch/xpack/logsdb/qa/matchers/Matcher.java
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa.matchers;
package org.elasticsearch.xpack.logsdb.qa.matchers;

import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.datastreams.logsdb.qa.matchers.source.SourceMatcher;
import org.elasticsearch.xcontent.XContentBuilder;
import org.elasticsearch.xpack.logsdb.qa.matchers.source.SourceMatcher;

import java.util.List;
import java.util.Map;
Expand Down
10 changes: 4 additions & 6 deletions ...astreams/logsdb/qa/matchers/Messages.java → ...ch/xpack/logsdb/qa/matchers/Messages.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the "Elastic License
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
* Public License v 1"; you may not use this file except in compliance with, at
* your election, the "Elastic License 2.0", the "GNU Affero General Public
* License v3.0 only", or the "Server Side Public License, v 1".
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

package org.elasticsearch.datastreams.logsdb.qa.matchers;
package org.elasticsearch.xpack.logsdb.qa.matchers;

import org.elasticsearch.common.Strings;
import org.elasticsearch.common.settings.Settings;
Expand Down
Loading

0 comments on commit 441eea7

Please sign in to comment.