loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-21 06:47:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update TestNG version (#2582)

Browse Source
This commit is contained in:
Jérémie Bresson
2019-04-03 10:32:54 +02:00
committed by GitHub
parent 0889b8ec13
commit d42b6d987a
21 changed files with 682 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
View File

@@ -21,8 +21,8 @@ import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.PathItem;
import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.oas.models.headers.Header;
import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.oas.models.parameters.QueryParameter;
import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse;

6
modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java
View File

@@ -9,15 +9,13 @@ import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.oas.models.parameters.QueryParameter;
import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.responses.ApiResponses;
import java.io.File;
import java.io.IOException;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
public class DefaultGeneratorTest {

5
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
View File

@@ -264,7 +264,10 @@ public class AbstractJavaCodegenTest {
/**
* Gets artifact version.
* Only for testing purposes.
* @return version
*/
public String getArtifactVersion () { return this.artifactVersion; }
public String getArtifactVersion() {
return this.artifactVersion;
}
}
}

14
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
View File

@@ -28,7 +28,6 @@ import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.junit.rules.TemporaryFolder;
import org.openapitools.codegen.*;
import org.openapitools.codegen.config.CodegenConfigurator;
import org.openapitools.codegen.languages.JavaClientCodegen;
@@ -37,10 +36,10 @@ import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import java.io.File;
import java.nio.file.Files;
import java.util.List;
public class JavaModelTest {
private TemporaryFolder folder = new TemporaryFolder();
@Test(description = "convert a simple java model")
public void simpleModelTest() {
@@ -1215,8 +1214,9 @@ public class JavaModelTest {
public void generateModel() throws Exception {
String inputSpec = "src/test/resources/3_0/petstore.json";
folder.create();
final File output = folder.getRoot();
final File output = Files.createTempDirectory("test").toFile();
output.deleteOnExit();
Assert.assertTrue(new File(inputSpec).exists());
final CodegenConfigurator configurator = new CodegenConfigurator()
@@ -1232,15 +1232,14 @@ public class JavaModelTest {
File orderFile = new File(output, "src/main/java/org/openapitools/client/model/Order.java");
Assert.assertTrue(orderFile.exists());
folder.delete();
}
@Test
public void generateEmpty() throws Exception {
String inputSpec = "src/test/resources/3_0/ping.yaml";
folder.create();
final File output = folder.getRoot();
final File output = Files.createTempDirectory("test").toFile();
output.deleteOnExit();
Assert.assertTrue(new File(inputSpec).exists());
JavaClientCodegen config = new org.openapitools.codegen.languages.JavaClientCodegen();
@@ -1258,6 +1257,5 @@ public class JavaModelTest {
File orderFile = new File(output, "src/main/java/org/openapitools/client/api/DefaultApi.java");
Assert.assertTrue(orderFile.exists());
folder.delete();
}
}

47
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java
View File

@@ -1,9 +1,17 @@
package org.openapitools.codegen.java.jaxrs;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.servers.Server;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.*;
import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile;
import org.openapitools.codegen.languages.AbstractJavaCodegen;
import org.openapitools.codegen.languages.AbstractJavaJAXRSServerCodegen;
import org.openapitools.codegen.languages.JavaCXFExtServerCodegen;
import org.openapitools.codegen.languages.features.*;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.io.File;
import java.nio.file.Files;
@@ -11,36 +19,7 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.ClientOpts;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.MockDefaultGenerator;
import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.AbstractJavaCodegen;
import org.openapitools.codegen.languages.AbstractJavaJAXRSServerCodegen;
import org.openapitools.codegen.languages.JavaCXFExtServerCodegen;
import org.openapitools.codegen.languages.features.BeanValidationExtendedFeatures;
import org.openapitools.codegen.languages.features.BeanValidationFeatures;
import org.openapitools.codegen.languages.features.CXFExtServerFeatures;
import org.openapitools.codegen.languages.features.CXFServerFeatures;
import org.openapitools.codegen.languages.features.GzipFeatures;
import org.openapitools.codegen.languages.features.GzipTestFeatures;
import org.openapitools.codegen.languages.features.JbossFeature;
import org.openapitools.codegen.languages.features.LoggingFeatures;
import org.openapitools.codegen.languages.features.LoggingTestFeatures;
import org.openapitools.codegen.languages.features.SpringFeatures;
import org.openapitools.codegen.languages.features.SwaggerFeatures;
import org.openapitools.codegen.languages.features.SwaggerUIFeatures;
import org.openapitools.codegen.languages.features.UseGenericResponseFeatures;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.servers.Server;
import io.swagger.v3.parser.core.models.ParseOptions;
import static org.testng.Assert.*;
public class JavaJAXRSCXFExtServerCodegenTest {
@SuppressWarnings("unused")

32
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java
View File

@@ -1,18 +1,16 @@
package org.openapitools.codegen.java.jaxrs;
import io.swagger.v3.oas.models.Operation;
import org.junit.Before;
import org.junit.Test;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
/**
* Unit-Test for {@link org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen}.
*
@@ -22,7 +20,7 @@ public class JavaJAXRSSpecServerCodegenTest {
private JavaJAXRSSpecServerCodegen instance;
@Before
@BeforeMethod
public void before() {
instance = new JavaJAXRSSpecServerCodegen();
}
@@ -40,9 +38,9 @@ public class JavaJAXRSSpecServerCodegenTest {
instance.addOperationToGroup("Primaryresource", "/", operation, codegenOperation, operationList);
assertThat(operationList.size(), is(1));
assertThat(operationList.containsKey(""), is(true));
assertThat(codegenOperation.baseName, is("Primaryresource"));
Assert.assertEquals(operationList.size(), 1);
Assert.assertTrue(operationList.containsKey(""));
Assert.assertEquals(codegenOperation.baseName, "Primaryresource");
}
/**
@@ -58,9 +56,9 @@ public class JavaJAXRSSpecServerCodegenTest {
instance.addOperationToGroup("Primaryresource", "/{uuid}", operation, codegenOperation, operationList);
assertThat(operationList.size(), is(1));
assertThat(operationList.containsKey(""), is(true));
assertThat(codegenOperation.baseName, is("Primaryresource"));
Assert.assertEquals(operationList.size(), 1);
Assert.assertTrue(operationList.containsKey(""));
Assert.assertEquals(codegenOperation.baseName, "Primaryresource");
}
/**
@@ -77,9 +75,9 @@ public class JavaJAXRSSpecServerCodegenTest {
instance.addOperationToGroup("Default", "/subresource", operation, codegenOperation, operationList);
assertThat(codegenOperation.baseName, is("subresource"));
assertThat(operationList.size(), is(1));
assertThat(operationList.containsKey("subresource"), is(true));
Assert.assertEquals(codegenOperation.baseName, "subresource");
Assert.assertEquals(operationList.size(), 1);
Assert.assertTrue(operationList.containsKey("subresource"));
}
/**
@@ -88,7 +86,7 @@ public class JavaJAXRSSpecServerCodegenTest {
@Test
public void testToApiNameForSubresource() {
final String subresource = instance.toApiName("subresource");
assertThat(subresource, is("SubresourceApi"));
Assert.assertEquals(subresource, "SubresourceApi");
}
/**
@@ -103,6 +101,6 @@ public class JavaJAXRSSpecServerCodegenTest {
instance.addOperationToGroup("Primaryresource", "/", operation, codegenOperation, operationList);
final String subresource = instance.toApiName("");
assertThat(subresource, is("PrimaryresourceApi"));
Assert.assertEquals(subresource, "PrimaryresourceApi");
}
}

23
modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java
View File

@@ -21,16 +21,14 @@ import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Schema;
import org.apache.commons.io.FileUtils;
import org.junit.rules.TemporaryFolder;
import org.openapitools.codegen.*;
import org.openapitools.codegen.languages.RubyClientCodegen;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -44,21 +42,12 @@ import static org.testng.Assert.fail;
*/
public class RubyClientCodegenTest {
public TemporaryFolder folder = new TemporaryFolder();
@BeforeMethod
public void setUp() throws Exception {
folder.create();
}
@AfterMethod
public void tearDown() throws Exception {
folder.delete();
}
@Test
public void testGenerateRubyClientWithHtmlEntity() throws Exception {
final File output = folder.getRoot();
final File output = Files.createTempDirectory("test").toFile();
output.mkdirs();
output.deleteOnExit();
final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/pathWithHtmlEntity.yaml");
CodegenConfig codegenConfig = new RubyClientCodegen();
@@ -120,7 +109,9 @@ public class RubyClientCodegenTest {
@Test
public void testBooleanDefaultValue() throws Exception {
final File output = folder.getRoot();
final File output = Files.createTempDirectory("test").toFile();
output.mkdirs();
output.deleteOnExit();
final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/npe1.yaml");
CodegenConfig codegenConfig = new RubyClientCodegen();

4
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java
View File

@@ -1,8 +1,8 @@
package org.openapitools.codegen.typescript.fetch;
import org.junit.Assert;
import org.junit.Test;
import org.openapitools.codegen.languages.TypeScriptFetchClientCodegen;
import org.testng.Assert;
import org.testng.annotations.Test;
public class TypeScriptFetchClientCodegenTest {

10
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularClientCodegenTest.java
View File

@@ -1,15 +1,15 @@
package org.openapitools.codegen.typescript.typescriptangular;
import org.junit.Assert;
import org.junit.Test;
import org.openapitools.codegen.languages.TypeScriptAngularClientCodegen;
import org.openapitools.codegen.TestUtils;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import org.openapitools.codegen.CodegenOperation;
import io.swagger.v3.oas.models.PathItem;
import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.responses.ApiResponses;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.TypeScriptAngularClientCodegen;
import org.testng.Assert;
import org.testng.annotations.Test;
public class TypeScriptAngularClientCodegenTest {

4
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypescriptAngularApiVersionTest.java
View File

@@ -1,10 +1,10 @@
package org.openapitools.codegen.typescript.typescriptangular;
import io.swagger.v3.oas.models.OpenAPI;
import org.junit.Assert;
import org.junit.Test;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.TypeScriptAngularClientCodegen;
import org.testng.Assert;
import org.testng.annotations.Test;
public class TypescriptAngularApiVersionTest {

8
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeClientCodegenTest.java
View File

@@ -26,7 +26,7 @@ public class TypeScriptNodeClientCodegenTest {
codegen.additionalProperties().put("npmVersion", "1.0.0-SNAPSHOT");
codegen.processOpts();
org.junit.Assert.assertTrue(codegen.getNpmVersion().matches("^1.0.0-SNAPSHOT.[0-9]{12}$"));
Assert.assertTrue(codegen.getNpmVersion().matches("^1.0.0-SNAPSHOT.[0-9]{12}$"));
codegen = new TypeScriptNodeClientCodegen();
codegen.additionalProperties().put("npmName", "@openapi/typescript-angular-petstore");
@@ -34,7 +34,7 @@ public class TypeScriptNodeClientCodegenTest {
codegen.additionalProperties().put("npmVersion", "3.0.0-M1");
codegen.processOpts();
org.junit.Assert.assertTrue(codegen.getNpmVersion().matches("^3.0.0-M1-SNAPSHOT.[0-9]{12}$"));
Assert.assertTrue(codegen.getNpmVersion().matches("^3.0.0-M1-SNAPSHOT.[0-9]{12}$"));
}
@@ -46,7 +46,7 @@ public class TypeScriptNodeClientCodegenTest {
codegen.additionalProperties().put("npmVersion", "1.0.0-SNAPSHOT");
codegen.processOpts();
org.junit.Assert.assertTrue(codegen.getNpmVersion().matches("^1.0.0-SNAPSHOT$"));
Assert.assertTrue(codegen.getNpmVersion().matches("^1.0.0-SNAPSHOT$"));
codegen = new TypeScriptNodeClientCodegen();
codegen.additionalProperties().put("npmName", "@openapi/typescript-angular-petstore");
@@ -54,7 +54,7 @@ public class TypeScriptNodeClientCodegenTest {
codegen.additionalProperties().put("npmVersion", "3.0.0-M1");
codegen.processOpts();
org.junit.Assert.assertTrue(codegen.getNpmVersion().matches("^3.0.0-M1$"));
Assert.assertTrue(codegen.getNpmVersion().matches("^3.0.0-M1$"));
}

1125
modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/JsonCacheTest.java
View File

File diff suppressed because it is too large Load Diff

4
modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/StringUtilsTest.java
View File

@@ -3,9 +3,7 @@ package org.openapitools.codegen.utils;
import org.testng.Assert;
import org.testng.annotations.Test;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.dashize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
import static org.openapitools.codegen.utils.StringUtils.*;
public class StringUtilsTest {
// we'll assume that <i>underscore</i> (Twitter elephant bird) works fine