Merge pull request #1204 from iushankin/issue-1203

Fixed #1203: Migrate tests from the Scala to the plain Java

Author: Ole Lensmar

modules/swagger-core/pom.xml

@@ -143,6 +143,11 @@
             <artifactId>validation-api</artifactId>
             <version>${validation-api-version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <!-- TODO increase coverage -->

modules/swagger-core/src/test/java/io/swagger/BeanValidatorTestNG.java

@@ -0,0 +1,37 @@
+package io.swagger;
+
+import io.swagger.converter.ModelConverters;
+import io.swagger.models.Model;
+import io.swagger.models.properties.DoubleProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.StringProperty;
+import models.BeanValidationsModel;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+public class BeanValidatorTestNG extends Assert {
+
+    @Test(testName = "read bean validations")
+    public void readBeanValidatorTest() {
+        final Map<String, Model> schemas = ModelConverters.getInstance().readAll(BeanValidationsModel.class);
+        final Model model = schemas.get("BeanValidationsModel");
+        final Map<String, Property> properties = model.getProperties();
+
+        final IntegerProperty age = (IntegerProperty) properties.get("age");
+        assertEquals(age.getMinimum(), 13.0);
+        assertEquals(age.getMaximum(), 99.0);
+
+        final StringProperty password = (StringProperty) properties.get("password");
+        assertEquals((int) password.getMinLength(), 6);
+        assertEquals((int) password.getMaxLength(), 20);
+
+        final DoubleProperty minBalance = (DoubleProperty) properties.get("minBalance");
+        assertTrue(minBalance.getExclusiveMinimum());
+
+        final DoubleProperty maxBalance = (DoubleProperty) properties.get("maxBalance");
+        assertTrue(maxBalance.getExclusiveMaximum());
+    }
+}

modules/swagger-hibernate-validations/pom.xml

@@ -97,6 +97,11 @@
             <version>${scala-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <hibernate-validator-version>5.1.3.Final</hibernate-validator-version>

modules/swagger-jaxrs/pom.xml

@@ -121,6 +121,11 @@
             <version>${scala-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <coverage.complexity.minimum>0.29</coverage.complexity.minimum>

modules/swagger-jersey2-jaxrs/pom.xml

@@ -91,6 +91,11 @@
             <artifactId>jersey-media-multipart</artifactId>
             <version>${jersey2-version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <!-- TODO increase coverage and remove these overrides-->

pom.xml

@@ -47,7 +47,6 @@
     <build>
         <sourceDirectory>src/main/scala</sourceDirectory>
         <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
-        <testSourceDirectory>src/test/scala</testSourceDirectory>
         <outputDirectory>target/classes</outputDirectory>
         <testOutputDirectory>target/test-classes</testOutputDirectory>
         <resources>
@@ -131,6 +130,38 @@
                     </launchers>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire-version}</version>
+                <configuration>
+                    <testNGArtifactName>none:none</testNGArtifactName>
+                    <reportsDirectory>${project.build.directory}/surefire-reports/scala</reportsDirectory>
+                    <excludes>
+                        <exclude>**/*TestNG.java</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>test-testng</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <junitArtifactName>none:none</junitArtifactName>
+                            <testNGArtifactName>org.testng:testng</testNGArtifactName>
+                            <reportsDirectory>${project.build.directory}/surefire-reports/java</reportsDirectory>
+                            <includes>
+                                <include>**/*TestNG.java</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/*Test.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -468,6 +499,12 @@
                 <version>${junit-version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>${testng-version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
@@ -517,6 +554,8 @@
         <logback-version>1.0.1</logback-version>
 
         <junit-version>4.8.2</junit-version>
+        <testng-version>6.9.4</testng-version>
+        <surefire-version>2.18.1</surefire-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <commons-lang-version>3.2.1</commons-lang-version>
         <slf4j-version>1.6.3</slf4j-version>