adjusted running tests

equinix-labs · Sep 13, 2024 · c7c615a · c7c615a
1 parent db7e81b
commit c7c615a
Show file tree

Hide file tree

Showing 27 changed files with 135 additions and 294 deletions.
diff --git a/.github/workflows/test_runner.yml b/.github/workflows/test_runner.yml
@@ -24,19 +24,18 @@ jobs:
  - name: Tests
  shell: bash
  run: |-
- cd equinix-openapi-fabric
  mvn clean test -DenvUrl=${{ env.TEST_HOST_URL }}
 
  - name: Generate report
  if: always()
  shell: bash
  run: |-
- cd equinix-openapi-fabric
+ cd equinix-openapi-fabric-tests
  mvn surefire-report:report -DskipTests
  
  - name: attach report as attachment
  if: always()
  uses: actions/upload-artifact@v4
  with:
  name: test report
- path: ./equinix-openapi-fabric/target/reports
+ path: ./equinix-openapi-fabric-tests/target/reports
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,5 @@ hs_err_pid*
 # JetBrains project directory files
 *.idea
 *.idea/
+equinix-openapi-fabric/target
+equinix-openapi-fabric-tests/target
diff --git a/equinix-openapi-fabric-tests/README.md b/equinix-openapi-fabric-tests/README.md
@@ -1,24 +1,5 @@
 # equinix-openapi-fabric-tests
 
