Merge pull request javaee-samples#362 from rhanus/master

arjantijms · web-flow · commit 94bbb872cf37 · 2016-10-06T00:18:57.000+02:00
cdi/vetoed uses Arquillian container test instead of WebServlet
diff --git a/cdi/vetoed/pom.xml b/cdi/vetoed/pom.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+
+<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.javaee7</groupId>
         <artifactId>cdi</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
-    <groupId>org.javaee7</groupId>
+
     <artifactId>cdi-vetoed</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>war</packaging>
     <name>Java EE 7 Sample: cdi - vetoed</name>
+
 </project>
diff --git a/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/TestServlet.java b/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/TestServlet.java
diff --git a/cdi/vetoed/src/test/java/org/javaee7/cdi/vetoed/GreetingTest.java b/cdi/vetoed/src/test/java/org/javaee7/cdi/vetoed/GreetingTest.java
@@ -1,4 +1,3 @@
-<!-- 
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
@@ -38,18 +37,44 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
--->
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
+package org.javaee7.cdi.vetoed;
 
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>CDI @Vetoed</title>
-    </head>
-    <body>
-        <h1>CDI @Vetoed</h1>
-        Invoke the <a href="${pageContext.request.contextPath}/TestServlet"/>Greeting Service</a>.
-    </body>
-</html>
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.inject.Inject;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertThat;
+
+/**
+ * @author Radim Hanus
+ */
+@RunWith(Arquillian.class)
+public class GreetingTest {
+	@Deployment
+	public static Archive<?> deploy() {
+		return ShrinkWrap.create(JavaArchive.class)
+				.addClasses(Greeting.class, SimpleGreeting.class, FancyGreeting.class)
+				.addAsManifestResource("beans.xml");
+	}
+
+	@Inject
+	private Greeting bean;
+
+	@Test
+	public void should_bean_be_injected() throws Exception {
+		assertThat(bean, is(notNullValue()));
+	}
+
+	@Test
+	public void should_bean_be_fancy() throws Exception {
+		// SimpleGreeting bean is vetoed
+		assertThat(bean, instanceOf(FancyGreeting.class));
+	}
+}
diff --git a/cdi/vetoed/src/test/resources/beans.xml b/cdi/vetoed/src/test/resources/beans.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
@@ -40,10 +40,9 @@
  * holder.
  */
 -->
-<beans
-    xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
-                      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+	   bean-discovery-mode="all">
+
 </beans>
