Permalink
Browse files

SEAMVALIDATE-24 testsuite update, AS7 profile

  • Loading branch information...
1 parent 5e3ab63 commit 79dbe1551672de335354ed174e4932d436fc977c @maschmid maschmid committed Oct 18, 2011
Showing with 442 additions and 107 deletions.
  1. +1 −0 api/pom.xml
  2. +1 −85 impl/pom.xml
  3. +0 −1 impl/src/test/resources/META-INF/services/org.jboss.solder.beanManager.BeanManagerProvider
  4. +1 −0 pom.xml
  5. +211 −0 testsuite/pom.xml
  6. +2 −2 ...ss/seam/validation → testsuite/src/test/java/org/jboss/seam/validation/test/common}/di/Model.java
  7. +2 −2 ...on → testsuite/src/test/java/org/jboss/seam/validation/test/common}/di/constraint/ValidHello.java
  8. +2 −2 ...suite/src/test/java/org/jboss/seam/validation/test/common}/di/constraint/ValidHelloValidator.java
  9. +1 −1 ... testsuite/src/test/java/org/jboss/seam/validation/test/common}/di/service/HelloWorldService.java
  10. +4 −4 ...estsuite/src/test/java/org/jboss/seam/validation/test/common}/method/CdiMethodValidationTest.java
  11. +1 −1 ...idation → testsuite/src/test/java/org/jboss/seam/validation/test/common}/method/domain/Movie.java
  12. +3 −3 ...estsuite/src/test/java/org/jboss/seam/validation/test/common}/method/service/MovieRepository.java
  13. +73 −0 testsuite/src/test/java/org/jboss/seam/validation/test/ee/BaseDeployment.java
  14. +97 −0 ...e/src/test/java/org/jboss/seam/validation/test/ee/di/InjectingConstraintValidatorFactoryTest.java
  15. +6 −5 .../src/test/java/org/jboss/seam/validation/test/se}/di/InjectingConstraintValidatorFactoryTest.java
  16. +1 −1 ...estsuite/src/test/java/org/jboss/seam/validation/test/se}/testutil/StaticBeanManagerProvider.java
  17. 0 {impl → testsuite}/src/test/resources/META-INF/beans.xml
  18. +1 −0 testsuite/src/test/resources/META-INF/services/org.jboss.solder.beanManager.BeanManagerProvider
  19. 0 {impl → testsuite}/src/test/resources/META-INF/validation.xml
  20. +35 −0 testsuite/src/test/resources/arquillian.xml
View
@@ -49,6 +49,7 @@
</dependencies>
<build>
+ <finalName>seam-validation-api</finalName>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
View
@@ -41,6 +41,7 @@
</description>
<build>
+ <finalName>seam-validation</finalName>
<plugins>
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
@@ -77,91 +78,6 @@
<artifactId>hibernate-validator</artifactId>
</dependency>
- <!-- ### Test dependencies ### -->
-
- <!-- Misc. -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Arquillian -->
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-weld-se-embedded-1.1</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- Weld -->
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.el</groupId>
- <artifactId>jboss-el-api_2.2_spec</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
- <profiles>
- <profile>
- <id>code-coverage</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.sonatype.maven.plugin</groupId>
- <artifactId>emma4it-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/</directory>
- <includes>
- <include>**/*.ec</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
@@ -1 +0,0 @@
-org.jboss.seam.validation.testutil.StaticBeanManagerProvider
View
@@ -45,6 +45,7 @@
<modules>
<module>api</module>
<module>impl</module>
+ <module>testsuite</module>
</modules>
<organization>
View
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ JBoss, Home of Professional Open Source
+
+ Copyright 2011, Red Hat, Inc., and individual contributors
+ by the @authors tag. See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<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/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.seam.validation</groupId>
+ <artifactId>seam-validation-parent</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>seam-validation-testsuite</artifactId>
+
+ <name>Seam Validation Module Test Suite</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>seam-validation</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Misc. -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Arquillian -->
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-api-maven</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+ </dependency>
+
+ <!-- Weld -->
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <systemProperties>
+ <arquillian.launch>${arquillian}</arquillian.launch>
+ <arquillian>${arquillian}</arquillian>
+ </systemProperties>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <trimStackTrace>false</trimStackTrace>
+ <printSummary>true</printSummary>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>weld-se-embedded-1.1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>arquillian</name>
+ <value>weld-se-embedded-1.1</value>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-weld-se-embedded-1.1</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <arquillian.launch>weld-se-embedded-1.1</arquillian.launch>
+ <arquillian>weld-se-embedded-1.1</arquillian>
+ </systemProperties>
+ <excludes>
+ <exclude>**/ee/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>jbossas-managed-7</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ <value>jbossas-managed-7</value>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.test</groupId>
+ <artifactId>jbossas-managed-7</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/se/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+</project>
@@ -17,11 +17,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.seam.validation.di;
+package org.jboss.seam.validation.test.common.di;
import javax.validation.constraints.Max;
-import org.jboss.seam.validation.di.constraint.ValidHello;
+import org.jboss.seam.validation.test.common.di.constraint.ValidHello;
/**
* An exemplary domain class for testing purposes.
@@ -17,7 +17,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.seam.validation.di.constraint;
+package org.jboss.seam.validation.test.common.di.constraint;
import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
import static java.lang.annotation.ElementType.CONSTRUCTOR;
@@ -47,7 +47,7 @@
@Retention(RUNTIME)
public @interface ValidHello {
- String message() default "{org.jboss.seam.validation.ValidHello.message}";
+ String message() default "{org.jboss.seam.validation.test.common.ValidHello.message}";
Class<?>[] groups() default {};
@@ -17,13 +17,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.seam.validation.di.constraint;
+package org.jboss.seam.validation.test.common.di.constraint;
import javax.inject.Inject;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
-import org.jboss.seam.validation.di.service.HelloWorldService;
+import org.jboss.seam.validation.test.common.di.service.HelloWorldService;
/**
* Validator for the {@link ValidHello} constraint. This validator is not portable between BV implementations, as it relies on
@@ -17,7 +17,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.seam.validation.di.service;
+package org.jboss.seam.validation.test.common.di.service;
import javax.enterprise.context.ApplicationScoped;
import javax.validation.constraints.NotNull;
Oops, something went wrong.

0 comments on commit 79dbe15

Please sign in to comment.