-Equinix Fabric API v4
-
-- API version: 4.15
-
-Equinix Fabric is an advanced software-defined interconnection solution that enables you to directly, securely and
-dynamically connect to distributed infrastructure and digital ecosystems on platform Equinix via a single port,
-Customers can use Fabric to connect to: </br> 1. Cloud Service Providers - Clouds, network and other service
-providers. </br> 2. Enterprises - Other Equinix customers, vendors and partners. </br> 3. Myself - Another customer
-instance deployed at Equinix. </br> </br> <b>Integrations (SDKs, Tools) links:</b> </br> <a
-href=\"https://deploy.equinix.com/labs/fabric-java\\\">Fabric Java SDK</a> </br> <a
-href=\"https://deploy.equinix.com/labs/equinix-sdk-go\\\">Fabric Go SDK</a> </br> <a
-href=\"https://deploy.equinix.com/labs/terraform-provider-equinix\\\">Equinix Terraform Provider</a> </br> <a
-href=\"https://deploy.equinix.com/labs/terraform-equinix-fabric\\\">Fabric Terraform Modules</a> </br> <a
-href=\"https://deploy.equinix.com/labs/pulumi-provider-equinix/\">Equinix Pulumi Provider</a> </br>
-
-For more information, please visit [https://equinix.com/about/](https://equinix.com/about/)
-
-*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
-
 ## Requirements
 
 Building the API client library requires:

diff --git a/equinix-openapi-fabric-tests/equinix-openapi-fabric-tests.iml b/equinix-openapi-fabric-tests/equinix-openapi-fabric-tests.iml
@@ -2,7 +2,7 @@
 <module version="4">
  <component name="AdditionalModuleElements">
  <content url="file://$MODULE_DIR$" dumb="true">
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
  </content>
  </component>
 </module>
diff --git a/equinix-openapi-fabric-tests/pom.xml b/equinix-openapi-fabric-tests/pom.xml
@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <modelVersion>4.0.0</modelVersion>
+
  <groupId>com.equinix</groupId>
- <artifactId>equinix-openapi-fabric-tests</artifactId>
- <packaging>pom</packaging>
+ <artifactId>openapi-fabric-tests</artifactId>
  <name>equinix-openapi-fabric-tests</name>
  <version>0.5.0</version>
 
@@ -15,166 +15,28 @@
 
  <build>
  <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <fork>true</fork>
- <meminitial>128m</meminitial>
- <maxmem>512m</maxmem>
- <compilerArgs>
- <arg>-Xlint:all</arg>
- <arg>-J-Xss4m
- </arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
- </compilerArgs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <execution>
- <id>enforce-maven</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>2.2.0</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
  <version>2.22.2</version>
  <configuration>
- <!-- <includes>-->
- <!-- <include>**/com/equinix/openapi/fabric/v4/api/**</include>-->
- <!-- </includes>-->
- <!-- <systemProperties>-->
- <!-- <property>-->
- <!-- <name>loggerPath</name>-->
- <!-- <value>conf/log4j.properties</value>-->
- <!-- </property>-->
- <!-- </systemProperties>-->
- <argLine>-Xms512m -Xmx1500m</argLine>
- <parallel>methods</parallel>
- <threadCount>10</threadCount>
+ <includes>
+ <include>MetrosApiTest.java</include>
+ </includes>
  </configuration>
- <dependencies>
- <!--Custom provider and engine for Junit 5 to surefire-->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit-version}</version>
- </dependency>
- </dependencies>
  </plugin>
  </plugins>
  </build>
  <dependencies>
- <!-- @Nullable annotation -->
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>3.0.2</version>
- </dependency>
- <!-- <dependency>-->
- <!-- <groupId>com.squareup.okhttp3</groupId>-->
- <!-- <artifactId>okhttp</artifactId>-->
- <!-- <version>${okhttp-version}</version>-->
- <!-- </dependency>-->
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>logging-interceptor</artifactId>
- <version>${okhttp-version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson-version}</version>
- </dependency>
- <dependency>
- <groupId>io.gsonfire</groupId>
- <artifactId>gson-fire</artifactId>
- <version>${gson-fire-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang3-version}</version>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>${jakarta-annotation-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.openapitools</groupId>
- <artifactId>jackson-databind-nullable</artifactId>
- <version>${jackson-databind-nullable-version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>${jsr311-api-version}</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>${javax.ws.rs-api-version}</version>
- </dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-runner</artifactId>
- <version>${junit-platform-runner.version}</version>
- <scope>test</scope>
- </dependency>
  <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito-core-version}</version>
- <scope>test</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
  </dependency>
  <dependency>
  <groupId>com.equinix</groupId>
  <artifactId>equinix-openapi-fabric</artifactId>
  <version>0.5.0</version>
  </dependency>
  </dependencies>
- <properties>
- <java.version>1.8</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
- <gson-fire-version>1.8.5</gson-fire-version>
- <swagger-annotations-version>1.6.6</swagger-annotations-version>
- <okhttp-version>4.10.0</okhttp-version>
- <gson-version>2.9.1</gson-version>
- <commons-lang3-version>3.12.0</commons-lang3-version>
- <jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
- <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
- <junit-version>5.9.1</junit-version>
- <junit-platform-runner.version>1.9.1</junit-platform-runner.version>
- <mockito-core-version>3.12.4</mockito-core-version>
- <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
- <jsr311-api-version>1.1.1</jsr311-api-version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spotless.version>2.27.2</spotless.version>
- </properties>
 </project>
diff --git a/...pi/fabric/v4/api/CloudRoutersApiTest.java → ...api/fabric/tests/CloudRoutersApiTest.java b/...pi/fabric/v4/api/CloudRoutersApiTest.java → ...api/fabric/tests/CloudRoutersApiTest.java
@@ -8,23 +8,22 @@
  * Do not edit the class manually.
  */
 
-package com.equinix.openapi.fabric.v4.api;
+package com.equinix.openapi.fabric.tests;
 
 import com.equinix.openapi.fabric.ApiException;
-
+import com.equinix.openapi.fabric.tests.dto.users.UsersItem;
+import com.equinix.openapi.fabric.tests.helpers.Utils;
 import com.equinix.openapi.fabric.v4.model.*;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import com.equinix.openapi.fabric.v4.api.dto.users.UsersItem;
-import com.equinix.openapi.fabric.v4.api.helpers.Utils;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 import java.util.UUID;
 
+import static com.equinix.openapi.fabric.tests.helpers.Apis.*;
+import static com.equinix.openapi.fabric.tests.helpers.TokenGenerator.users;
 import static java.util.Collections.singletonList;
-import static org.junit.jupiter.api.Assertions.*;
-import static com.equinix.openapi.fabric.v4.api.helpers.Apis.*;
-import static com.equinix.openapi.fabric.v4.api.helpers.TokenGenerator.users;
+import static org.junit.Assert.*;
 
 /**
  * API tests for CloudRoutersApi
@@ -41,12 +40,12 @@ public static void removeCloudRouters(UsersItem.UserName userName) {
  });
  }
 
- @BeforeAll
+ @BeforeClass
  public static void setUp() {
  setUserName(userName);
  }
 
- @AfterAll
+ @AfterClass
  public static void removeResources() {
  removeCloudRouters(userName);
  }
@@ -274,7 +273,6 @@ private static void waitForCloudRouterIsProvisioned(UUID cloudRouterUuid) {
  }
  }
 
- assertTrue(result,
- "Cloud Router has not reached the expected state: " + CloudRouterAccessPointState.PROVISIONED + " current state: " + currentState.getValue());
+ assertTrue("Cloud Router has not reached the expected state: " + CloudRouterAccessPointState.PROVISIONED + " current state: " + currentState.getValue(), result);
  }
 }
diff --git a/...api/fabric/v4/api/ConnectionsApiTest.java → ...napi/fabric/tests/ConnectionsApiTest.java b/...api/fabric/v4/api/ConnectionsApiTest.java → ...napi/fabric/tests/ConnectionsApiTest.java
@@ -8,30 +8,29 @@
  * Do not edit the class manually.
  */
 
-package com.equinix.openapi.fabric.v4.api;
+package com.equinix.openapi.fabric.tests;
 
 import com.equinix.openapi.fabric.ApiException;
-
+import com.equinix.openapi.fabric.tests.dto.port.PortDto;
+import com.equinix.openapi.fabric.tests.dto.users.UsersItem;
+import com.equinix.openapi.fabric.tests.helpers.Utils;
 import com.equinix.openapi.fabric.v4.model.*;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import com.equinix.openapi.fabric.v4.api.dto.port.PortDto;
-import com.equinix.openapi.fabric.v4.api.dto.users.UsersItem;
-import com.equinix.openapi.fabric.v4.api.helpers.Utils;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 import java.util.List;
 import java.util.Random;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import static com.equinix.openapi.fabric.tests.CloudRoutersApiTest.createRouter;
+import static com.equinix.openapi.fabric.tests.PortsApiTest.getPorts;
+import static com.equinix.openapi.fabric.tests.helpers.Apis.*;
+import static com.equinix.openapi.fabric.tests.helpers.TokenGenerator.users;
+import static com.equinix.openapi.fabric.tests.helpers.Utils.getRandomVlanNumber;
 import static java.util.Collections.singletonList;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static com.equinix.openapi.fabric.v4.api.CloudRoutersApiTest.createRouter;
-import static com.equinix.openapi.fabric.v4.api.PortsApiTest.getPorts;
-import static com.equinix.openapi.fabric.v4.api.helpers.Apis.*;
-import static com.equinix.openapi.fabric.v4.api.helpers.TokenGenerator.users;
-import static com.equinix.openapi.fabric.v4.api.helpers.Utils.getRandomVlanNumber;
+import static org.junit.Assert.assertEquals;
 
 public class ConnectionsApiTest {
  private static final UsersItem.UserName userName = UsersItem.UserName.PANTHERS_FCR;
@@ -51,12 +50,12 @@ public static void removeConnections(UsersItem.UserName userName) {
  });
  }
 
- @BeforeAll
+ @BeforeClass
  public static void setUp() {
  setUserName(userName);
  }
 
- @AfterAll
+ @AfterClass
  public static void removeResources() {
  removeConnections(userName);
  CloudRoutersApiTest.removeCloudRouters(userName);

diff --git a/.../openapi/fabric/v4/api/MetrosApiTest.java → ...x/openapi/fabric/tests/MetrosApiTest.java b/.../openapi/fabric/v4/api/MetrosApiTest.java → ...x/openapi/fabric/tests/MetrosApiTest.java
@@ -8,17 +8,17 @@
  * Do not edit the class manually.
  */
 
-package com.equinix.openapi.fabric.v4.api;
+package com.equinix.openapi.fabric.tests;
 
 import com.equinix.openapi.fabric.ApiException;
 import com.equinix.openapi.fabric.v4.model.Metro;
 import com.equinix.openapi.fabric.v4.model.MetroResponse;
 import com.equinix.openapi.fabric.v4.model.Presence;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static com.equinix.openapi.fabric.v4.api.helpers.Apis.metrosApi;
+import static com.equinix.openapi.fabric.tests.helpers.Apis.metrosApi;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * API tests for MetrosApi