Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2016-02-15 14:13:22 -0500
committerRyan D. Brooks2016-02-15 14:13:22 -0500
commit1236948ce11e639bff4ed6096909a10974016290 (patch)
treece73a9eca837031fccc594a69ac9c112e246911e /plugins/org.eclipse.osee.x.server.integration.tests
parentba12ba06902ea0232987edbb0a376408507a373c (diff)
downloadorg.eclipse.osee-1236948ce11e639bff4ed6096909a10974016290.tar.gz
org.eclipse.osee-1236948ce11e639bff4ed6096909a10974016290.tar.xz
org.eclipse.osee-1236948ce11e639bff4ed6096909a10974016290.zip
feature: Remove OTE and contiperf
Diffstat (limited to 'plugins/org.eclipse.osee.x.server.integration.tests')
-rw-r--r--plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.x.server.integration.tests/assembly/benchmark-assembly.xml19
-rw-r--r--plugins/org.eclipse.osee.x.server.integration.tests/pom.xml15
-rw-r--r--plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/AccountClientTest.java4
-rw-r--r--plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java9
-rw-r--r--plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/util/IntegrationUtil.java9
6 files changed, 0 insertions, 59 deletions
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF
index 4cac9ead34..52b32b5e04 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF
@@ -7,9 +7,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse Open System Engineering Environment
Import-Package: javax.ws.rs.core;version="2.0.0",
org.apache.commons.lang.math,
- org.databene.contiperf,
- org.databene.contiperf.junit,
- org.databene.contiperf.report,
org.eclipse.osee.account.rest.client,
org.eclipse.osee.account.rest.model,
org.eclipse.osee.framework.core.data,
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/assembly/benchmark-assembly.xml b/plugins/org.eclipse.osee.x.server.integration.tests/assembly/benchmark-assembly.xml
deleted file mode 100644
index 93f71083a6..0000000000
--- a/plugins/org.eclipse.osee.x.server.integration.tests/assembly/benchmark-assembly.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <baseDirectory>/</baseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}/contiperf-report/</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml b/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml
index e4af69e5b3..3d4d885899 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml
@@ -217,21 +217,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>${project.basedir}/assembly/benchmark-assembly.xml</descriptor>
- <finalName>${project.artifactId}.benchmarks</finalName>
- </configuration>
- <executions>
- <execution>
- <phase>post-integration-test</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/AccountClientTest.java b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/AccountClientTest.java
index d63c8d3c90..bbfb6bb087 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/AccountClientTest.java
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/AccountClientTest.java
@@ -31,7 +31,6 @@ import org.junit.Before;
import org.junit.FixMethodOrder;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.MethodRule;
import org.junit.rules.TestName;
import org.junit.runners.MethodSorters;
@@ -42,9 +41,6 @@ import org.junit.runners.MethodSorters;
public class AccountClientTest {
@Rule
- public MethodRule performanceRule = IntegrationUtil.createPerformanceRule();
-
- @Rule
public TestName testName = new TestName();
private final AtomicBoolean isFirst = new AtomicBoolean(true);
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java
index 8a80d8dc5f..1367f38678 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java
@@ -24,7 +24,6 @@ import java.io.StringWriter;
import java.util.Collection;
import java.util.Properties;
import javax.ws.rs.core.MediaType;
-import org.databene.contiperf.PerfTest;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.QueryOption;
@@ -37,11 +36,8 @@ import org.eclipse.osee.orcs.rest.model.search.artifact.RequestType;
import org.eclipse.osee.orcs.rest.model.search.artifact.SearchResult;
import org.eclipse.osee.x.server.integration.tests.util.IntegrationUtil;
import org.junit.BeforeClass;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.MethodRule;
-@PerfTest(threads = 2, invocations = 100)
public class OseeClientQueryTest {
private static final String GUID1 = SystemUser.Anonymous.getGuid();
@@ -65,9 +61,6 @@ public class OseeClientQueryTest {
}
};
- @Rule
- public MethodRule performanceRule = IntegrationUtil.createPerformanceRule();
-
private static OseeClient createClient;
@BeforeClass
@@ -189,7 +182,6 @@ public class OseeClientQueryTest {
assertEquals(EXPECTED_RESULTS, results.getTotal());
}
- @PerfTest(threads = 1, invocations = 1)
@Test
public void supportedVersions() {
IdeClientEndpoint endpoint = createClient.getIdeClientEndpoint();
@@ -199,7 +191,6 @@ public class OseeClientQueryTest {
assertEquals(true, !supportedVersions.isEmpty());
}
- @PerfTest(threads = 1, invocations = 1)
@Test
public void orcsScript() {
String script =
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/util/IntegrationUtil.java b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/util/IntegrationUtil.java
index dc28c9977e..8b3630fce3 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/util/IntegrationUtil.java
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/util/IntegrationUtil.java
@@ -13,15 +13,10 @@ package org.eclipse.osee.x.server.integration.tests.util;
import static org.eclipse.osee.orcs.rest.client.OseeClient.OSEE_APPLICATION_SERVER;
import java.util.HashMap;
import java.util.Map;
-import org.databene.contiperf.junit.ContiPerfRule;
-import org.databene.contiperf.report.CSVLatencyReportModule;
-import org.databene.contiperf.report.CSVSummaryReportModule;
-import org.databene.contiperf.report.HtmlReportModule;
import org.eclipse.osee.account.rest.client.AccountClient;
import org.eclipse.osee.account.rest.client.AccountClientStandaloneSetup;
import org.eclipse.osee.orcs.rest.client.OseeClient;
import org.eclipse.osee.orcs.rest.client.OseeClientStandaloneSetup;
-import org.junit.rules.MethodRule;
public final class IntegrationUtil {
@@ -29,10 +24,6 @@ public final class IntegrationUtil {
// Utility class
}
- public static MethodRule createPerformanceRule() {
- return new ContiPerfRule(new HtmlReportModule(), new CSVSummaryReportModule(), new CSVLatencyReportModule());
- }
-
public static OseeClient createClient() {
Map<String, Object> config = createClientConfig();
return OseeClientStandaloneSetup.createClient(config);

Back to the top