Skip to content

Commit 0ef1ca9

Browse files
bhufmannbhufmann
committed
server.tess: Move NewRestServerTests back to RestServerTests
After all tests having been migrated the class can be renamed to the original name. Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
1 parent 8562783 commit 0ef1ca9

15 files changed

+408
-1400
lines changed

‎trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/BookmarkManagerServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
import org.eclipse.jdt.annotation.NonNull;
3434
import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.model.views.QueryParameters;
35-
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.NewRestServerTest;
35+
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.RestServerTest;
3636
import org.eclipse.tracecompass.incubator.tsp.client.core.ApiException;
3737
import org.eclipse.tracecompass.incubator.tsp.client.core.api.BookmarksApi;
3838
import org.eclipse.tracecompass.incubator.tsp.client.core.model.Bookmark;
@@ -50,7 +50,7 @@
5050
* @author Kaveh Shahedi
5151
*/
5252
@SuppressWarnings("null")
53-
public class BookmarkManagerServiceTest extends NewRestServerTest {
53+
public class BookmarkManagerServiceTest extends RestServerTest {
5454

5555
private static final String BOOKMARK_NAME = "TEST";
5656
private static final long START_TIME = 0L;

‎trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/ConfigurationManagerServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.services.ConfigurationManagerService;
3737
import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.services.EndpointConstants;
3838
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.stubs.config.TestSchemaConfigurationSource.Parameters;
39-
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.NewRestServerTest;
39+
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.RestServerTest;
4040
import org.eclipse.tracecompass.incubator.tsp.client.core.ApiException;
4141
import org.eclipse.tracecompass.incubator.tsp.client.core.api.ConfigurationsApi;
4242
import org.eclipse.tracecompass.incubator.tsp.client.core.api.XyApi;
@@ -62,7 +62,7 @@
6262
* @author Bernd Hufmann
6363
*/
6464
@SuppressWarnings("restriction")
65-
public class ConfigurationManagerServiceTest extends NewRestServerTest {
65+
public class ConfigurationManagerServiceTest extends RestServerTest {
6666

6767
private static final Bundle XML_CORE_TESTS = Platform.getBundle("org.eclipse.tracecompass.tmf.analysis.xml.core.tests");
6868

‎trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/DataProviderConfigurationServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.services.ErrorResponseImpl;
3333
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.stubs.TestDataProviderFactory;
3434
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.stubs.config.TestSchemaConfigurationSource;
35-
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.NewRestServerTest;
35+
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.RestServerTest;
3636
import org.eclipse.tracecompass.incubator.tsp.client.core.ApiException;
3737
import org.eclipse.tracecompass.incubator.tsp.client.core.api.OutputConfigurationsApi;
3838
import org.eclipse.tracecompass.incubator.tsp.client.core.model.ConfigurationSourceType;
@@ -49,7 +49,7 @@
4949
* @author Bernd Hufmann
5050
*/
5151
@SuppressWarnings("null")
52-
public class DataProviderConfigurationServiceTest extends NewRestServerTest {
52+
public class DataProviderConfigurationServiceTest extends RestServerTest {
5353
private static final String UNKNOWN_TYPE_ID = "unknown.config.type.id";
5454

5555
private static final String CONFIG_NAME = "My configuration";

‎trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/DataProviderServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.List;
2020

2121
import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.services.DataProviderService;
22-
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.NewRestServerTest;
22+
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.RestServerTest;
2323
import org.eclipse.tracecompass.incubator.tsp.client.core.ApiException;
2424
import org.eclipse.tracecompass.incubator.tsp.client.core.model.DataProvider;
2525
import org.eclipse.tracecompass.incubator.tsp.client.core.model.Experiment;
@@ -34,7 +34,7 @@
3434
* @author Geneviève Bastien
3535
* @author Bernd Hufmann
3636
*/
37-
public class DataProviderServiceTest extends NewRestServerTest {
37+
public class DataProviderServiceTest extends RestServerTest {
3838

3939
/**
4040
* Test getting the data provider descriptors

‎trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/DataTreeDataProviderServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import javax.ws.rs.ProcessingException;
2525

2626
import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.services.DataProviderService;
27-
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.NewRestServerTest;
27+
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.RestServerTest;
2828
import org.eclipse.tracecompass.incubator.tsp.client.core.ApiException;
2929
import org.eclipse.tracecompass.incubator.tsp.client.core.api.DataTreeApi;
3030
import org.eclipse.tracecompass.incubator.tsp.client.core.model.DataTreeEntry;
@@ -45,7 +45,7 @@
4545
*
4646
* @author Bernd Hufmann
4747
*/
48-
public class DataTreeDataProviderServiceTest extends NewRestServerTest {
48+
public class DataTreeDataProviderServiceTest extends RestServerTest {
4949
private static final String DATA_PROVIDER_RESPONSE_FAILED_MSG = "There should be a positive response for the data provider";
5050
private static final String MODEL_NULL_MSG = "The model is null, maybe the analysis did not run long enough?";
5151
private static final int MAX_ITER = 40;

‎trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/ExperimentManagerServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.eclipse.core.runtime.Path;
3636
import org.eclipse.jdt.annotation.NonNull;
3737
import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.services.ExperimentManagerService;
38-
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.NewRestServerTest;
38+
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.RestServerTest;
3939
import org.eclipse.tracecompass.incubator.tsp.client.core.ApiException;
4040
import org.eclipse.tracecompass.incubator.tsp.client.core.model.Experiment;
4141
import org.eclipse.tracecompass.incubator.tsp.client.core.model.Experiment.IndexingStatusEnum;
@@ -56,7 +56,7 @@
5656
* @author Bernd Hufamnn
5757
*/
5858
@SuppressWarnings("null")
59-
public class ExperimentManagerServiceTest extends NewRestServerTest {
59+
public class ExperimentManagerServiceTest extends RestServerTest {
6060

6161
private static final String TEST = "test";
6262
private static final @NonNull List<Trace> CONTEXT_SWITCH_SET = List.of(sfContextSwitchesKernelWithOffsetStub, sfContextSwitchesUstWithOffsetStub);

‎trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/GenericXYDataProviderServiceTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.List;
2323

2424
import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.services.DataProviderService;
25-
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.NewRestServerTest;
25+
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.RestServerTest;
2626
import org.eclipse.tracecompass.incubator.tsp.client.core.ApiException;
2727
import org.eclipse.tracecompass.incubator.tsp.client.core.api.GenericXyApi;
2828
import org.eclipse.tracecompass.incubator.tsp.client.core.model.AxisDomainRange;
@@ -54,7 +54,7 @@
5454
*
5555
* @author Siwei Zhang
5656
*/
57-
public class GenericXYDataProviderServiceTest extends NewRestServerTest {
57+
public class GenericXYDataProviderServiceTest extends RestServerTest {
5858
private static final String DATA_PROVIDER_RESPONSE_FAILED_MSG = "There should be a positive response for the data provider";
5959
private static final String MODEL_NULL_MSG = "The model is null, maybe the analysis did not run long enough?";
6060
private static final int MAX_ITER = 40;
@@ -287,7 +287,7 @@ public void testCallStackFunctionDensityDataProvider() throws InterruptedExcepti
287287
@Test
288288
public void testXYErrors() {
289289
Experiment exp = assertPostExperiment(sfContextSwitchesUstNotInitializedStub.getName(), sfContextSwitchesUstNotInitializedStub);
290-
executePostErrorTests(exp.getUUID(), NewRestServerTest::getGenericXYTreeEndpoint, CALL_STACK_FUNCTION_DENSITY_DATAPROVIDER_ID, false);
291-
executePostErrorTests(exp.getUUID(), NewRestServerTest::getGenericXYSeriesEndpoint, CALL_STACK_FUNCTION_DENSITY_DATAPROVIDER_ID, true);
290+
executePostErrorTests(exp.getUUID(), RestServerTest::getGenericXYTreeEndpoint, CALL_STACK_FUNCTION_DENSITY_DATAPROVIDER_ID, false);
291+
executePostErrorTests(exp.getUUID(), RestServerTest::getGenericXYSeriesEndpoint, CALL_STACK_FUNCTION_DENSITY_DATAPROVIDER_ID, true);
292292
}
293293
}

‎trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/HealthServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.services.HealthService;
1818
import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.services.TraceManagerService;
19-
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.NewRestServerTest;
19+
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.RestServerTest;
2020
import org.eclipse.tracecompass.incubator.tsp.client.core.ApiException;
2121
import org.eclipse.tracecompass.incubator.tsp.client.core.api.DiagnosticApi;
2222
import org.eclipse.tracecompass.incubator.tsp.client.core.model.ServerStatus;
@@ -28,7 +28,7 @@
2828
*
2929
* @author Geneviève Bastien
3030
*/
31-
public class HealthServiceTest extends NewRestServerTest {
31+
public class HealthServiceTest extends RestServerTest {
3232

3333
private static final DiagnosticApi sfDiagnosticApi = new DiagnosticApi(sfApiClient);
3434

‎trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/IdentifierServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.services.EndpointConstants;
1818
import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.services.IdentifierService;
19-
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.NewRestServerTest;
19+
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.RestServerTest;
2020
import org.eclipse.tracecompass.incubator.tsp.client.core.ApiException;
2121
import org.eclipse.tracecompass.incubator.tsp.client.core.api.IdentifierApi;
2222
import org.eclipse.tracecompass.incubator.tsp.client.core.model.ServerInfoResponse;
@@ -27,7 +27,7 @@
2727
*
2828
* @author Vlad Arama
2929
*/
30-
public class IdentifierServiceTest extends NewRestServerTest {
30+
public class IdentifierServiceTest extends RestServerTest {
3131

3232
private static final IdentifierApi sfIdentifierApi = new IdentifierApi(sfApiClient);
3333

‎trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/services/TableDataProviderServiceTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.Map;
2222

2323
import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.services.DataProviderService;
24-
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.NewRestServerTest;
24+
import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.utils.RestServerTest;
2525
import org.eclipse.tracecompass.incubator.tsp.client.core.ApiException;
2626
import org.eclipse.tracecompass.incubator.tsp.client.core.api.VirtualTablesApi;
2727
import org.eclipse.tracecompass.incubator.tsp.client.core.model.Experiment;
@@ -40,7 +40,7 @@
4040
*
4141
* @author Bernd Hufmann
4242
*/
43-
public class TableDataProviderServiceTest extends NewRestServerTest {
43+
public class TableDataProviderServiceTest extends RestServerTest {
4444
private static final String DATA_PROVIDER_RESPONSE_FAILED_MSG = "There should be a positive response for the data provider";
4545
private static final String MODEL_NULL_MSG = "The model is null, maybe the analysis did not run long enough?";
4646
private static final int MAX_ITER = 40;
@@ -122,7 +122,7 @@ public void testTableDataProvider() throws InterruptedException, ApiException {
122122
@Test
123123
public void testTableErrors() {
124124
Experiment exp = assertPostExperiment(sfArm64KernelNotIntitialzedStub.getName(), sfArm64KernelNotIntitialzedStub);
125-
executePostErrorTests(exp.getUUID(), NewRestServerTest::getTableColumnsEndpoint, EVENTS_TABLE_DATAPROVIDER_ID, false);
126-
executePostErrorTests(exp.getUUID(), NewRestServerTest::getTableLinesEndpoint, EVENTS_TABLE_DATAPROVIDER_ID, true);
125+
executePostErrorTests(exp.getUUID(), RestServerTest::getTableColumnsEndpoint, EVENTS_TABLE_DATAPROVIDER_ID, false);
126+
executePostErrorTests(exp.getUUID(), RestServerTest::getTableLinesEndpoint, EVENTS_TABLE_DATAPROVIDER_ID, true);
127127
}
128128
}

0 commit comments

Comments
 (0)