[webbeans-commits] Webbeans SVN: r1442 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-07 06:50:16 -0500 (Sat, 07 Feb 2009)
New Revision: 1442
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java
Log:
fix build
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java 2009-02-07 09:02:30 UTC (rev 1441)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java 2009-02-07 11:50:16 UTC (rev 1442)
@@ -16,6 +16,7 @@
import org.jboss.webbeans.tck.impl.packaging.ArtifactScanner;
import org.jboss.webbeans.tck.impl.packaging.DeclarativeArtifactProcessor;
import org.jboss.webbeans.tck.spi.Containers;
+import org.testng.ITestContext;
public class InContainerTestRunner
@@ -138,4 +139,9 @@
}
}
+ private void mergeInTestReports(ITestContext context)
+ {
+
+ }
+
}
17 years, 2 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1441 - doc/trunk/reference/de-DE.
by webbeans-commits＠lists.jboss.org
Author: jdimanos
Date: 2009-02-07 04:02:30 -0500 (Sat, 07 Feb 2009)
New Revision: 1441
Modified:
doc/trunk/reference/de-DE/ee.po
Log:
update
Modified: doc/trunk/reference/de-DE/ee.po
===================================================================
--- doc/trunk/reference/de-DE/ee.po 2009-02-07 04:36:44 UTC (rev 1440)
+++ doc/trunk/reference/de-DE/ee.po 2009-02-07 09:02:30 UTC (rev 1441)
@@ -7,7 +7,7 @@
"Project-Id-Version: ee\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-10 14:18+0000\n"
-"PO-Revision-Date: 2009-01-24 15:24+1100\n"
+"PO-Revision-Date: 2009-02-07 20:02+1100\n"
"Last-Translator: \n"
"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
#: ee.xml:4
#, no-c-format
msgid "Java EE integration"
-msgstr ""
+msgstr "Java EE Integration"
#. Tag: para
#: ee.xml:6
@@ -31,12 +31,14 @@
"into some objects, such as Servlets and Message-Driven Beans, which are not "
"Web Beans."
msgstr ""
+"Web Beans sind voll in die Java EE Umgebung integriert. Web Beans besitzen Zugriff auf Java EE Resourcen und JPA Persistenzkontexte. Sie können in Unified EL Ausdrücken in JSF- und JSP-Seiten verwendet werden. Sie können sogar in einige Objekte eingespeist werden, etwa Servlets and Message-Driven Beans, die keine "
+"Web Beans sind."
#. Tag: title
#: ee.xml:12
#, no-c-format
msgid "Injecting Java EE resources into a Web Bean"
-msgstr ""
+msgstr "Einspeisung von Java EE Ressourcen in ein Web Bean"
#. Tag: para
#: ee.xml:14
@@ -47,6 +49,8 @@
"<literal>@PersistenceContext</literal>. We've already seen a couple of "
"examples of this, though we didn't pay much attention at the time:"
msgstr ""
+"Alle einfachen wie auch Enterprise Web Beans können die Java EE \"Dependency\"-Einspeisung mittels <literal>@Resource</literal>, <literal>@EJB</literal> und "
+"<literal>@PersistenceContext</literal> verwenden. Wir haben bereits einige Beispiele hierfür gesehen, obwohl wir diesen zum damaligen Zeitpunkt nicht viel Beachtung geschenkt haben:"
#. Tag: programlisting
#: ee.xml:19
@@ -105,6 +109,10 @@
"Beans. The <literal>@PostConstruct</literal> method is called after "
"<emphasis>all</emphasis> injection has been performed."
msgstr ""
+"Die Java EE <literal>@PostConstruct</literal> und <literal>@PreDestroy</"
+"literal> Callbacks werden ebenfalls für alle einfachen wie auch Enterprise Web "
+"Beans unterstützt. Die <literal>@PostConstruct</literal>-Methode wird nach Durchführung "
+"<emphasis>aller</emphasis> Einspeisungen aufgerufen."
#. Tag: para
#: ee.xml:28
@@ -113,12 +121,14 @@
"There is one restriction to be aware of here: <literal>@PersistenceContext"
"(type=EXTENDED)</literal> is not supported for simple Web Beans."
msgstr ""
+"Es gilt eine Einschränkung hier: <literal>@PersistenceContext"
+"(type=EXTENDED)</literal> wird nicht für einfache Web Beans unterstützt."
#. Tag: title
#: ee.xml:35
#, no-c-format
msgid "Calling a Web Bean from a Servlet"
-msgstr ""
+msgstr "Aufruf eines Web Bean von einem Servlet"
#. Tag: para
#: ee.xml:37
@@ -127,6 +137,8 @@
"It's easy to use a Web Bean from a Servlet in Java EE 6. Simply inject the "
"Web Bean using Web Beans field or initializer method injection."
msgstr ""
+"In Java EE 6 ist die Verwendung eines Web Beans von einem Servlet ganz einfach. Speisen Sie einfach das "
+"Web Bean mittels Web Beans Field oder Initialisierungsmethodeneinspeisung (sog. \"Initializer Method Injection\") ein."
#. Tag: programlisting
#: ee.xml:40
@@ -183,13 +195,13 @@
"The Web Beans client proxy takes care of routing method invocations from the "
"Servlet to the correct instances of <literal>Credentials</literal> and "
"<literal>Login</literal> for the current request and HTTP session."
-msgstr ""
+msgstr "Der Web Beans Client Proxy kümmert sich um Aufrufe der Routing-Methode vom Servlet, um die Instanzen von <literal>Credentials</literal> und <literal>Login</literal> für die aktuelle Anfrage und HTTP-Session zu korrigieren."
#. Tag: title
#: ee.xml:49
#, no-c-format
msgid "Calling a Web Bean from a Message-Driven Bean"
-msgstr ""
+msgstr "Aufruf eines Web Beans von einem Message-Driven Bean"
#. Tag: para
#: ee.xml:51
@@ -200,13 +212,13 @@
"lookup, or injection using <literal>@EJB</literal>, for example. In "
"particular, you can use Web Beans injection in Message-Driven Beans, which "
"are not considered Web Beans because you can't inject them."
-msgstr ""
+msgstr "Einspeisung von Web Beans gilt für alle EJBs, selbst wenn sie nicht der Steuerung des Web Bean Manager s unterliegen (wenn sie etwa durch direkten JNDI-Lookup oder Einspeisung mittels <literal>@EJB</literal> erworben wurden). Insbesondere Web Beans Einspeisung in Message-Driven Beans, die nicht als Web Beans angesehen werden, da sie nicht eingespeist werden können."
#. Tag: para
#: ee.xml:57
#, no-c-format
msgid "You can even use Web Beans interceptor bindings for Message-Driven Beans."
-msgstr ""
+msgstr "Sie können sogar Web Beans Interzeptor-Bindings für Message-Driven Beans."
#. Tag: programlisting
#: ee.xml:59
@@ -245,18 +257,20 @@
"message is delivered to a Message-Driven Bean. Only <literal>@RequestScoped</"
"literal> and <literal>@ApplicationScoped</literal> Web Beans are available."
msgstr ""
+"Daher ist der Empfang von Nachrichten in einer Web Beans Umgebung sehr einfach. Seien Sie sich aber dessen bewusst, dass bei Lieferung einer Nachricht an ein Message-Driven Bean keine Session oder Konversationskontext verfügbar ist. Es sind nur <literal>@RequestScoped</"
+"literal> und <literal>@ApplicationScoped</literal> Web Beans verfügbar."
#. Tag: para
#: ee.xml:66
#, no-c-format
msgid "It's also easy to send messages using Web Beans."
-msgstr ""
+msgstr "Es ist ebenfalls ganz einfach mittels Web Beans Nachrichten zu versenden."
#. Tag: title
#: ee.xml:71
#, no-c-format
msgid "JMS endpoints"
-msgstr ""
+msgstr "JMS Endpunkte"
#. Tag: para
#: ee.xml:73
@@ -272,6 +286,13 @@
"literal>. Each of these objects has its own lifecycle and threading model "
"that we need to worry about."
msgstr ""
+"Das Versenden von Nachrichten unter Verwendung von JMS kann aufgrund der Anzahl verschiedener Objekte mit denen Sie zu tun haben recht komplex sein. Für Warteschlangen haben wir <literal>Queue</"
+"literal>, <literal>QueueConnectionFactory</literal>, "
+"<literal>QueueConnection</literal>, <literal>QueueSession</literal> und "
+"<literal>QueueSender</literal>. Für Topics haben wir <literal>Topic</literal>, "
+"<literal>TopicConnectionFactory</literal>, <literal>TopicConnection</"
+"literal>, <literal>TopicSession</literal> und <literal>TopicPublisher</"
+"literal>. Jedes dieser Objekte besitzt einen eigenen Lebenszyklus und ein eigenes Threading-Modell, das unsere Aufmerksamkeit erfordert."
#. Tag: para
#: ee.xml:82
17 years, 2 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1440 - doc/trunk/reference/de-DE.
by webbeans-commits＠lists.jboss.org
Author: jdimanos
Date: 2009-02-06 23:36:44 -0500 (Fri, 06 Feb 2009)
New Revision: 1440
Modified:
doc/trunk/reference/de-DE/part3.po
Log:
update
Modified: doc/trunk/reference/de-DE/part3.po
===================================================================
--- doc/trunk/reference/de-DE/part3.po 2009-02-07 03:59:23 UTC (rev 1439)
+++ doc/trunk/reference/de-DE/part3.po 2009-02-07 04:36:44 UTC (rev 1440)
@@ -7,7 +7,7 @@
"Project-Id-Version: part3\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-10 14:18+0000\n"
-"PO-Revision-Date: 2009-01-24 15:30+1100\n"
+"PO-Revision-Date: 2009-02-07 15:34+1100\n"
"Last-Translator: \n"
"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -24,6 +24,9 @@
"Bean, and the information about event consumers for an event producer, is "
"contained in typesafe Java constructs that may be validated by the compiler."
msgstr ""
+"Das zweite wichtige Thema von Web Beans ist <emphasis>starke Typisierung</emphasis> (sog. \"strong Typing\"). "
+"Die Informationen zu Abhängigkeiten, Interzeptoren und Dekoratoren eines Web "
+"Beans und die Informationen zu Ereigniskonsumenten (Event Consumers) für einen Ereignis-Producer sind in typensicheren Java-Konstrukten enthalten, die vom Kompilierer (Compiler) validiert werden können."
#. Tag: para
#: part3.xml:10
@@ -33,7 +36,7 @@
"framework is hiding them from you using clever defaulting rules — so-"
"called \"configuration by convention\" — but because there are simply no "
"strings there to begin with!"
-msgstr ""
+msgstr "Sie sehen keine String-basierten Bezeichner in Web Beans Code; dies ist nicht der Fall weil das Framework diese unter Verwendung irgendwelcher Defaulting-Regeln — vor Ihnen verbirgt; sogenannte \"Konfiguration nach Konvention\" — sondern weil einfach keine Strings existieren!"
#. Tag: para
#: part3.xml:15
@@ -46,6 +49,9 @@
"interceptors via annotations instead of names, you have an opportunity to "
"lift the semantic level of your code."
msgstr ""
+"Der offensichtliche Vorteil dieser Vorgehensweise ist, dass <emphasis>jede</emphasis> IDE "
+"Auto-Completion, Validierung und Refaktorierung ohne die Notwendigkeit spezieller Tools bereitstellen kann. Es existiert jedoch noch ein weiterer, nicht sofort ersichtlicher Vorteil. "
+"Es stellt sich nämlich heraus, dass Sie - wenn Sie über die Identifizierung von Objekten, Ereignissen oder Interzeptoren via Annotationen statt Namen nachdenken - Sie Gelegenheit haben, die semantische Ebene Ihres Code anzuheben."
#. Tag: para
#: part3.xml:21
@@ -53,7 +59,7 @@
msgid ""
"Web Beans encourages you develop annotations that model concepts, for "
"example,"
-msgstr ""
+msgstr "Web Beans soll dazu ermutigen Annotationen zu entwickeln, die Konzepte formen, etwa "
#. Tag: para
#: part3.xml:26
@@ -83,7 +89,7 @@
#: part3.xml:39
#, no-c-format
msgid "instead of using compound names like"
-msgstr ""
+msgstr "statt Namen wie Assoziationsbegriffe wie "
#. Tag: para
#: part3.xml:43
@@ -107,7 +113,7 @@
#: part3.xml:52
#, no-c-format
msgid "<literal>DocumentUpdatedEvent</literal>."
-msgstr "<literal>DocumentUpdatedEvent</literal>."
+msgstr "<literal>DocumentUpdatedEvent</literal> zu verwenden."
#. Tag: para
#: part3.xml:56
@@ -117,7 +123,7 @@
"disparate parts of the system. They help us categorize and understand our "
"code. They help us deal with common concerns in a common way. They make our "
"code more literate and more understandable."
-msgstr ""
+msgstr "Die Annotationen sind wiederverwendbar. Sie helfen bei der Beschreibung gängiger Eigenschaften verschiedener Teile des Systems. Sie helfen uns bei der Kategorisierung und dem Verständnis unseres Codes. Sie helfen uns dabei auf gängige Weise mit gängigen Problemen umzugehen. Sie machen unseren Code leichter lesbar und einfacher zu verstehen."
#. Tag: para
#: part3.xml:61
@@ -128,7 +134,7 @@
"architecture. It encapsulates various properties of the role, including "
"scope, interceptor bindings, deployment type, etc, into a single reusable "
"package."
-msgstr ""
+msgstr "Web Beans <emphasis>Stereotypen</emphasis> erweitern diese Idee um einen Schritt. Ein Stereotyp formt eine gängige <emphasis>Rolle</emphasis> in Ihrer Anwendungsarchitektur. Es enthält verschiedene Eigenschaften der Rolle, einschließlich deren Geltungsbereich, Interzeptorbindungen, Deployment-Typ usw. in einem einzelnen, wiederverwendbaren Paket."
#. Tag: para
#: part3.xml:66
@@ -139,6 +145,8 @@
"attributes that appear in XML. This approach turns out to make the XML more "
"literate, just like annotations made our Java code more literate."
msgstr ""
+"Sogar Web Beans XML Metadaten sind stark typisiert! Es gibt keinen Kompilierer für XML, "
+"daher nutzen Web Beans XML-Schemas zur Validierung der in XML vorkommenden Java-Typen und Attribute. Diese Vorgehensweise führt zur besseren Lesbarkeit der XML, ebenso wie Annotationen unseren Java Code einfacher lesbar machten."
#. Tag: para
#: part3.xml:71
@@ -149,5 +157,5 @@
"more understandable. Most of the time you don't ever really <emphasis>need</"
"emphasis> to use these features, but if you use them wisely, you'll come to "
"appreciate their power."
-msgstr ""
+msgstr "Wir können jetzt einige fortgeschrittenere Features von Web Beans kennenlernen. Vergessen Sie nicht, dass diese Features unseren Code sowohl einfacher zu validieren als auch leserlicher machen sollen. Meist werden Sie diese Features nicht verwenden <emphasis>müssen</emphasis>, wenn Sie dies aber auf kluge Weise tun, so werden Sie deren Vorteile schnell zu schätzen wissen."
17 years, 2 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1439 - doc/trunk/reference/de-DE.
by webbeans-commits＠lists.jboss.org
Author: jdimanos
Date: 2009-02-06 22:59:23 -0500 (Fri, 06 Feb 2009)
New Revision: 1439
Modified:
doc/trunk/reference/de-DE/master.po
Log:
update
Modified: doc/trunk/reference/de-DE/master.po
===================================================================
--- doc/trunk/reference/de-DE/master.po 2009-02-07 03:55:45 UTC (rev 1438)
+++ doc/trunk/reference/de-DE/master.po 2009-02-07 03:59:23 UTC (rev 1439)
@@ -7,7 +7,7 @@
"Project-Id-Version: master\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-02-01 21:16+0000\n"
-"PO-Revision-Date: 2009-01-24 15:28+1100\n"
+"PO-Revision-Date: 2009-02-07 14:59+1100\n"
"Last-Translator: \n"
"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
#: master.xml:10
#, no-c-format
msgid "Note"
-msgstr ""
+msgstr "Hinweis"
#. Tag: para
#: master.xml:11
@@ -32,6 +32,10 @@
"nomenclature, including the new name for the JSR-299 Reference "
"Implementation - \"Web Beans\"."
msgstr ""
+"Der Name von JSR-299 wurde vor kurzem von \"Web Beans\" zu \"Java Kontexte "
+"und Dependency-Einspeisung\" geändert. Dieses Handbuch bezieht sich nach wie vor auf JSR-299 als "
+"\"Web Beans\" und die JSR-299 Referenzimplementierung als \"Web Beans RI"
+"\". Andere Dokumentation wie Blogs, Postings in Foren usw. verwenden möglicherweise bereits die neue Namensgebung, darunter den neuen Namen für die JSR-299 Referenzimplementierung - \"Web Beans\"."
#. Tag: title
#: master.xml:24
@@ -56,3 +60,4 @@
#, no-c-format
msgid "Web Beans and the Java EE ecosystem"
msgstr "Web Beans und das Java EE-Ökosystem"
+
17 years, 2 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1438 - doc/trunk/reference/de-DE.
by webbeans-commits＠lists.jboss.org
Author: jdimanos
Date: 2009-02-06 22:55:45 -0500 (Fri, 06 Feb 2009)
New Revision: 1438
Modified:
doc/trunk/reference/de-DE/Book_Info.po
Log:
update
Modified: doc/trunk/reference/de-DE/Book_Info.po
===================================================================
--- doc/trunk/reference/de-DE/Book_Info.po 2009-02-07 03:54:34 UTC (rev 1437)
+++ doc/trunk/reference/de-DE/Book_Info.po 2009-02-07 03:55:45 UTC (rev 1438)
@@ -7,7 +7,7 @@
"Project-Id-Version: Book_Info\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-02-01 21:16+0000\n"
-"PO-Revision-Date: 2009-01-28 06:53+1100\n"
+"PO-Revision-Date: 2009-02-07 14:55+1100\n"
"Last-Translator: \n"
"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -19,16 +19,13 @@
#: Book_Info.xml:4
#, no-c-format
msgid "Web Beans: Java Contexts and Dependency Injection"
-msgstr ""
+msgstr "Web Beans: Java Kontexte und \"Dependency\"-Einspeisung"
#. Tag: subtitle
#: Book_Info.xml:5
-#, fuzzy, no-c-format
-msgid ""
-"The new standard for dependency injection and contextual state management"
+#, no-c-format
+msgid "The new standard for dependency injection and contextual state management"
msgstr ""
-"Der neue Java Standard für \"Dependency-Injection\" und kontextuellem Status-"
+"Der neue Java Standard für \"Dependency\"-Einspeisung und kontextuelles Status-"
"Management"
-#~ msgid "Introduction to Web Beans"
-#~ msgstr "Einführung in Web Beans"
17 years, 2 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1437 - doc/trunk/reference/de-DE.
by webbeans-commits＠lists.jboss.org
Author: jdimanos
Date: 2009-02-06 22:54:34 -0500 (Fri, 06 Feb 2009)
New Revision: 1437
Modified:
doc/trunk/reference/de-DE/Author_Group.po
Log:
update
Modified: doc/trunk/reference/de-DE/Author_Group.po
===================================================================
--- doc/trunk/reference/de-DE/Author_Group.po 2009-02-07 00:17:04 UTC (rev 1436)
+++ doc/trunk/reference/de-DE/Author_Group.po 2009-02-07 03:54:34 UTC (rev 1437)
@@ -7,7 +7,7 @@
"Project-Id-Version: Author_Group\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-02-01 21:16+0000\n"
-"PO-Revision-Date: 2009-01-28 06:56+1100\n"
+"PO-Revision-Date: 2009-02-07 14:52+1100\n"
"Last-Translator: \n"
"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@
#. Tag: affiliation
#: Author_Group.xml:7
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"<jobtitle>JSR-299 specification lead</jobtitle> <orgname>Red Hat Middleware "
"LLC</orgname>"
msgstr ""
-"<jobtitle>Web Beans (JSR-299) Spezifikations-Lead</jobtitle> <orgname>Red "
+"<jobtitle>JSR-299 Spezifikations-Lead</jobtitle> <orgname>Red "
"Hat Middleware LLC</orgname>"
#. Tag: author
@@ -39,12 +39,12 @@
#. Tag: affiliation
#: Author_Group.xml:15
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"<jobtitle>Web Beans (JSR-299 Reference Implementation) lead </jobtitle> "
"<orgname>Red Hat Middleware LLC</orgname>"
msgstr ""
-"<jobtitle>Web Beans (JSR-299) Referenz Implementations-Lead </jobtitle> "
+"<jobtitle>Web Beans (JSR-299 Referenz Implementation)-Lead </jobtitle> "
"<orgname>Red Hat Middleware LLC</orgname>"
#. Tag: othercredit
@@ -61,48 +61,49 @@
#. Tag: othercredit
#: Author_Group.xml:26
-#, fuzzy, no-c-format
+#, no-c-format
msgid "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+msgstr "<firstname>Gladys</firstname> <surname>Guerrero</surname>"
#. Tag: contrib
#: Author_Group.xml:29
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Spanish Translation"
-msgstr "Italienische Übersetzung"
+msgstr "Spanische Übersetzung"
#. Tag: orgname
#: Author_Group.xml:31 Author_Group.xml:39 Author_Group.xml:47
#, no-c-format
msgid "Red Hat Middleware LLC"
-msgstr ""
+msgstr "Red Hat Middleware LLC"
#. Tag: othercredit
#: Author_Group.xml:34
-#, fuzzy, no-c-format
+#, no-c-format
msgid "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
-msgstr "<firstname>Gavin</firstname> <surname>King</surname>"
+msgstr "<firstname>Eun-Ju</firstname> <surname>Ki,</surname>"
#. Tag: contrib
#: Author_Group.xml:37
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Korean Translation"
-msgstr "Italienische Übersetzung"
+msgstr "Koreanische Übersetzung"
#. Tag: othercredit
#: Author_Group.xml:42
-#, fuzzy, no-c-format
+#, no-c-format
msgid "<firstname>Terry</firstname> <surname>Chuang</surname>"
-msgstr "<firstname>Pete</firstname> <surname>Muir</surname>"
+msgstr "<firstname>Terry</firstname> <surname>Chuang</surname>"
#. Tag: contrib
#: Author_Group.xml:45
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Traditional Chinese Translation"
-msgstr "Italienische Übersetzung"
+msgstr "Chinesische Übersetzung (traditionell)"
#. Tag: othercredit
#: Author_Group.xml:50
#, no-c-format
msgid "<firstname>Francesco</firstname> <surname>Milesi</surname>"
msgstr "<firstname>Francesco</firstname> <surname>Milesi</surname>"
+
17 years, 2 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1436 - in tck/trunk: api/src/main/java/org/jboss/webbeans/tck/spi and 9 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-06 19:17:04 -0500 (Fri, 06 Feb 2009)
New Revision: 1436
Modified:
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TestSuite.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/Managers.java
tck/trunk/impl/pom.xml
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/ArtifactDescriptor.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/DeclarativeArtifactProcessor.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WarArtifactDescriptor.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/runner/servlet/ServletTestRunner.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java
Log:
fixes for in container tests
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TestSuite.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TestSuite.java 2009-02-07 00:16:25 UTC (rev 1435)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TestSuite.java 2009-02-07 00:17:04 UTC (rev 1436)
@@ -9,6 +9,7 @@
private boolean standalone = true;
private int deploymentDelay = 5000;
private boolean writeDeployedArchivesToDisk;
+ public String libraryDirectory;
public TestSuite()
{
@@ -55,4 +56,14 @@
this.writeDeployedArchivesToDisk = writeDeployedArchivesToDisk;
}
+ public String getLibraryDirectory()
+ {
+ return libraryDirectory;
+ }
+
+ public void setLibraryDirectory(String libraryDir)
+ {
+ this.libraryDirectory = libraryDir;
+ }
+
}
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/Managers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/Managers.java 2009-02-07 00:16:25 UTC (rev 1435)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/Managers.java 2009-02-07 00:17:04 UTC (rev 1436)
@@ -23,19 +23,14 @@
*
* @return the Manager
*/
- Manager createManager(List<Class<? extends Annotation>> enabledDeploymentTypes);
+ Manager getManager();
/**
- * Get a new Manager instance
- *
- * @return the Manager
- */
- Manager createManager();
-
- /**
* Returns a list of the enabled deployment types for the current manager
*
* @return
*/
List<Class<? extends Annotation>> getEnabledDeploymentTypes();
+
+ public void setEnabledDeploymentTypes(List<Class<? extends Annotation>> enabledDeploymentTypes);
}
Modified: tck/trunk/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml 2009-02-07 00:16:25 UTC (rev 1435)
+++ tck/trunk/impl/pom.xml 2009-02-07 00:17:04 UTC (rev 1436)
@@ -209,6 +209,7 @@
<java classname="org.jboss.webbeans.tck.impl.InContainerTestRunner" classpathref="maven.compile.classpath" failonerror="true" fork="true">
<jvmarg line="-DcreateArtifacts=true"/>
<jvmarg line="-DoutputDirectory=${project.build.directory}/jsr-299-artifacts" />
+ <jvmarg line="-DlibraryDirectory=${libraryDirectory}" />
</java>
<echo>Dumped artifacts to ${project.build.directory}/jsr-299-artifacts</echo>
</tasks>
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-02-07 00:16:25 UTC (rev 1435)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-02-07 00:17:04 UTC (rev 1436)
@@ -77,13 +77,14 @@
@BeforeMethod
public final void before(Method testMethod)
{
+ manager = configuration().getManagers().getManager();
if (getEnabledDeploymentTypes().size() > 0)
{
- manager = configuration().getManagers().createManager(getEnabledDeploymentTypes());
+ configuration().getManagers().setEnabledDeploymentTypes(getEnabledDeploymentTypes());
}
else
{
- manager = configuration().getManagers().createManager();
+
}
containers = (StandaloneContainers) configuration().getContainers();
if (configuration().getTestSuite().isStandalone())
@@ -91,7 +92,7 @@
Class<?> declaringClass = testMethod.getDeclaringClass();
if (declaringClass.isAnnotationPresent(Artifact.class) || declaringClass.isAnnotationPresent(EjbArtifact.class))
{
- DeclarativeArtifactProcessor processor = new DeclarativeArtifactProcessor(declaringClass, true);
+ DeclarativeArtifactProcessor processor = new DeclarativeArtifactProcessor(declaringClass, true, null);
ArtifactDescriptor artifact = processor.getArtifact();
Set<Class<?>> classes = artifact.getClasses();
if (getEnabledDeploymentTypes().size() > 0)
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java 2009-02-07 00:16:25 UTC (rev 1435)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java 2009-02-07 00:17:04 UTC (rev 1436)
@@ -21,7 +21,7 @@
public class InContainerTestRunner
{
- private static final Logger log = Logger.getLogger(ArtifactScanner.class);
+ private static final Logger log = Logger.getLogger(InContainerTestRunner.class);
private final TestSuite testSuite;
private final Containers containers;
@@ -48,6 +48,10 @@
{
testSuite.setOutputDirectory(System.getProperty("outputDirectory"));
}
+ if (System.getProperty("libraryDirectory") != null)
+ {
+ testSuite.setLibraryDirectory(System.getProperty("libraryDirectory"));
+ }
testSuite.setStandalone(false);
testSuite.setWriteDeployedArchivesToDisk(true);
InContainerTestRunner runner = new InContainerTestRunner(testSuite, null);
@@ -77,7 +81,7 @@
List<ArtifactDescriptor> artifacts = new ArrayList<ArtifactDescriptor>();
for (Class<?> clazz : classes)
{
- artifacts.add(new DeclarativeArtifactProcessor(clazz, testSuite.isStandalone()).getArtifact());
+ artifacts.add(new DeclarativeArtifactProcessor(clazz, testSuite.isStandalone(), testSuite.getLibraryDirectory()).getArtifact());
}
return artifacts;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/ArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/ArtifactDescriptor.java 2009-02-07 00:16:25 UTC (rev 1435)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/ArtifactDescriptor.java 2009-02-07 00:17:04 UTC (rev 1436)
@@ -17,7 +17,6 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLDecoder;
-import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Random;
@@ -206,6 +205,7 @@
private final Set<Class<?>> classes;
private final Set<ResourceDescriptor> resources;
+ private final Set<ResourceDescriptor> libraries;
private final Class<?> declaringClass;
// Cache
@@ -219,6 +219,7 @@
classes = new HashSet<Class<?>>();
resources = new HashSet<ResourceDescriptor>();
this.declaringClass = declaringClass;
+ this.libraries = new HashSet<ResourceDescriptor>();
}
public InputStream getJar() throws IOException
@@ -416,7 +417,7 @@
public Set<ResourceDescriptor> getLibraries()
{
- return Collections.emptySet();
+ return libraries;
}
public File getLibraryRoot(File archiveRoot)
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/DeclarativeArtifactProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/DeclarativeArtifactProcessor.java 2009-02-07 00:16:25 UTC (rev 1435)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/DeclarativeArtifactProcessor.java 2009-02-07 00:17:04 UTC (rev 1436)
@@ -4,12 +4,19 @@
import static org.jboss.webbeans.tck.impl.packaging.PackagingType.UNSPECIFIED;
import static org.jboss.webbeans.tck.impl.packaging.PackagingType.WAR;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FilenameFilter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
+import org.apache.log4j.Logger;
import org.jboss.webbeans.tck.impl.packaging.jsr299.BeansXml;
import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
import org.jboss.webbeans.tck.impl.packaging.war.WarArtifactDescriptor;
@@ -17,6 +24,8 @@
public class DeclarativeArtifactProcessor
{
+ private static final Logger log = Logger.getLogger(DeclarativeArtifactProcessor.class);
+
private final boolean unit;
private final boolean ejbs;
private final boolean addDeclaringPackage;
@@ -24,11 +33,12 @@
private final PackagingType packagingType;
private final Collection<ResourceDescriptor> resources;
private final Collection<Class<?>> classes;
+ private final Set<ResourceDescriptor> extraLibraries;
private final Class<?> declaringClass;
private final boolean standalone;
- public DeclarativeArtifactProcessor(Class<?> declaringClass, boolean standalone)
+ public DeclarativeArtifactProcessor(Class<?> declaringClass, boolean standalone, String extraLibrariesDirectory)
{
this.standalone = standalone;
this.declaringClass = declaringClass;
@@ -97,6 +107,37 @@
{
this.classes = Collections.emptyList();
}
+ if (extraLibrariesDirectory != null)
+ {
+ File directory = new File(extraLibrariesDirectory);
+ this.extraLibraries = new HashSet<ResourceDescriptor>();
+ if (directory.isDirectory())
+ {
+ for (File file : directory.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".jar");
+ }
+
+ }))
+ {
+ try
+ {
+ this.extraLibraries.add(new ResourceDescriptor(file.getName(), new FileInputStream(file)));
+ }
+ catch (FileNotFoundException e)
+ {
+ log.warn("Unable to load extra library", e);
+ }
+ }
+ }
+ }
+ else
+ {
+ this.extraLibraries = Collections.emptySet();
+ }
}
public TCKArtifactDescriptor getArtifact()
@@ -131,6 +172,7 @@
artifact.setUnit(unit);
artifact.getClasses().addAll(classes);
artifact.getResources().addAll(resources);
+ artifact.getLibraries().addAll(extraLibraries);
return artifact;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-07 00:16:25 UTC (rev 1435)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-07 00:17:04 UTC (rev 1436)
@@ -2,13 +2,12 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.Writer;
-import java.util.HashSet;
-import java.util.Set;
import org.apache.log4j.Logger;
import org.jboss.webbeans.tck.AbstractTest;
@@ -32,6 +31,8 @@
try
{
descriptor.writeArtifactToDisk(tmpdir, "tck-support");
+ File file = new File(tmpdir, "tck-support.jar");
+ file.deleteOnExit();
TCK_SUPPORT_JAR = new ResourceDescriptor("tck-support.jar", new FileInputStream(tmpdir + "/" + "tck-support.jar"));
}
catch (IOException e)
@@ -49,6 +50,9 @@
public TCKArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName)
{
super(declaringClass, beansXmlSourceFileName);
+ getLibraries().add(new ResourceDescriptor("testng.jar", "/lib/testng-jdk15.jar"));
+ getLibraries().add(new ResourceDescriptor("jsr-299-tck-api.jar", "/lib/webbeans-tck-api.jar"));
+ getLibraries().add(TCK_SUPPORT_JAR);
try
{
getResources().add(new ResourceDescriptor(getClassesRoot() + DeploymentProperties.RESOURCE_BUNDLE, getDeploymentProperties(declaringClass)));
@@ -88,14 +92,4 @@
this.unit = unit;
}
- @Override
- public Set<ResourceDescriptor> getLibraries()
- {
- Set<ResourceDescriptor> libraries = new HashSet<ResourceDescriptor>(super.getLibraries());
- libraries.add(new ResourceDescriptor("testng.jar", "/lib/testng-jdk15.jar"));
- libraries.add(new ResourceDescriptor("jsr-299-tck-api.jar", "/lib/webbeans-tck-api.jar"));
- libraries.add(TCK_SUPPORT_JAR);
- return libraries;
- }
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WarArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-07 00:16:25 UTC (rev 1435)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-07 00:17:04 UTC (rev 1436)
@@ -58,6 +58,7 @@
if (webInfLib == null)
{
webInfLib = new File(archiveRoot, "WEB-INF/lib/");
+ webInfLib.deleteOnExit();
webInfLib.mkdirs();
}
return webInfLib;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/runner/servlet/ServletTestRunner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/runner/servlet/ServletTestRunner.java 2009-02-07 00:16:25 UTC (rev 1435)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/runner/servlet/ServletTestRunner.java 2009-02-07 00:17:04 UTC (rev 1436)
@@ -1,5 +1,7 @@
package org.jboss.webbeans.tck.runner.servlet;
+import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
+
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.PrintWriter;
@@ -19,6 +21,7 @@
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
+ configuration().getTestSuite().setStandalone(false);
TestRunner runner = new TestRunner();
ITestContext context = runner.run();
String outputMode;
Modified: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java 2009-02-07 00:16:25 UTC (rev 1435)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java 2009-02-07 00:17:04 UTC (rev 1436)
@@ -14,7 +14,7 @@
@Test
public void testDefaultDeclartiveArtifact() throws Exception
{
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, true);
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, true, null);
TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
assert !artifact.isEjbs();
assert artifact.isUnit();
@@ -66,7 +66,7 @@
@Test
public void testClassesSpecifiedArtifact() throws Exception
{
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyClassesSpecifiedTest.class, true);
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyClassesSpecifiedTest.class, true, null);
TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
File root = artifact.getExplodedJar();
File currentPackage = getCurrentPackageAsFile(root);
@@ -89,7 +89,7 @@
@Test
public void testResourcesSpecifiedArtifact() throws Exception
{
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyResourcesSpecifiedTest.class, false);
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyResourcesSpecifiedTest.class, false, null);
TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
File root = artifact.getExplodedJar();
assert root.listFiles(META_INF_FILTER).length == 1;
@@ -109,14 +109,14 @@
@Test
public void testIntegrationTestDeclartiveArtifact() throws Exception
{
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyIntegrationTest.class, false);
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyIntegrationTest.class, false, null);
assert !declarativeArtifactProcessor.getArtifact().isUnit();
}
@Test
public void testCustomBeansXml() throws Exception
{
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyCustomBeansXmlTest.class, false);
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyCustomBeansXmlTest.class, false, null);
TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
File root = artifact.getExplodedJar();
File webInf = root.listFiles(WEB_INF_FILTER)[0];
@@ -129,14 +129,14 @@
//@Test
public void testEjbTestDeclartiveArtifact() throws Exception
{
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyEjbTest.class, false);
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyEjbTest.class, false, null);
assert declarativeArtifactProcessor.getArtifact().isEjbs();
}
@Test(expectedExceptions=IllegalArgumentException.class)
public void testWrongPackaging()
{
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyWarUnitTest_Broken.class, false);
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyWarUnitTest_Broken.class, false, null);
}
}
Modified: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java 2009-02-07 00:16:25 UTC (rev 1435)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java 2009-02-07 00:17:04 UTC (rev 1436)
@@ -13,7 +13,7 @@
@Test
public void testDefaultWebXml() throws Exception
{
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, false);
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, false, null);
TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
File root = artifact.getExplodedJar();
assert root.listFiles(WEB_INF_FILTER).length == 1;
17 years, 2 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1435 - in ri/trunk: porting-package and 22 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-06 19:16:25 -0500 (Fri, 06 Feb 2009)
New Revision: 1435
Added:
ri/trunk/porting-package/
ri/trunk/porting-package/pom.xml
ri/trunk/porting-package/src/
ri/trunk/porting-package/src/main/
ri/trunk/porting-package/src/main/java/
ri/trunk/porting-package/src/main/java/org/
ri/trunk/porting-package/src/main/java/org/jboss/
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/BeansImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContainersImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContextsImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ManagersImpl.java
ri/trunk/porting-package/src/main/resources/
ri/trunk/porting-package/src/main/resources/META-INF/
ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties
ri/trunk/porting-package/src/test/
ri/trunk/porting-package/src/test/java/
ri/trunk/porting-package/src/test/resources/
ri/trunk/porting-package/src/test/resources/META-INF/
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockBootstrap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDiscovery.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockResourceLoader.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockWebBeanDiscovery.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/el/
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockResourceLoader.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/context/
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/el/
Modified:
ri/trunk/pom.xml
ri/trunk/webbeans-ri/pom.xml
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockApplicationContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockDependentContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockRequestContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockSessionContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/el/EL.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java
ri/trunk/webbeans-ri/src/test/resources/log4j.xml
Log:
split porting impl into separate project, move mock to main
Modified: ri/trunk/pom.xml
===================================================================
--- ri/trunk/pom.xml 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/pom.xml 2009-02-07 00:16:25 UTC (rev 1435)
@@ -75,6 +75,7 @@
<module>webbeans-api</module>
<module>webbeans-ri</module>
<module>webbeans-ri-spi</module>
+ <module>porting-package</module>
</modules>
<properties>
Added: ri/trunk/porting-package/pom.xml
===================================================================
--- ri/trunk/porting-package/pom.xml (rev 0)
+++ ri/trunk/porting-package/pom.xml 2009-02-07 00:16:25 UTC (rev 1435)
@@ -0,0 +1,30 @@
+<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">
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>org.jboss.webbeans</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>porting-package</artifactId>
+ <name>Web Beans Porting Package for JSR-299 TCK</name>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-ri</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans.tck</groupId>
+ <artifactId>webbeans-tck-api</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/BeansImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/BeansImpl.java (rev 0)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/BeansImpl.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -0,0 +1,121 @@
+package org.jboss.webbeans.porting;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import javax.inject.manager.Bean;
+
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.bean.AbstractClassBean;
+import org.jboss.webbeans.bean.EnterpriseBean;
+import org.jboss.webbeans.bean.ProducerFieldBean;
+import org.jboss.webbeans.bean.ProducerMethodBean;
+import org.jboss.webbeans.bean.SimpleBean;
+import org.jboss.webbeans.ejb.spi.EjbDescriptor;
+import org.jboss.webbeans.mock.MockEjbDescriptor;
+import org.jboss.webbeans.tck.spi.Beans;
+import org.jboss.webbeans.util.Reflections;
+
+/**
+ * Implements the Beans SPI for the TCK specifically for the JBoss RI.
+ *
+ * @author Shane Bryzak
+ * @author Pete Muir
+ * @author David Allen
+ *
+ */
+@Deprecated
+public class BeansImpl implements Beans
+{
+
+ public <T> Bean<T> createSimpleBean(Class<T> clazz)
+ {
+ return SimpleBean.of(clazz, CurrentManager.rootManager());
+ }
+
+ public <T> Bean<T> createProducerMethodBean(Method method, Bean<?> declaringBean)
+ {
+ if (declaringBean instanceof AbstractClassBean)
+ {
+ return ProducerMethodBean.of(method, (AbstractClassBean<?>) declaringBean, CurrentManager.rootManager());
+ }
+ else
+ {
+ throw new IllegalStateException("Cannot create a producer method from a bean that wasn't created by the RI " + declaringBean);
+ }
+ }
+
+ public <T> Bean<T> createProducerFieldBean(Field field, Bean<?> declaringBean)
+ {
+ if (declaringBean instanceof AbstractClassBean)
+ {
+ return ProducerFieldBean.of(field, (AbstractClassBean<?>) declaringBean, CurrentManager.rootManager());
+ }
+ else
+ {
+ throw new IllegalStateException("Cannot create a producer field from a bean that wasn't created by the RI " + declaringBean);
+ }
+ }
+
+ public <T> Bean<T> createEnterpriseBean(Class<T> clazz)
+ {
+ CurrentManager.rootManager().getEjbDescriptorCache().add(MockEjbDescriptor.of(clazz));
+ return EnterpriseBean.of(clazz, CurrentManager.rootManager());
+ }
+
+ public boolean isEnterpriseBean(Class<?> clazz)
+ {
+ return CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz);
+ }
+
+ public boolean isEntityBean(Class<?> clazz)
+ {
+ if (CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz))
+ {
+ for (EjbDescriptor<?> ejbDescriptor : CurrentManager.rootManager().getEjbDescriptorCache().get(clazz))
+ {
+ if (!ejbDescriptor.isMessageDriven() && !ejbDescriptor.isSingleton() && !ejbDescriptor.isStateful() && !ejbDescriptor.isStateless())
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ public boolean isStatefulBean(Class<?> clazz)
+ {
+ if (CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz))
+ {
+ for (EjbDescriptor<?> ejbDescriptor : CurrentManager.rootManager().getEjbDescriptorCache().get(clazz))
+ {
+ if (ejbDescriptor.isStateful())
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ public boolean isStatelessBean(Class<?> clazz)
+ {
+ if (CurrentManager.rootManager().getEjbDescriptorCache().containsKey(clazz))
+ {
+ for (EjbDescriptor<?> ejbDescriptor : CurrentManager.rootManager().getEjbDescriptorCache().get(clazz))
+ {
+ if (ejbDescriptor.isStateless())
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ public boolean isProxy(Object instance)
+ {
+ return Reflections.isProxy(instance);
+ }
+
+}
Added: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContainersImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContainersImpl.java (rev 0)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContainersImpl.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -0,0 +1,60 @@
+package org.jboss.webbeans.porting;
+
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.util.List;
+
+import javax.el.ELContext;
+import javax.inject.manager.Manager;
+
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.mock.MockBootstrap;
+import org.jboss.webbeans.mock.MockWebBeanDiscovery;
+import org.jboss.webbeans.mock.el.EL;
+import org.jboss.webbeans.tck.spi.StandaloneContainers;
+
+public class ContainersImpl implements StandaloneContainers
+{
+
+ public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, Class<?>... classes)
+ {
+ MockBootstrap bootstrap = new MockBootstrap();
+ ManagerImpl manager = bootstrap.getManager();
+ if (enabledDeploymentTypes != null)
+ {
+ manager.setEnabledDeploymentTypes(enabledDeploymentTypes);
+ }
+ bootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(classes));
+ bootstrap.boot();
+ return manager;
+ }
+
+ public Manager deploy(java.lang.Class<?>... classes)
+ {
+ return deploy(null, classes);
+ }
+
+ public Manager deploy(InputStream archive)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, InputStream archive)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
+ {
+ ELContext elContext = EL.createELContext();
+ return (T) EL.EXPRESSION_FACTORY.createValueExpression(elContext, expression, expectedType).getValue(elContext);
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams)
+ {
+ ELContext elContext = EL.createELContext();
+ return (T) EL.EXPRESSION_FACTORY.createMethodExpression(elContext, expression, expectedType, expectedParamTypes).invoke(elContext, expectedParams);
+ }
+}
Added: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContextsImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContextsImpl.java (rev 0)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContextsImpl.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -0,0 +1,44 @@
+package org.jboss.webbeans.porting;
+
+import org.jboss.webbeans.context.AbstractBeanMapContext;
+import org.jboss.webbeans.context.AbstractContext;
+import org.jboss.webbeans.context.DependentContext;
+import org.jboss.webbeans.context.RequestContext;
+import org.jboss.webbeans.tck.spi.Contexts;
+
+public class ContextsImpl implements Contexts<AbstractContext>
+{
+
+ public RequestContext getRequestContext()
+ {
+ return RequestContext.INSTANCE;
+ }
+
+ public void setActive(AbstractContext context)
+ {
+ context.setActive(true);
+ }
+
+ public void setInactive(AbstractContext context)
+ {
+ context.setActive(false);
+ }
+
+ public AbstractContext getDependentContext()
+ {
+ return DependentContext.INSTANCE;
+ }
+
+ public void destroyContext(AbstractContext context)
+ {
+ if (context instanceof AbstractBeanMapContext)
+ {
+ ((AbstractBeanMapContext) context).destroy();
+ }
+ else
+ {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+}
Added: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ManagersImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ManagersImpl.java (rev 0)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ManagersImpl.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -0,0 +1,29 @@
+package org.jboss.webbeans.porting;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+
+import javax.inject.manager.Manager;
+
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.tck.spi.Managers;
+
+public class ManagersImpl implements Managers
+{
+
+ public Manager getManager()
+ {
+ return CurrentManager.rootManager();
+ }
+
+ public void setEnabledDeploymentTypes(List<Class<? extends Annotation>> enabledDeploymentTypes)
+ {
+ CurrentManager.rootManager().setEnabledDeploymentTypes(enabledDeploymentTypes);
+ }
+
+ public List<Class<? extends Annotation>> getEnabledDeploymentTypes()
+ {
+ return CurrentManager.rootManager().getEnabledDeploymentTypes();
+ }
+
+}
Added: ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties
===================================================================
--- ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties (rev 0)
+++ ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties 2009-02-07 00:16:25 UTC (rev 1435)
@@ -0,0 +1,4 @@
+org.jboss.webbeans.tck.spi.Managers=org.jboss.webbeans.porting.ManagersImpl
+org.jboss.webbeans.tck.spi.Beans=org.jboss.webbeans.porting.BeansImpl
+org.jboss.webbeans.tck.spi.Contexts=org.jboss.webbeans.porting.ContextsImpl
+org.jboss.webbeans.tck.spi.Containers=org.jboss.webbeans.porting.ContainersImpl
\ No newline at end of file
Modified: ri/trunk/webbeans-ri/pom.xml
===================================================================
--- ri/trunk/webbeans-ri/pom.xml 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/webbeans-ri/pom.xml 2009-02-07 00:16:25 UTC (rev 1435)
@@ -41,15 +41,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-embedded</artifactId>
- <scope>runtime</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-api</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
@@ -61,14 +53,8 @@
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</dependency>
-
+
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<optional>true</optional>
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockBootstrap.java (from rev 1428, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockBootstrap.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockBootstrap.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -0,0 +1,214 @@
+package org.jboss.webbeans.mock;
+
+import java.lang.annotation.Annotation;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.inject.manager.InjectionPoint;
+import javax.naming.Context;
+import javax.persistence.PersistenceContext;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+
+import org.jboss.webbeans.bootstrap.WebBeansBootstrap;
+import org.jboss.webbeans.bootstrap.spi.EjbDiscovery;
+import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
+import org.jboss.webbeans.ejb.spi.EjbResolver;
+import org.jboss.webbeans.mock.context.MockApplicationContext;
+import org.jboss.webbeans.mock.context.MockDependentContext;
+import org.jboss.webbeans.mock.context.MockRequestContext;
+import org.jboss.webbeans.mock.context.MockSessionContext;
+import org.jboss.webbeans.resource.AbstractNamingContext;
+import org.jboss.webbeans.resources.spi.NamingContext;
+import org.jboss.webbeans.resources.spi.ResourceLoader;
+
+public class MockBootstrap extends WebBeansBootstrap
+{
+
+ public static class MockNaming extends AbstractNamingContext
+ {
+
+ private Context context;
+
+ public void setContext(Context context)
+ {
+ this.context = context;
+ }
+
+ public Context getContext()
+ {
+ return context;
+ }
+
+ public void bind(String key, Object value)
+ {
+ if (context != null)
+ {
+ super.bind(key, value);
+ }
+ }
+
+ public <T> T lookup(String name, Class<? extends T> expectedType)
+ {
+ if (context != null)
+ {
+ T instance = overrideLookup(name, expectedType);
+ if (instance == null)
+ {
+ instance = super.lookup(name, expectedType);
+ }
+ return instance;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private <T> T overrideLookup(String name, Class<? extends T> expectedType)
+ {
+ // JBoss Embedded EJB 3.1 doesn't seem to bind this!
+ if (name.equals("java:comp/UserTransaction"))
+ {
+ final TransactionManager tm = super.lookup("java:/TransactionManager", TransactionManager.class);
+ return (T) new UserTransaction()
+ {
+
+ public void begin() throws NotSupportedException, SystemException
+ {
+ tm.begin();
+ }
+
+ public void commit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException, SecurityException, IllegalStateException, SystemException
+ {
+ tm.commit();
+ }
+
+ public int getStatus() throws SystemException
+ {
+ return tm.getStatus();
+ }
+
+ public void rollback() throws IllegalStateException, SecurityException, SystemException
+ {
+ tm.rollback();
+ }
+
+ public void setRollbackOnly() throws IllegalStateException, SystemException
+ {
+ tm.setRollbackOnly();
+ }
+
+ public void setTransactionTimeout(int seconds) throws SystemException
+ {
+ tm.setTransactionTimeout(seconds);
+ }
+
+ };
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ };
+
+ private static final EjbResolver MOCK_EJB_RESOLVER = new EjbResolver()
+ {
+
+ public Class<? extends Annotation> getEJBAnnotation()
+ {
+ return EJB.class;
+ }
+
+ public Class<? extends Annotation> getPersistenceContextAnnotation()
+ {
+ return PersistenceContext.class;
+ }
+
+ public Object resolveEjb(InjectionPoint injectionPoint, NamingContext namingContext)
+ {
+ return null;
+ }
+
+ public Object resolvePersistenceContext(InjectionPoint injectionPoint, NamingContext namingContext)
+ {
+ return null;
+ }
+
+ public Class<? extends Annotation> getResourceAnnotation()
+ {
+ return Resource.class;
+ }
+
+ public Object resolveResource(InjectionPoint injectionPoint, NamingContext namingContext)
+ {
+ return null;
+ }
+
+
+
+ };
+
+ private WebBeanDiscovery webBeanDiscovery;
+ private EjbDiscovery ejbDiscovery;
+ private ResourceLoader resourceLoader;
+
+ private MockNaming mockNaming;
+
+ public MockBootstrap()
+ {
+ this.resourceLoader = new MockResourceLoader();
+ this.mockNaming = new MockNaming();
+ initManager(mockNaming, MOCK_EJB_RESOLVER, resourceLoader);
+ setupContexts();
+ }
+
+ protected void setupContexts()
+ {
+ getManager().addContext(new MockRequestContext());
+ getManager().addContext(new MockSessionContext());
+ getManager().addContext(new MockApplicationContext());
+ getManager().addContext(new MockDependentContext());
+ }
+
+ public void setWebBeanDiscovery(WebBeanDiscovery webBeanDiscovery)
+ {
+ this.webBeanDiscovery = webBeanDiscovery;
+ if (webBeanDiscovery != null)
+ {
+ this.ejbDiscovery = new MockEjbDiscovery(webBeanDiscovery.discoverWebBeanClasses());
+ }
+ }
+
+ @Override
+ protected WebBeanDiscovery getWebBeanDiscovery()
+ {
+ return this.webBeanDiscovery;
+ }
+
+ @Override
+ public ResourceLoader getResourceLoader()
+ {
+ return resourceLoader;
+ }
+
+ public MockNaming getNaming()
+ {
+ return mockNaming;
+ }
+
+ @Override
+ protected EjbDiscovery getEjbDiscovery()
+ {
+ return ejbDiscovery;
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockBootstrap.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java (from rev 1428, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -0,0 +1,182 @@
+package org.jboss.webbeans.mock;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+
+import javax.ejb.Local;
+import javax.ejb.MessageDriven;
+import javax.ejb.Remove;
+import javax.ejb.Singleton;
+import javax.ejb.Stateful;
+import javax.ejb.Stateless;
+
+import org.jboss.webbeans.ejb.spi.BusinessInterfaceDescriptor;
+import org.jboss.webbeans.ejb.spi.EjbDescriptor;
+
+public class MockEjbDescriptor<T> implements EjbDescriptor<T>
+{
+ private final Class<T> type;
+ private final String ejbName;
+ private final List<BusinessInterfaceDescriptor<?>> localInterfaces;
+ private final HashSet<Method> removeMethods;
+
+ public static <T> MockEjbDescriptor<T> of(Class<T> type)
+ {
+ return new MockEjbDescriptor<T>(type);
+ }
+
+ private MockEjbDescriptor(final Class<T> type)
+ {
+ this.type = type;
+ this.ejbName = type.getSimpleName();
+ this.localInterfaces = new ArrayList<BusinessInterfaceDescriptor<?>>();
+ for (final Class<?> clazz : type.getInterfaces())
+ {
+ if (clazz.isAnnotationPresent(Local.class))
+ {
+ localInterfaces.add(new BusinessInterfaceDescriptor<Object>()
+ {
+
+ @SuppressWarnings("unchecked")
+ public Class<Object> getInterface()
+ {
+ return (Class<Object>) clazz;
+ }
+
+ public String getJndiName()
+ {
+ return clazz.getSimpleName() + "/local";
+ }
+
+ });
+ }
+ }
+ // cope with EJB 3.1 style no-interface views
+ if (localInterfaces.size() == 0)
+ {
+ localInterfaces.add(new BusinessInterfaceDescriptor<Object>()
+ {
+
+ public Class<Object> getInterface()
+ {
+ return (Class<Object>) type;
+ }
+
+ public String getJndiName()
+ {
+ return type.getSimpleName() +"/local";
+ }
+
+ });
+ }
+ this.removeMethods = new HashSet<Method>();
+ for (final Method method : type.getMethods())
+ {
+ if (method.isAnnotationPresent(Remove.class))
+ {
+ removeMethods.add(method);
+ }
+ }
+ }
+
+ public String getEjbName()
+ {
+ return ejbName;
+ }
+
+ public Iterable<BusinessInterfaceDescriptor<?>> getLocalBusinessInterfaces()
+ {
+ return localInterfaces;
+ }
+
+ public Iterable<BusinessInterfaceDescriptor<?>> getRemoteBusinessInterfaces()
+ {
+ return Collections.emptyList();
+ }
+
+ public Iterable<Method> getRemoveMethods()
+ {
+
+ return removeMethods;
+ }
+
+ public Class<T> getType()
+ {
+ return type;
+ }
+
+ public boolean isMessageDriven()
+ {
+ return type.isAnnotationPresent(MessageDriven.class);
+ }
+
+ public boolean isSingleton()
+ {
+ return type.isAnnotationPresent(Singleton.class);
+ }
+
+ public boolean isStateful()
+ {
+ return type.isAnnotationPresent(Stateful.class);
+ }
+
+ public boolean isStateless()
+ {
+ return type.isAnnotationPresent(Stateless.class);
+ }
+
+ public String getLocalJndiName()
+ {
+ return type.getSimpleName() + "/local";
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder builder = new StringBuilder();
+ builder.append(getEjbName());
+ if (isStateful())
+ {
+ builder.append(" (SFSB)");
+ }
+ if (isStateless())
+ {
+ builder.append(" (SLSB)");
+ }
+ if (isSingleton())
+ {
+ builder.append(" (Singleton)");
+ }
+ if (isMessageDriven())
+ {
+ builder.append(" (MDB)");
+ }
+ builder.append("remove methods; " + removeMethods + "; ");
+ builder.append("; BeanClass: " + getType() + "; Local Business Interfaces: " + getLocalBusinessInterfaces());
+ return builder.toString();
+ }
+
+ @Override
+ public boolean equals(Object other)
+ {
+ if (other instanceof EjbDescriptor)
+ {
+ EjbDescriptor<T> that = (EjbDescriptor<T>) other;
+ return this.getEjbName().equals(that.getEjbName());
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return getEjbName().hashCode();
+ }
+
+}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDiscovery.java (from rev 1428, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDiscovery.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDiscovery.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -0,0 +1,49 @@
+package org.jboss.webbeans.mock;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.ejb.MessageDriven;
+import javax.ejb.Singleton;
+import javax.ejb.Stateful;
+import javax.ejb.Stateless;
+
+import org.jboss.webbeans.bootstrap.spi.EjbDiscovery;
+import org.jboss.webbeans.ejb.spi.EjbDescriptor;
+
+public class MockEjbDiscovery implements EjbDiscovery
+{
+
+ private final List<EjbDescriptor<?>> ejbs;
+
+ public MockEjbDiscovery(Iterable<Class<?>> allClasses)
+ {
+
+ this.ejbs = new ArrayList<EjbDescriptor<?>>();
+ for (Class<?> ejbClass : discoverEjbs(allClasses))
+ {
+ this.ejbs.add(MockEjbDescriptor.of(ejbClass));
+ }
+ }
+
+ public Iterable<EjbDescriptor<?>> discoverEjbs()
+ {
+ return ejbs;
+ }
+
+ protected static Iterable<Class<?>> discoverEjbs(Iterable<Class<?>> webBeanClasses)
+ {
+ Set<Class<?>> ejbs = new HashSet<Class<?>>();
+ for (Class<?> clazz : webBeanClasses)
+ {
+ if (clazz.isAnnotationPresent(Stateless.class) || clazz.isAnnotationPresent(Stateful.class) || clazz.isAnnotationPresent(MessageDriven.class) || clazz.isAnnotationPresent(Singleton.class))
+ {
+ ejbs.add(clazz);
+ }
+ }
+ return ejbs;
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDiscovery.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockResourceLoader.java (from rev 1428, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockResourceLoader.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockResourceLoader.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockResourceLoader.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -0,0 +1,42 @@
+package org.jboss.webbeans.mock;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.webbeans.resources.spi.ResourceLoader;
+import org.jboss.webbeans.resources.spi.ResourceLoadingException;
+import org.jboss.webbeans.util.EnumerationIterable;
+
+public class MockResourceLoader implements ResourceLoader
+{
+
+ public Class<?> classForName(String name)
+ {
+ try
+ {
+ return Thread.currentThread().getContextClassLoader().loadClass(name);
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new ResourceLoadingException(e);
+ }
+ }
+
+ public URL getResource(String name)
+ {
+ return Thread.currentThread().getContextClassLoader().getResource(name);
+ }
+
+ public Iterable<URL> getResources(String name)
+ {
+ try
+ {
+ return new EnumerationIterable<URL>(Thread.currentThread().getContextClassLoader().getResources(name));
+ }
+ catch (IOException e)
+ {
+ throw new ResourceLoadingException(e);
+ }
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockResourceLoader.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockWebBeanDiscovery.java (from rev 1428, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockWebBeanDiscovery.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockWebBeanDiscovery.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -0,0 +1,42 @@
+package org.jboss.webbeans.mock;
+
+import java.net.URL;
+import java.util.Arrays;
+import java.util.HashSet;
+
+import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
+
+public class MockWebBeanDiscovery implements WebBeanDiscovery
+{
+
+ private Iterable<Class<?>> webBeanClasses = new HashSet<Class<?>>();
+
+ private Iterable<URL> webBeansXmlFiles = new HashSet<URL>();
+
+ /**
+ * Simple constructor that auto discovers EJBs
+ * @param webBeanClasses
+ */
+ public MockWebBeanDiscovery(Class<?>... webBeanClasses)
+ {
+ this(Arrays.asList(webBeanClasses), null);
+ }
+
+ public MockWebBeanDiscovery(Iterable<Class<?>> webBeanClasses, Iterable<URL> webBeansXmlFiles)
+ {
+ super();
+ this.webBeanClasses = webBeanClasses;
+ this.webBeansXmlFiles = webBeansXmlFiles;
+ }
+
+ public Iterable<Class<?>> discoverWebBeanClasses()
+ {
+ return webBeanClasses;
+ }
+
+ public Iterable<URL> discoverWebBeansXml()
+ {
+ return webBeansXmlFiles;
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockWebBeanDiscovery.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context (from rev 1428, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/context)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockApplicationContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/context/MockApplicationContext.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockApplicationContext.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.mock.context;
+package org.jboss.webbeans.mock.context;
import org.jboss.webbeans.context.ApplicationContext;
import org.jboss.webbeans.context.beanmap.SimpleBeanMap;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockDependentContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/context/MockDependentContext.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockDependentContext.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.mock.context;
+package org.jboss.webbeans.mock.context;
import org.jboss.webbeans.context.DependentContext;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockRequestContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/context/MockRequestContext.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockRequestContext.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.mock.context;
+package org.jboss.webbeans.mock.context;
import org.jboss.webbeans.context.RequestContext;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockSessionContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/context/MockSessionContext.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockSessionContext.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.mock.context;
+package org.jboss.webbeans.mock.context;
import org.jboss.webbeans.context.SessionContext;
import org.jboss.webbeans.context.beanmap.SimpleBeanMap;
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/el (from rev 1428, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/el)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/el/EL.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/el/EL.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/el/EL.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.test.mock.el;
+package org.jboss.webbeans.mock.el;
import javax.el.ArrayELResolver;
import javax.el.BeanELResolver;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -116,12 +116,12 @@
*/
public static void endRequest(HttpServletRequest request)
{
+ CurrentManager.rootManager().getInstanceByType(SessionManager.class).setSession(null);
+ CurrentManager.rootManager().getInstanceByType(ConversationManager.class).cleanupConversation();
DependentContext.INSTANCE.setActive(false);
RequestContext.INSTANCE.destroy();
SessionContext.INSTANCE.setBeanMap(null);
- CurrentManager.rootManager().getInstanceByType(ConversationManager.class).cleanupConversation();
ConversationContext.INSTANCE.setBeanMap(null);
- CurrentManager.rootManager().getInstanceByType(SessionManager.class).setSession(null);
}
}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockBootstrap.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -1,214 +0,0 @@
-package org.jboss.webbeans.test.mock;
-
-import java.lang.annotation.Annotation;
-
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.inject.manager.InjectionPoint;
-import javax.naming.Context;
-import javax.persistence.PersistenceContext;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-
-import org.jboss.webbeans.bootstrap.WebBeansBootstrap;
-import org.jboss.webbeans.bootstrap.spi.EjbDiscovery;
-import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
-import org.jboss.webbeans.ejb.spi.EjbResolver;
-import org.jboss.webbeans.resource.AbstractNamingContext;
-import org.jboss.webbeans.resources.spi.NamingContext;
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-import org.jboss.webbeans.test.mock.context.MockApplicationContext;
-import org.jboss.webbeans.test.mock.context.MockDependentContext;
-import org.jboss.webbeans.test.mock.context.MockRequestContext;
-import org.jboss.webbeans.test.mock.context.MockSessionContext;
-
-public class MockBootstrap extends WebBeansBootstrap
-{
-
- public static class MockNaming extends AbstractNamingContext
- {
-
- private Context context;
-
- public void setContext(Context context)
- {
- this.context = context;
- }
-
- public Context getContext()
- {
- return context;
- }
-
- public void bind(String key, Object value)
- {
- if (context != null)
- {
- super.bind(key, value);
- }
- }
-
- public <T> T lookup(String name, Class<? extends T> expectedType)
- {
- if (context != null)
- {
- T instance = overrideLookup(name, expectedType);
- if (instance == null)
- {
- instance = super.lookup(name, expectedType);
- }
- return instance;
- }
- else
- {
- return null;
- }
- }
-
- @SuppressWarnings("unchecked")
- private <T> T overrideLookup(String name, Class<? extends T> expectedType)
- {
- // JBoss Embedded EJB 3.1 doesn't seem to bind this!
- if (name.equals("java:comp/UserTransaction"))
- {
- final TransactionManager tm = super.lookup("java:/TransactionManager", TransactionManager.class);
- return (T) new UserTransaction()
- {
-
- public void begin() throws NotSupportedException, SystemException
- {
- tm.begin();
- }
-
- public void commit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException, SecurityException, IllegalStateException, SystemException
- {
- tm.commit();
- }
-
- public int getStatus() throws SystemException
- {
- return tm.getStatus();
- }
-
- public void rollback() throws IllegalStateException, SecurityException, SystemException
- {
- tm.rollback();
- }
-
- public void setRollbackOnly() throws IllegalStateException, SystemException
- {
- tm.setRollbackOnly();
- }
-
- public void setTransactionTimeout(int seconds) throws SystemException
- {
- tm.setTransactionTimeout(seconds);
- }
-
- };
- }
- else
- {
- return null;
- }
- }
-
- };
-
- private static final EjbResolver MOCK_EJB_RESOLVER = new EjbResolver()
- {
-
- public Class<? extends Annotation> getEJBAnnotation()
- {
- return EJB.class;
- }
-
- public Class<? extends Annotation> getPersistenceContextAnnotation()
- {
- return PersistenceContext.class;
- }
-
- public Object resolveEjb(InjectionPoint injectionPoint, NamingContext namingContext)
- {
- return null;
- }
-
- public Object resolvePersistenceContext(InjectionPoint injectionPoint, NamingContext namingContext)
- {
- return null;
- }
-
- public Class<? extends Annotation> getResourceAnnotation()
- {
- return Resource.class;
- }
-
- public Object resolveResource(InjectionPoint injectionPoint, NamingContext namingContext)
- {
- return null;
- }
-
-
-
- };
-
- private WebBeanDiscovery webBeanDiscovery;
- private EjbDiscovery ejbDiscovery;
- private ResourceLoader resourceLoader;
-
- private MockNaming mockNaming;
-
- public MockBootstrap()
- {
- this.resourceLoader = new MockResourceLoader();
- this.mockNaming = new MockNaming();
- initManager(mockNaming, MOCK_EJB_RESOLVER, resourceLoader);
- setupContexts();
- }
-
- protected void setupContexts()
- {
- getManager().addContext(new MockRequestContext());
- getManager().addContext(new MockSessionContext());
- getManager().addContext(new MockApplicationContext());
- getManager().addContext(new MockDependentContext());
- }
-
- public void setWebBeanDiscovery(WebBeanDiscovery webBeanDiscovery)
- {
- this.webBeanDiscovery = webBeanDiscovery;
- if (webBeanDiscovery != null)
- {
- this.ejbDiscovery = new MockEjbDiscovery(webBeanDiscovery.discoverWebBeanClasses());
- }
- }
-
- @Override
- protected WebBeanDiscovery getWebBeanDiscovery()
- {
- return this.webBeanDiscovery;
- }
-
- @Override
- public ResourceLoader getResourceLoader()
- {
- return resourceLoader;
- }
-
- public MockNaming getNaming()
- {
- return mockNaming;
- }
-
- @Override
- protected EjbDiscovery getEjbDiscovery()
- {
- return ejbDiscovery;
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -1,182 +0,0 @@
-package org.jboss.webbeans.test.mock;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.ejb.Local;
-import javax.ejb.MessageDriven;
-import javax.ejb.Remove;
-import javax.ejb.Singleton;
-import javax.ejb.Stateful;
-import javax.ejb.Stateless;
-
-import org.jboss.webbeans.ejb.spi.BusinessInterfaceDescriptor;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
-
-public class MockEjbDescriptor<T> implements EjbDescriptor<T>
-{
- private final Class<T> type;
- private final String ejbName;
- private final List<BusinessInterfaceDescriptor<?>> localInterfaces;
- private final HashSet<Method> removeMethods;
-
- public static <T> MockEjbDescriptor<T> of(Class<T> type)
- {
- return new MockEjbDescriptor<T>(type);
- }
-
- private MockEjbDescriptor(final Class<T> type)
- {
- this.type = type;
- this.ejbName = type.getSimpleName();
- this.localInterfaces = new ArrayList<BusinessInterfaceDescriptor<?>>();
- for (final Class<?> clazz : type.getInterfaces())
- {
- if (clazz.isAnnotationPresent(Local.class))
- {
- localInterfaces.add(new BusinessInterfaceDescriptor<Object>()
- {
-
- @SuppressWarnings("unchecked")
- public Class<Object> getInterface()
- {
- return (Class<Object>) clazz;
- }
-
- public String getJndiName()
- {
- return clazz.getSimpleName() + "/local";
- }
-
- });
- }
- }
- // cope with EJB 3.1 style no-interface views
- if (localInterfaces.size() == 0)
- {
- localInterfaces.add(new BusinessInterfaceDescriptor<Object>()
- {
-
- public Class<Object> getInterface()
- {
- return (Class<Object>) type;
- }
-
- public String getJndiName()
- {
- return type.getSimpleName() +"/local";
- }
-
- });
- }
- this.removeMethods = new HashSet<Method>();
- for (final Method method : type.getMethods())
- {
- if (method.isAnnotationPresent(Remove.class))
- {
- removeMethods.add(method);
- }
- }
- }
-
- public String getEjbName()
- {
- return ejbName;
- }
-
- public Iterable<BusinessInterfaceDescriptor<?>> getLocalBusinessInterfaces()
- {
- return localInterfaces;
- }
-
- public Iterable<BusinessInterfaceDescriptor<?>> getRemoteBusinessInterfaces()
- {
- return Collections.emptyList();
- }
-
- public Iterable<Method> getRemoveMethods()
- {
-
- return removeMethods;
- }
-
- public Class<T> getType()
- {
- return type;
- }
-
- public boolean isMessageDriven()
- {
- return type.isAnnotationPresent(MessageDriven.class);
- }
-
- public boolean isSingleton()
- {
- return type.isAnnotationPresent(Singleton.class);
- }
-
- public boolean isStateful()
- {
- return type.isAnnotationPresent(Stateful.class);
- }
-
- public boolean isStateless()
- {
- return type.isAnnotationPresent(Stateless.class);
- }
-
- public String getLocalJndiName()
- {
- return type.getSimpleName() + "/local";
- }
-
- @Override
- public String toString()
- {
- StringBuilder builder = new StringBuilder();
- builder.append(getEjbName());
- if (isStateful())
- {
- builder.append(" (SFSB)");
- }
- if (isStateless())
- {
- builder.append(" (SLSB)");
- }
- if (isSingleton())
- {
- builder.append(" (Singleton)");
- }
- if (isMessageDriven())
- {
- builder.append(" (MDB)");
- }
- builder.append("remove methods; " + removeMethods + "; ");
- builder.append("; BeanClass: " + getType() + "; Local Business Interfaces: " + getLocalBusinessInterfaces());
- return builder.toString();
- }
-
- @Override
- public boolean equals(Object other)
- {
- if (other instanceof EjbDescriptor)
- {
- EjbDescriptor<T> that = (EjbDescriptor<T>) other;
- return this.getEjbName().equals(that.getEjbName());
- }
- else
- {
- return false;
- }
- }
-
- @Override
- public int hashCode()
- {
- return getEjbName().hashCode();
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDiscovery.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -1,49 +0,0 @@
-package org.jboss.webbeans.test.mock;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.ejb.MessageDriven;
-import javax.ejb.Singleton;
-import javax.ejb.Stateful;
-import javax.ejb.Stateless;
-
-import org.jboss.webbeans.bootstrap.spi.EjbDiscovery;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
-
-public class MockEjbDiscovery implements EjbDiscovery
-{
-
- private final List<EjbDescriptor<?>> ejbs;
-
- public MockEjbDiscovery(Iterable<Class<?>> allClasses)
- {
-
- this.ejbs = new ArrayList<EjbDescriptor<?>>();
- for (Class<?> ejbClass : discoverEjbs(allClasses))
- {
- this.ejbs.add(MockEjbDescriptor.of(ejbClass));
- }
- }
-
- public Iterable<EjbDescriptor<?>> discoverEjbs()
- {
- return ejbs;
- }
-
- protected static Iterable<Class<?>> discoverEjbs(Iterable<Class<?>> webBeanClasses)
- {
- Set<Class<?>> ejbs = new HashSet<Class<?>>();
- for (Class<?> clazz : webBeanClasses)
- {
- if (clazz.isAnnotationPresent(Stateless.class) || clazz.isAnnotationPresent(Stateful.class) || clazz.isAnnotationPresent(MessageDriven.class) || clazz.isAnnotationPresent(Singleton.class))
- {
- ejbs.add(clazz);
- }
- }
- return ejbs;
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockResourceLoader.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockResourceLoader.java 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockResourceLoader.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -1,42 +0,0 @@
-package org.jboss.webbeans.test.mock;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-import org.jboss.webbeans.resources.spi.ResourceLoadingException;
-import org.jboss.webbeans.util.EnumerationIterable;
-
-public class MockResourceLoader implements ResourceLoader
-{
-
- public Class<?> classForName(String name)
- {
- try
- {
- return Thread.currentThread().getContextClassLoader().loadClass(name);
- }
- catch (ClassNotFoundException e)
- {
- throw new ResourceLoadingException(e);
- }
- }
-
- public URL getResource(String name)
- {
- return Thread.currentThread().getContextClassLoader().getResource(name);
- }
-
- public Iterable<URL> getResources(String name)
- {
- try
- {
- return new EnumerationIterable<URL>(Thread.currentThread().getContextClassLoader().getResources(name));
- }
- catch (IOException e)
- {
- throw new ResourceLoadingException(e);
- }
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -1,42 +0,0 @@
-package org.jboss.webbeans.test.mock;
-
-import java.net.URL;
-import java.util.Arrays;
-import java.util.HashSet;
-
-import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
-
-public class MockWebBeanDiscovery implements WebBeanDiscovery
-{
-
- private Iterable<Class<?>> webBeanClasses = new HashSet<Class<?>>();
-
- private Iterable<URL> webBeansXmlFiles = new HashSet<URL>();
-
- /**
- * Simple constructor that auto discovers EJBs
- * @param webBeanClasses
- */
- public MockWebBeanDiscovery(Class<?>... webBeanClasses)
- {
- this(Arrays.asList(webBeanClasses), null);
- }
-
- public MockWebBeanDiscovery(Iterable<Class<?>> webBeanClasses, Iterable<URL> webBeansXmlFiles)
- {
- super();
- this.webBeanClasses = webBeanClasses;
- this.webBeansXmlFiles = webBeansXmlFiles;
- }
-
- public Iterable<Class<?>> discoverWebBeanClasses()
- {
- return webBeanClasses;
- }
-
- public Iterable<URL> discoverWebBeansXml()
- {
- return webBeansXmlFiles;
- }
-
-}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -12,8 +12,8 @@
import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.ejb.spi.EjbDescriptor;
+import org.jboss.webbeans.mock.MockEjbDescriptor;
import org.jboss.webbeans.tck.spi.Beans;
-import org.jboss.webbeans.test.mock.MockEjbDescriptor;
import org.jboss.webbeans.util.Reflections;
/**
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -8,10 +8,10 @@
import javax.inject.manager.Manager;
import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.mock.MockBootstrap;
+import org.jboss.webbeans.mock.MockWebBeanDiscovery;
+import org.jboss.webbeans.mock.el.EL;
import org.jboss.webbeans.tck.spi.StandaloneContainers;
-import org.jboss.webbeans.test.mock.MockBootstrap;
-import org.jboss.webbeans.test.mock.MockWebBeanDiscovery;
-import org.jboss.webbeans.test.mock.el.EL;
public class ContainersImpl implements StandaloneContainers
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ManagersImpl.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -6,30 +6,26 @@
import javax.inject.manager.Manager;
import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.mock.MockBootstrap;
import org.jboss.webbeans.tck.spi.Managers;
-import org.jboss.webbeans.test.mock.MockBootstrap;
public class ManagersImpl implements Managers
{
- public Manager createManager(List<Class<? extends Annotation>> enabledDeploymentTypes)
+ public Manager getManager()
{
new MockBootstrap();
- if (enabledDeploymentTypes != null)
- {
- CurrentManager.rootManager().setEnabledDeploymentTypes(enabledDeploymentTypes);
- }
return CurrentManager.rootManager();
}
-
- public Manager createManager()
- {
- return createManager(null);
- }
public List<Class<? extends Annotation>> getEnabledDeploymentTypes()
{
return CurrentManager.rootManager().getEnabledDeploymentTypes();
}
+ public void setEnabledDeploymentTypes(List<Class<? extends Annotation>> enabledDeploymentTypes)
+ {
+ CurrentManager.rootManager().setEnabledDeploymentTypes(enabledDeploymentTypes);
+ }
+
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -18,9 +18,9 @@
import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.context.DependentContext;
-import org.jboss.webbeans.test.mock.MockBootstrap;
-import org.jboss.webbeans.test.mock.MockEjbDescriptor;
-import org.jboss.webbeans.test.mock.MockWebBeanDiscovery;
+import org.jboss.webbeans.mock.MockBootstrap;
+import org.jboss.webbeans.mock.MockEjbDescriptor;
+import org.jboss.webbeans.mock.MockWebBeanDiscovery;
import org.testng.annotations.BeforeMethod;
public class AbstractTest
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java 2009-02-07 00:16:25 UTC (rev 1435)
@@ -10,7 +10,7 @@
import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.bean.RIBean;
import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.test.mock.MockBootstrap;
+import org.jboss.webbeans.mock.MockBootstrap;
import org.jboss.webbeans.test.unit.AbstractTest;
import org.testng.annotations.Test;
Modified: ri/trunk/webbeans-ri/src/test/resources/log4j.xml
===================================================================
--- ri/trunk/webbeans-ri/src/test/resources/log4j.xml 2009-02-06 22:19:56 UTC (rev 1434)
+++ ri/trunk/webbeans-ri/src/test/resources/log4j.xml 2009-02-07 00:16:25 UTC (rev 1435)
@@ -3,7 +3,6 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="Target" value="System.out"/>
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
17 years, 2 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1434 - in tck/trunk/impl/src/main: java/org/jboss/webbeans/tck/unit/definition/deployment and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-02-06 17:19:56 -0500 (Fri, 06 Feb 2009)
New Revision: 1434
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Deer_Broken.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java
tck/trunk/impl/src/main/resources/tck-unit-tests.xml
Log:
Reduced number of remaining stubs; implemented one more test for stereotype tests.
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-06 21:28:34 UTC (rev 1433)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-06 22:19:56 UTC (rev 1434)
@@ -39,7 +39,7 @@
order.getBindings().iterator().next().annotationType().equals(Production.class);
}
- @Test(groups = { "stub", "annotationDefinition", "underInvestigation" })
+ @Test(groups = { "annotationDefinition", "underInvestigation" })
@SpecAssertion(section = "2.3.2", id = "unknown")
public void testBindingHasCorrectTarget()
{
@@ -49,7 +49,7 @@
assert false;
}
- @Test(groups = { "stub", "annotationDefinition", "underInvestigation" })
+ @Test(groups = { "annotationDefinition", "underInvestigation" })
@SpecAssertion(section = "2.3.2", id = "unknown")
public void testBindingHasCorrectRetention()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-06 21:28:34 UTC (rev 1433)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-06 22:19:56 UTC (rev 1434)
@@ -52,7 +52,7 @@
*
* TODO This text is not really a testable assertion
*/
- @Test(groups = { "stub", "annotationDefinition", "deploymentType" })
+ @Test(groups = { "underInvestigation", "annotationDefinition", "deploymentType" })
@SpecAssertion(section = "2.5.2", id = "unknown")
public void testDeploymentTypeHasCorrectTarget()
{
@@ -65,7 +65,7 @@
*
* TODO This text is not really a testable assertion
*/
- @Test(groups = { "stub", "annotationDefinition", "deploymentType" })
+ @Test(groups = { "underInvestigation", "annotationDefinition", "deploymentType" })
@SpecAssertion(section = "2.5.2", id = "unknown")
public void testDeploymentTypeHasCorrectRetention()
{
@@ -78,7 +78,7 @@
*
* TODO This text is not really a testable assertion
*/
- @Test(groups = { "stub", "annotationDefinition", "deploymentType" })
+ @Test(groups = { "underInvestigation", "annotationDefinition", "deploymentType" })
@SpecAssertion(section = "2.5.2", id = "unknown")
public void testDeploymentTypeDeclaresDeploymentTypeAnnotation()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-06 21:28:34 UTC (rev 1433)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-06 22:19:56 UTC (rev 1434)
@@ -26,21 +26,27 @@
assert mullet.getScopeType().equals(AnotherScopeType.class);
}
- @Test(groups={"stub", "annotationDefinition"})
+ @Test(groups={"underInvestigation", "annotationDefinition"})
@SpecAssertion(section="2.4.2", id = "unknown")
public void testScopeTypeHasCorrectTarget()
{
assert false;
}
- @Test(groups={"stub", "annotationDefinition"})
+ /**
+ * TODO This is not really a testable assertion
+ */
+ @Test(groups={"underInvestigation", "annotationDefinition"})
@SpecAssertion(section="2.4.2", id = "unknown")
public void testScopeTypeHasCorrectRetention()
{
assert false;
}
- @Test(groups={"stub", "annotationDefinition"})
+ /**
+ * TODO If a scope has no scope type annotation, then it is not a scope and cannot be tested
+ */
+ @Test(groups={"underInvestigation", "annotationDefinition"})
@SpecAssertion(section="2.4.2", id = "unknown")
public void testScopeTypeDeclaresScopeTypeAnnotation()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-02-06 21:28:34 UTC (rev 1433)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/ApplicationScopedHornedMammalStereotype.java 2009-02-06 22:19:56 UTC (rev 1434)
@@ -9,6 +9,7 @@
import javax.annotation.Stereotype;
import javax.context.ApplicationScoped;
+@ApplicationScoped
@Stereotype(supportedScopes=ApplicationScoped.class)
@Target( { TYPE })
@Retention(RUNTIME)
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Deer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Deer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Deer_Broken.java 2009-02-06 22:19:56 UTC (rev 1434)
@@ -0,0 +1,8 @@
+package org.jboss.webbeans.tck.unit.definition.stereotype;
+
+@ApplicationScopedHornedMammalStereotype
+@SessionScopedHornedMammalStereotype
+public class Deer_Broken
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/Deer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-06 21:28:34 UTC (rev 1433)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-06 22:19:56 UTC (rev 1434)
@@ -32,21 +32,30 @@
return deploymentTypes;
}
- @Test(groups = { "stub", "annotationDefinition" }, expectedExceptions = DefinitionException.class)
+ /**
+ * TODO Difficult to test since all user defined stereotypes are not known here
+ */
+ @Test(groups = { "underInvestigation", "annotationDefinition" })
@SpecAssertion(section = "2.7.1", id = "unknown")
public void testHasCorrectTarget()
{
assert false;
}
- @Test(groups = { "stub", "annotationDefinition" }, expectedExceptions = DefinitionException.class)
+ /**
+ * TODO Difficult to test since all user defined stereotypes are not known here
+ */
+ @Test(groups = { "underInvestigation", "annotationDefinition" }, expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "2.7.1", id = "unknown")
public void testHasCorrectRetention()
{
assert false;
}
- @Test(groups = { "stub", "annotationDefinition" }, expectedExceptions = DefinitionException.class)
+ /**
+ * TODO If the stereotype does not have a stereotype annotation, then it isn't one and is difficult to test
+ */
+ @Test(groups = { "underInvestigation", "annotationDefinition" })
@SpecAssertion(section = "2.7.1", id = "unknown")
public void testHasStereotypeAnnotation()
{
@@ -156,14 +165,14 @@
deployBeans(Goat_Broken.class);
}
- @Test(expectedExceptions = DefinitionException.class, groups = "stub")
+ @Test(expectedExceptions = DefinitionException.class)
@SpecAssertions({
@SpecAssertion(section = "2.7.2", id = "unknown"),
@SpecAssertion(section = "2.7.4", id = "unknown")
})
public void testMultipleStereotypesWithMultipleScopeTypes()
{
- assert false;
+ deployBeans(Deer_Broken.class);
}
@Test(groups = { "stub", "webbeansxml" })
Modified: tck/trunk/impl/src/main/resources/tck-unit-tests.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-unit-tests.xml 2009-02-06 21:28:34 UTC (rev 1433)
+++ tck/trunk/impl/src/main/resources/tck-unit-tests.xml 2009-02-06 22:19:56 UTC (rev 1434)
@@ -30,6 +30,7 @@
-->
<exclude name="stub" />
<exclude name="broken" />
+ <exclude name="underInvestigation" />
</run>
</groups>
<packages>
17 years, 2 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1433 - in tck/trunk/impl/src/test/java/org/jboss/webbeans/tck: impl/test and 18 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-06 16:28:34 -0500 (Fri, 06 Feb 2009)
New Revision: 1433
Added:
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/InContainerTestRunnerTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/AbstractArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/Cow.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/DummyTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/DummyArtifact.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/Cow.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/DummyTest.java
Removed:
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/InContainerTestRunnerTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/Cow.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/ArtifactScannerTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/DummyArtifact.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/subpackage/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Cow.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyEjbTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Fox.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/pests/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyCustomWebXmlTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java
Log:
repackage tests
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/InContainerTestRunnerTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/InContainerTestRunnerTest.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/InContainerTestRunnerTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,66 +0,0 @@
-package org.jboss.webbeans.tck.impl.test;
-
-import java.io.InputStream;
-import java.lang.annotation.Annotation;
-import java.util.List;
-
-import javax.inject.manager.Manager;
-
-import org.jboss.webbeans.tck.api.TestSuite;
-import org.jboss.webbeans.tck.impl.InContainerTestRunner;
-import org.jboss.webbeans.tck.spi.Containers;
-
-public class InContainerTestRunnerTest
-{
-
- private static class MockInContainerTestRunner extends InContainerTestRunner
- {
-
- public MockInContainerTestRunner(TestSuite testSuite, Containers containers)
- {
- super(testSuite, containers);
- // TODO Auto-generated constructor stub
- }
-
- }
-
- private static class MockContainers implements Containers
- {
-
- public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, InputStream archive)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Manager deploy(InputStream archive)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- }
-
- //@Test
- public void testRunner()
- {
- TestSuite testSuite = new TestSuite();
- testSuite.setWriteDeployedArchivesToDisk(true);
- testSuite.setDeploymentDelay(0);
- MockInContainerTestRunner runner = new MockInContainerTestRunner(testSuite, new MockContainers());
- runner.run();
- }
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,112 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.Arrays;
-
-public abstract class AbstractArtifactTest
-{
-
- protected static final FilenameFilter WEB_INF_FILTER = new FilenameFilter()
- {
- public boolean accept(File dir, String name)
- {
- return name.equals("WEB-INF");
- }
- };
-
- protected static final FilenameFilter CLASSES_FILTER = new FilenameFilter()
- {
- public boolean accept(File dir, String name)
- {
- return name.equals("classes");
- }
- };
-
- protected static final FilenameFilter META_INF_FILTER = new FilenameFilter()
- {
- public boolean accept(File dir, String name)
- {
- return name.equals("META-INF");
- }
- };
-
- protected static final FilenameFilter BEANS_XML_FILTER = new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.equals("beans.xml");
- }
-
- };
-
-
-
- protected static final FilenameFilter WEB_XML_FILTER = new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.equals("web.xml");
- }
-
- };
-
- protected File getCurrentPackageAsFile(File root)
- {
- return getPackageAsFile(getClass().getPackage(), root);
- }
-
- protected File getPackageAsFile(Package pkg, File root)
- {
- String[] packageHierarchy = pkg.getName().split("\\.");
- for (final String packageName : packageHierarchy)
- {
- File[] files = root.listFiles(new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.equals(packageName);
- }
-
- });
- if (files.length == 1)
- {
- root = files[0];
- }
- else
- {
- throw new IllegalStateException("Unable to traverse package hierarchy " + Arrays.asList(packageHierarchy) + ", unable to open directory " + packageName);
- }
- }
- return root;
- }
-
- protected String readFile(File file) throws IOException
- {
- if (file.isFile())
- {
- Reader reader = new InputStreamReader(new BufferedInputStream(new FileInputStream(file)));
- StringBuffer buffer = new StringBuffer(1024);
- char[] bytes = new char[1024];
- while (reader.read(bytes) > -1)
- {
- buffer.append(String.valueOf(bytes));
- }
- reader.close();
- return buffer.toString();
- }
- else
- {
- return null;
- }
- }
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,26 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging;
-
-import java.io.File;
-
-import org.jboss.webbeans.tck.AbstractTest;
-import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor;
-import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
-import org.jboss.webbeans.tck.impl.util.Reflections;
-import org.jboss.webbeans.tck.literals.NewLiteral;
-import org.testng.annotations.Test;
-
-public class ArtifactTest extends AbstractArtifactTest
-{
-
- @Test
- public void testDefaultTCKArtifact() throws Exception
- {
- ArtifactDescriptor artifactDescriptor = new TCKArtifactDescriptor(null, null);
- File root = artifactDescriptor.getExplodedJar();
- assert getPackageAsFile(Reflections.class.getPackage(), root).listFiles().length > 0;
- assert getPackageAsFile(NewLiteral.class.getPackage(), root).listFiles().length > 0;
- assert getPackageAsFile(AbstractTest.class.getPackage(), root).listFiles().length > 0;
- }
-
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/Cow.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/Cow.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/Cow.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging;
-
-class Cow
-{
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/ArtifactScannerTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/ArtifactScannerTest.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/ArtifactScannerTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,24 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.artifactScanner;
-
-import java.util.Set;
-
-import org.jboss.webbeans.tck.impl.packaging.ArtifactScanner;
-import org.jboss.webbeans.tck.impl.test.packaging.artifactScanner.subpackage.AnotherDummyArtifact;
-import org.jboss.webbeans.tck.impl.test.packaging.artifactScanner.subpackage.NotAnArtifact;
-import org.testng.annotations.Test;
-
-public class ArtifactScannerTest
-{
-
- @Test
- public void testScanner()
- {
- ArtifactScanner scanner = new ArtifactScanner(ArtifactScannerTest.class.getPackage().getName());
- Set<Class<?>> classes = scanner.getClasses();
- assert classes.contains(DummyArtifact.class);
- assert classes.contains(AnotherDummyArtifact.class);
- assert !classes.contains(NotAnArtifact.class);
- }
-
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/DummyArtifact.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/DummyArtifact.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/DummyArtifact.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.artifactScanner;
-
-import org.jboss.webbeans.tck.impl.packaging.Artifact;
-
-@Artifact
-public class DummyArtifact
-{
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/ArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/ArtifactTest.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,144 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.webbeans.tck.impl.packaging.DeclarativeArtifactProcessor;
-import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
-import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest;
-import org.testng.annotations.Test;
-
-public class ArtifactTest extends AbstractArtifactTest
-{
-
- @Test
- public void testDefaultDeclartiveArtifact() throws Exception
- {
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, true);
- TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
- assert !artifact.isEjbs();
- assert artifact.isUnit();
- File root = artifact.getExplodedJar();
- File currentPackage = getCurrentPackageAsFile(root);
- File[] cowClasses = currentPackage.listFiles(new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.equals("Cow.class");
- }
-
- });
- assert cowClasses.length == 1;
- assert cowClasses[0].getName().equals("Cow.class");
- assert cowClasses[0].isFile();
- File[] foxClasses = currentPackage.listFiles(new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.equals("Fox.class");
- }
-
- });
- assert foxClasses.length == 1;
- assert foxClasses[0].getName().equals("Fox.class");
- assert foxClasses[0].isFile();
-
- File[] testClasses = currentPackage.listFiles(new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.startsWith("DummyTest");
- }
-
- });
- assert testClasses.length == 1;
-
- assert root.listFiles(META_INF_FILTER).length == 1;
- File metaInf = root.listFiles(META_INF_FILTER)[0];
- assert metaInf.listFiles().length == 1;
- assert metaInf.listFiles(BEANS_XML_FILTER).length == 1;
- assert metaInf.listFiles(BEANS_XML_FILTER)[0].length() == 0;
- }
-
- @Test
- public void testClassesSpecifiedArtifact() throws Exception
- {
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyClassesSpecifiedTest.class, true);
- TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
- File root = artifact.getExplodedJar();
- File currentPackage = getCurrentPackageAsFile(root);
- assert currentPackage.listFiles().length == 1;
- File[] pestPackages = currentPackage.listFiles(new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.startsWith("pests");
- }
-
- });
- assert pestPackages.length == 1;
- File pestPackage = pestPackages[0];
- assert pestPackage.listFiles().length == 1;
- assert pestPackage.listFiles()[0].getName().equals("Rat.class");
- }
-
- @Test
- public void testResourcesSpecifiedArtifact() throws Exception
- {
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyResourcesSpecifiedTest.class, false);
- TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
- File root = artifact.getExplodedJar();
- assert root.listFiles(META_INF_FILTER).length == 1;
- File metaInf = root.listFiles(META_INF_FILTER)[0];
- assert metaInf.listFiles().length == 2;
- assert metaInf.listFiles(new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.equals("bar.xml");
- }
-
- }).length == 1;
- }
-
- @Test
- public void testIntegrationTestDeclartiveArtifact() throws Exception
- {
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyIntegrationTest.class, false);
- assert !declarativeArtifactProcessor.getArtifact().isUnit();
- }
-
- @Test
- public void testCustomBeansXml() throws Exception
- {
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyCustomBeansXmlTest.class, false);
- TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
- File root = artifact.getExplodedJar();
- assert root.listFiles(META_INF_FILTER).length == 1;
- File metaInf = root.listFiles(META_INF_FILTER)[0];
- assert metaInf.listFiles().length == 1;
- assert metaInf.listFiles(BEANS_XML_FILTER).length == 1;
- assert metaInf.listFiles(BEANS_XML_FILTER)[0].length() != 0;
- String beans = readFile(metaInf.listFiles(BEANS_XML_FILTER)[0]);
- assert beans.startsWith("<my></my>");
- }
-
- //@Test
- public void testEjbTestDeclartiveArtifact() throws Exception
- {
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyEjbTest.class, false);
- assert declarativeArtifactProcessor.getArtifact().isEjbs();
- }
-
- @Test(expectedExceptions=IllegalArgumentException.class)
- public void testWrongPackaging()
- {
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyWarUnitTest_Broken.class, false);
- }
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Cow.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Cow.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Cow.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified;
-
-class Cow
-{
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,18 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified;
-
-import org.jboss.webbeans.tck.impl.packaging.Artifact;
-import org.jboss.webbeans.tck.impl.packaging.Classes;
-import org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified.pests.Rat;
-
-
-@Artifact(addCurrentPackage=false)
-(a)Classes(Rat.class)
-class DummyClassesSpecifiedTest
-{
-
- public void test()
- {
- assert true;
- }
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,16 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified;
-
-import org.jboss.webbeans.tck.impl.packaging.Artifact;
-import org.jboss.webbeans.tck.impl.packaging.jsr299.BeansXml;
-
-
-@Artifact @BeansXml(value="my-web-beans.xml")
-class DummyCustomBeansXmlTest
-{
-
- public void test()
- {
- assert true;
- }
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyEjbTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyEjbTest.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyEjbTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,15 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified;
-
-import org.jboss.webbeans.tck.impl.packaging.EjbArtifact;
-
-
-@EjbArtifact
-class DummyEjbTest
-{
-
- public void test()
- {
- assert true;
- }
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,17 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified;
-
-import org.jboss.webbeans.tck.impl.packaging.Artifact;
-import org.jboss.webbeans.tck.impl.packaging.IntegrationTest;
-
-
-@Artifact
-@IntegrationTest
-class DummyIntegrationTest
-{
-
- public void test()
- {
- assert true;
- }
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,18 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified;
-
-import org.jboss.webbeans.tck.impl.packaging.Artifact;
-import org.jboss.webbeans.tck.impl.packaging.Resource;
-import org.jboss.webbeans.tck.impl.packaging.Resources;
-
-
-@Artifact(addCurrentPackage=false)
-@Resources(value=@Resource(destination = "/META-INF/bar.xml", source="foo/foo.xml"))
-class DummyResourcesSpecifiedTest
-{
-
- public void test()
- {
- assert true;
- }
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyTest.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,15 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified;
-
-import org.jboss.webbeans.tck.impl.packaging.Artifact;
-
-
-@Artifact
-class DummyTest
-{
-
- public void test()
- {
- assert true;
- }
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,18 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified;
-
-import org.jboss.webbeans.tck.impl.packaging.Artifact;
-import org.jboss.webbeans.tck.impl.packaging.Packaging;
-import org.jboss.webbeans.tck.impl.packaging.PackagingType;
-
-
-@Artifact
-(a)Packaging(PackagingType.WAR)
-class DummyWarUnitTest_Broken
-{
-
- public void test()
- {
- assert true;
- }
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Fox.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Fox.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Fox.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified;
-
-class Fox
-{
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,46 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.subpackages;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor;
-import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest;
-import org.testng.annotations.Test;
-
-public class ArtifactTest extends AbstractArtifactTest
-{
-
- @Test
- public void testAllClassesInPackageAndNotSubPackages() throws Exception
- {
- ArtifactDescriptor artifactDescriptor = new ArtifactDescriptor(null);
- artifactDescriptor.addPackage(ArtifactTest.class.getPackage());
- File root = artifactDescriptor.getExplodedJar();
- File currentPackage = getCurrentPackageAsFile(root);
- assert currentPackage.listFiles().length == 4;
- File[] cowClasses = currentPackage.listFiles(new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.equals("Cow.class");
- }
-
- });
- assert cowClasses.length == 1;
- assert cowClasses[0].getName().equals("Cow.class");
- assert cowClasses[0].isFile();
-
- File[] testClasses = currentPackage.listFiles(new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.startsWith("ArtifactTest");
- }
-
- });
- assert testClasses.length == 3;
- }
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java 2009-02-06 21:25:39 UTC (rev 1432)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.subpackages;
-
-class Cow
-{
-
-}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/InContainerTestRunnerTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/InContainerTestRunnerTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/InContainerTestRunnerTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/InContainerTestRunnerTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,66 @@
+package org.jboss.webbeans.tck.test.impl;
+
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.util.List;
+
+import javax.inject.manager.Manager;
+
+import org.jboss.webbeans.tck.api.TestSuite;
+import org.jboss.webbeans.tck.impl.InContainerTestRunner;
+import org.jboss.webbeans.tck.spi.Containers;
+
+public class InContainerTestRunnerTest
+{
+
+ private static class MockInContainerTestRunner extends InContainerTestRunner
+ {
+
+ public MockInContainerTestRunner(TestSuite testSuite, Containers containers)
+ {
+ super(testSuite, containers);
+ // TODO Auto-generated constructor stub
+ }
+
+ }
+
+ private static class MockContainers implements Containers
+ {
+
+ public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, InputStream archive)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Manager deploy(InputStream archive)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ }
+
+ //@Test
+ public void testRunner()
+ {
+ TestSuite testSuite = new TestSuite();
+ testSuite.setWriteDeployedArchivesToDisk(true);
+ testSuite.setDeploymentDelay(0);
+ MockInContainerTestRunner runner = new MockInContainerTestRunner(testSuite, new MockContainers());
+ runner.run();
+ }
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/InContainerTestRunnerTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/AbstractArtifactTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/AbstractArtifactTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/AbstractArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,112 @@
+package org.jboss.webbeans.tck.test.impl.packaging;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Arrays;
+
+public abstract class AbstractArtifactTest
+{
+
+ protected static final FilenameFilter WEB_INF_FILTER = new FilenameFilter()
+ {
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("WEB-INF");
+ }
+ };
+
+ protected static final FilenameFilter CLASSES_FILTER = new FilenameFilter()
+ {
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("classes");
+ }
+ };
+
+ protected static final FilenameFilter META_INF_FILTER = new FilenameFilter()
+ {
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("META-INF");
+ }
+ };
+
+ protected static final FilenameFilter BEANS_XML_FILTER = new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("web-beans.xml");
+ }
+
+ };
+
+
+
+ protected static final FilenameFilter WEB_XML_FILTER = new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("web.xml");
+ }
+
+ };
+
+ protected File getCurrentPackageAsFile(File root)
+ {
+ return getPackageAsFile(getClass().getPackage(), root);
+ }
+
+ protected File getPackageAsFile(Package pkg, File root)
+ {
+ String[] packageHierarchy = pkg.getName().split("\\.");
+ for (final String packageName : packageHierarchy)
+ {
+ File[] files = root.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.equals(packageName);
+ }
+
+ });
+ if (files.length == 1)
+ {
+ root = files[0];
+ }
+ else
+ {
+ throw new IllegalStateException("Unable to traverse package hierarchy " + Arrays.asList(packageHierarchy) + ", unable to open directory " + packageName);
+ }
+ }
+ return root;
+ }
+
+ protected String readFile(File file) throws IOException
+ {
+ if (file.isFile())
+ {
+ Reader reader = new InputStreamReader(new BufferedInputStream(new FileInputStream(file)));
+ StringBuffer buffer = new StringBuffer(1024);
+ char[] bytes = new char[1024];
+ while (reader.read(bytes) > -1)
+ {
+ buffer.append(String.valueOf(bytes));
+ }
+ reader.close();
+ return buffer.toString();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/AbstractArtifactTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/ArtifactTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/ArtifactTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,44 @@
+package org.jboss.webbeans.tck.test.impl.packaging;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+
+import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor;
+import org.jboss.webbeans.tck.impl.packaging.war.WarArtifactDescriptor;
+import org.testng.annotations.Test;
+
+public class ArtifactTest extends AbstractArtifactTest
+{
+
+ @Test
+ public void testDefaultTCKArtifact() throws Exception
+ {
+ ArtifactDescriptor artifactDescriptor = new WarArtifactDescriptor(DummyTest.class, null);
+ File root = artifactDescriptor.getExplodedJar();
+ File tckSupportJar = new File(root, "WEB-INF/lib/tck-support.jar");
+ assert tckSupportJar.exists();
+ assert tckSupportJar.isFile();
+ JarInputStream is = new JarInputStream(new FileInputStream(tckSupportJar));
+ JarEntry entry;
+ List<String> fileNames = new ArrayList<String>();
+ while ((entry = is.getNextJarEntry()) != null)
+ {
+ fileNames.add(entry.getName());
+ }
+ assert fileNames.contains("org/jboss/webbeans/tck/impl/util/Reflections.class");
+ assert fileNames.contains("org/jboss/webbeans/tck/literals/NewLiteral.class");
+ assert fileNames.contains("org/jboss/webbeans/tck/AbstractTest.class");
+ assert fileNames.contains("org/jboss/webbeans/tck/impl/WebBeansTCKImpl.class");
+ assert fileNames.contains("org/jboss/webbeans/tck/impl/packaging/ArtifactDescriptor.class");
+ assert fileNames.contains("org/jboss/webbeans/tck/impl/packaging/jsr299/TCKArtifactDescriptor.class");
+ assert fileNames.contains("org/jboss/webbeans/tck/impl/packaging/war/WarArtifactDescriptor.class");
+ assert fileNames.contains("org/jboss/webbeans/tck/runner/TestRunner.class");
+ assert fileNames.contains("org/jboss/webbeans/tck/runner/servlet/ServletTestRunner.class");
+ }
+
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/ArtifactTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/Cow.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/Cow.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/Cow.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/Cow.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging;
+
+class Cow
+{
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/Cow.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/DummyTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/DummyTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/DummyTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging;
+
+public class DummyTest
+{
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/DummyTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all)
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,59 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.all;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor;
-import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest;
-import org.testng.annotations.Test;
-
-public class ArtifactTest extends AbstractArtifactTest
-{
-
- @Test
- public void testAllClassesInPackage() throws Exception
- {
- ArtifactDescriptor artifactDescriptor = new ArtifactDescriptor(null);
- artifactDescriptor.addPackage(ArtifactTest.class.getPackage());
- File root = artifactDescriptor.getExplodedJar();
- File currentPackage = getCurrentPackageAsFile(root);
- assert currentPackage.listFiles().length == 6;
- File[] cowClasses = currentPackage.listFiles(new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.equals("Cow.class");
- }
-
- });
- assert cowClasses.length == 1;
- assert cowClasses[0].getName().equals("Cow.class");
- assert cowClasses[0].isFile();
- File[] foxClasses = currentPackage.listFiles(new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.equals("Fox.class");
- }
-
- });
- assert foxClasses.length == 1;
- assert foxClasses[0].getName().equals("Fox.class");
- assert foxClasses[0].isFile();
-
- File[] testClasses = currentPackage.listFiles(new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.startsWith("ArtifactTest");
- }
-
- });
- assert testClasses.length == 4;
-
- }
-
-}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,59 @@
+package org.jboss.webbeans.tck.test.impl.packaging.all;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor;
+import org.jboss.webbeans.tck.test.impl.packaging.AbstractArtifactTest;
+import org.testng.annotations.Test;
+
+public class ArtifactTest extends AbstractArtifactTest
+{
+
+ @Test
+ public void testAllClassesInPackage() throws Exception
+ {
+ ArtifactDescriptor artifactDescriptor = new ArtifactDescriptor(null);
+ artifactDescriptor.addPackage(ArtifactTest.class.getPackage());
+ File root = artifactDescriptor.getExplodedJar();
+ File currentPackage = getCurrentPackageAsFile(root);
+ assert currentPackage.listFiles().length == 6;
+ File[] cowClasses = currentPackage.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("Cow.class");
+ }
+
+ });
+ assert cowClasses.length == 1;
+ assert cowClasses[0].getName().equals("Cow.class");
+ assert cowClasses[0].isFile();
+ File[] foxClasses = currentPackage.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("Fox.class");
+ }
+
+ });
+ assert foxClasses.length == 1;
+ assert foxClasses[0].getName().equals("Fox.class");
+ assert foxClasses[0].isFile();
+
+ File[] testClasses = currentPackage.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.startsWith("ArtifactTest");
+ }
+
+ });
+ assert testClasses.length == 4;
+
+ }
+
+}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Cow.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.all;
-
-class Cow
-{
-
-}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Cow.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging.all;
+
+class Cow
+{
+
+}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Fox.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.all;
-
-class Fox
-{
-
-}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Fox.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging.all;
+
+class Fox
+{
+
+}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/ArtifactScannerTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,24 @@
+package org.jboss.webbeans.tck.test.impl.packaging.artifactScanner;
+
+import java.util.Set;
+
+import org.jboss.webbeans.tck.impl.packaging.ArtifactScanner;
+import org.jboss.webbeans.tck.test.impl.packaging.artifactScanner.subpackage.AnotherDummyArtifact;
+import org.jboss.webbeans.tck.test.impl.packaging.artifactScanner.subpackage.NotAnArtifact;
+import org.testng.annotations.Test;
+
+public class ArtifactScannerTest
+{
+
+ @Test
+ public void testScanner()
+ {
+ ArtifactScanner scanner = new ArtifactScanner(ArtifactScannerTest.class.getPackage().getName());
+ Set<Class<?>> classes = scanner.getClasses();
+ assert classes.contains(DummyArtifact.class);
+ assert classes.contains(AnotherDummyArtifact.class);
+ assert !classes.contains(NotAnArtifact.class);
+ }
+
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/DummyArtifact.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/DummyArtifact.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/DummyArtifact.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/DummyArtifact.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.test.impl.packaging.artifactScanner;
+
+import org.jboss.webbeans.tck.impl.packaging.Artifact;
+
+@Artifact
+public class DummyArtifact
+{
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/DummyArtifact.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/subpackage)
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.artifactScanner.subpackage;
-
-import org.jboss.webbeans.tck.impl.packaging.Artifact;
-
-@Artifact
-public class AnotherDummyArtifact
-{
-
-}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.test.impl.packaging.artifactScanner.subpackage;
+
+import org.jboss.webbeans.tck.impl.packaging.Artifact;
+
+@Artifact
+public class AnotherDummyArtifact
+{
+
+}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/subpackage/NotAnArtifact.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.artifactScanner.subpackage;
-
-public class NotAnArtifact
-{
-
-}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/subpackage/NotAnArtifact.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging.artifactScanner.subpackage;
+
+public class NotAnArtifact
+{
+
+}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/ArtifactTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,142 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.webbeans.tck.impl.packaging.DeclarativeArtifactProcessor;
+import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
+import org.jboss.webbeans.tck.test.impl.packaging.AbstractArtifactTest;
+import org.testng.annotations.Test;
+
+public class ArtifactTest extends AbstractArtifactTest
+{
+
+ @Test
+ public void testDefaultDeclartiveArtifact() throws Exception
+ {
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, true);
+ TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
+ assert !artifact.isEjbs();
+ assert artifact.isUnit();
+ File root = artifact.getExplodedJar();
+ File currentPackage = getCurrentPackageAsFile(root);
+ File[] cowClasses = currentPackage.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("Cow.class");
+ }
+
+ });
+ assert cowClasses.length == 1;
+ assert cowClasses[0].getName().equals("Cow.class");
+ assert cowClasses[0].isFile();
+ File[] foxClasses = currentPackage.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("Fox.class");
+ }
+
+ });
+ assert foxClasses.length == 1;
+ assert foxClasses[0].getName().equals("Fox.class");
+ assert foxClasses[0].isFile();
+
+ File[] testClasses = currentPackage.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.startsWith("DummyTest");
+ }
+
+ });
+ assert testClasses.length == 1;
+
+ assert root.listFiles(META_INF_FILTER).length == 1;
+ File metaInf = root.listFiles(META_INF_FILTER)[0];
+ assert metaInf.listFiles().length == 2;
+ assert metaInf.listFiles(BEANS_XML_FILTER).length == 1;
+ assert metaInf.listFiles(BEANS_XML_FILTER)[0].length() == 0;
+ }
+
+ @Test
+ public void testClassesSpecifiedArtifact() throws Exception
+ {
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyClassesSpecifiedTest.class, true);
+ TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
+ File root = artifact.getExplodedJar();
+ File currentPackage = getCurrentPackageAsFile(root);
+ assert currentPackage.listFiles().length == 1;
+ File[] pestPackages = currentPackage.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.startsWith("pests");
+ }
+
+ });
+ assert pestPackages.length == 1;
+ File pestPackage = pestPackages[0];
+ assert pestPackage.listFiles().length == 1;
+ assert pestPackage.listFiles()[0].getName().equals("Rat.class");
+ }
+
+ @Test
+ public void testResourcesSpecifiedArtifact() throws Exception
+ {
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyResourcesSpecifiedTest.class, false);
+ TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
+ File root = artifact.getExplodedJar();
+ assert root.listFiles(META_INF_FILTER).length == 1;
+ File metaInf = root.listFiles(META_INF_FILTER)[0];
+ assert metaInf.listFiles().length == 1;
+ assert metaInf.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("bar.xml");
+ }
+
+ }).length == 1;
+ }
+
+ @Test
+ public void testIntegrationTestDeclartiveArtifact() throws Exception
+ {
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyIntegrationTest.class, false);
+ assert !declarativeArtifactProcessor.getArtifact().isUnit();
+ }
+
+ @Test
+ public void testCustomBeansXml() throws Exception
+ {
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyCustomBeansXmlTest.class, false);
+ TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
+ File root = artifact.getExplodedJar();
+ File webInf = root.listFiles(WEB_INF_FILTER)[0];
+ assert webInf.listFiles(BEANS_XML_FILTER).length == 1;
+ assert webInf.listFiles(BEANS_XML_FILTER)[0].length() != 0;
+ String beans = readFile(webInf.listFiles(BEANS_XML_FILTER)[0]);
+ assert beans.startsWith("<my></my>");
+ }
+
+ //@Test
+ public void testEjbTestDeclartiveArtifact() throws Exception
+ {
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyEjbTest.class, false);
+ assert declarativeArtifactProcessor.getArtifact().isEjbs();
+ }
+
+ @Test(expectedExceptions=IllegalArgumentException.class)
+ public void testWrongPackaging()
+ {
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyWarUnitTest_Broken.class, false);
+ }
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Cow.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified;
+
+class Cow
+{
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,18 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified;
+
+import org.jboss.webbeans.tck.impl.packaging.Artifact;
+import org.jboss.webbeans.tck.impl.packaging.Classes;
+import org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified.pests.Rat;
+
+
+@Artifact(addCurrentPackage=false)
+(a)Classes(Rat.class)
+class DummyClassesSpecifiedTest
+{
+
+ public void test()
+ {
+ assert true;
+ }
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified;
+
+import org.jboss.webbeans.tck.impl.packaging.Artifact;
+import org.jboss.webbeans.tck.impl.packaging.jsr299.BeansXml;
+
+
+@Artifact @BeansXml(value="my-web-beans.xml")
+class DummyCustomBeansXmlTest
+{
+
+ public void test()
+ {
+ assert true;
+ }
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyEjbTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified;
+
+import org.jboss.webbeans.tck.impl.packaging.EjbArtifact;
+
+
+@EjbArtifact
+class DummyEjbTest
+{
+
+ public void test()
+ {
+ assert true;
+ }
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,17 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified;
+
+import org.jboss.webbeans.tck.impl.packaging.Artifact;
+import org.jboss.webbeans.tck.impl.packaging.IntegrationTest;
+
+
+@Artifact
+@IntegrationTest
+class DummyIntegrationTest
+{
+
+ public void test()
+ {
+ assert true;
+ }
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,18 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified;
+
+import org.jboss.webbeans.tck.impl.packaging.Artifact;
+import org.jboss.webbeans.tck.impl.packaging.Resource;
+import org.jboss.webbeans.tck.impl.packaging.Resources;
+
+
+@Artifact(addCurrentPackage=false)
+@Resources(value=@Resource(destination = "/META-INF/bar.xml", source="foo/foo.xml"))
+class DummyResourcesSpecifiedTest
+{
+
+ public void test()
+ {
+ assert true;
+ }
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified;
+
+import org.jboss.webbeans.tck.impl.packaging.Artifact;
+
+
+@Artifact
+class DummyTest
+{
+
+ public void test()
+ {
+ assert true;
+ }
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,18 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified;
+
+import org.jboss.webbeans.tck.impl.packaging.Artifact;
+import org.jboss.webbeans.tck.impl.packaging.Packaging;
+import org.jboss.webbeans.tck.impl.packaging.PackagingType;
+
+
+@Artifact
+(a)Packaging(PackagingType.WAR)
+class DummyWarUnitTest_Broken
+{
+
+ public void test()
+ {
+ assert true;
+ }
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Fox.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified;
+
+class Fox
+{
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/pests)
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/pests/Rat.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified.pests;
-
-public class Rat
-{
-
-}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/pests/Rat.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified.pests;
+
+public class Rat
+{
+
+}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war)
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/ArtifactTest.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,49 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.war;
-
-import java.io.File;
-
-import org.jboss.webbeans.tck.impl.packaging.DeclarativeArtifactProcessor;
-import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
-import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest;
-import org.testng.annotations.Test;
-
-public class ArtifactTest extends AbstractArtifactTest
-{
-
- @Test
- public void testDefaultWebXml() throws Exception
- {
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, false);
- TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
- File root = artifact.getExplodedJar();
- assert root.listFiles(WEB_INF_FILTER).length == 1;
- File webInf = root.listFiles(WEB_INF_FILTER)[0];
- assert webInf.getName().equals("WEB-INF");
- assert webInf.isDirectory();
- assert webInf.listFiles().length == 2;
- assert webInf.listFiles(WEB_XML_FILTER).length == 1;
- File webXml = webInf.listFiles(WEB_XML_FILTER)[0];
- assert webXml.isFile();
- assert webXml.getName().equals("web.xml");
- assert webXml.length() != 0;
- }
-
- @Test
- public void testCustomWebXml() throws Exception
- {
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyCustomWebXmlTest.class, false);
- TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
- File root = artifact.getExplodedJar();
- assert root.listFiles(WEB_INF_FILTER).length == 1;
- File webInf = root.listFiles(WEB_INF_FILTER)[0];
- assert webInf.getName().equals("WEB-INF");
- assert webInf.isDirectory();
- assert webInf.listFiles().length == 2;
- assert webInf.listFiles(WEB_XML_FILTER).length == 1;
- File webXml = webInf.listFiles(WEB_XML_FILTER)[0];
- assert webXml.isFile();
- assert webXml.getName().equals("web.xml");
- assert readFile(webXml).startsWith("<web></web>");
- }
-
-}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/ArtifactTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,30 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.war;
+
+import java.io.File;
+
+import org.jboss.webbeans.tck.impl.packaging.DeclarativeArtifactProcessor;
+import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
+import org.jboss.webbeans.tck.test.impl.packaging.AbstractArtifactTest;
+import org.testng.annotations.Test;
+
+public class ArtifactTest extends AbstractArtifactTest
+{
+
+ @Test
+ public void testDefaultWebXml() throws Exception
+ {
+ DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, false);
+ TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
+ File root = artifact.getExplodedJar();
+ assert root.listFiles(WEB_INF_FILTER).length == 1;
+ File webInf = root.listFiles(WEB_INF_FILTER)[0];
+ assert webInf.getName().equals("WEB-INF");
+ assert webInf.isDirectory();
+ assert webInf.listFiles(WEB_XML_FILTER).length == 1;
+ File webXml = webInf.listFiles(WEB_XML_FILTER)[0];
+ assert webXml.isFile();
+ assert webXml.getName().equals("web.xml");
+ assert webXml.length() != 0;
+ }
+
+}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/Cow.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.war;
-
-class Cow
-{
-
-}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/Cow.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.war;
+
+class Cow
+{
+
+}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyCustomWebXmlTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/DummyCustomWebXmlTest.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyCustomWebXmlTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,22 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.war;
-
-import org.jboss.webbeans.tck.impl.packaging.Artifact;
-import org.jboss.webbeans.tck.impl.packaging.IntegrationTest;
-import org.jboss.webbeans.tck.impl.packaging.Packaging;
-import org.jboss.webbeans.tck.impl.packaging.PackagingType;
-import org.jboss.webbeans.tck.impl.packaging.war.WebXml;
-
-
-@Artifact
-@IntegrationTest
-(a)Packaging(PackagingType.WAR)
-@WebXml("my-web.xml")
-class DummyCustomWebXmlTest
-{
-
- public void test()
- {
- assert true;
- }
-
-}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/DummyTest.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,20 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.war;
-
-import org.jboss.webbeans.tck.impl.packaging.Artifact;
-import org.jboss.webbeans.tck.impl.packaging.IntegrationTest;
-import org.jboss.webbeans.tck.impl.packaging.Packaging;
-import org.jboss.webbeans.tck.impl.packaging.PackagingType;
-
-
-@Artifact
-@IntegrationTest
-(a)Packaging(PackagingType.WAR)
-class DummyTest
-{
-
- public void test()
- {
- assert true;
- }
-
-}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/DummyTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.war;
+
+import org.jboss.webbeans.tck.impl.packaging.Artifact;
+import org.jboss.webbeans.tck.impl.packaging.IntegrationTest;
+import org.jboss.webbeans.tck.impl.packaging.Packaging;
+import org.jboss.webbeans.tck.impl.packaging.PackagingType;
+
+
+@Artifact
+@IntegrationTest
+(a)Packaging(PackagingType.WAR)
+class DummyTest
+{
+
+ public void test()
+ {
+ assert true;
+ }
+
+}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/Fox.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.war;
-
-class Fox
-{
-
-}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/Fox.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.war;
+
+class Fox
+{
+
+}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/ArtifactTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/ArtifactTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,46 @@
+package org.jboss.webbeans.tck.test.impl.packaging.subpackages;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor;
+import org.jboss.webbeans.tck.test.impl.packaging.AbstractArtifactTest;
+import org.testng.annotations.Test;
+
+public class ArtifactTest extends AbstractArtifactTest
+{
+
+ @Test
+ public void testAllClassesInPackageAndNotSubPackages() throws Exception
+ {
+ ArtifactDescriptor artifactDescriptor = new ArtifactDescriptor(null);
+ artifactDescriptor.addPackage(ArtifactTest.class.getPackage());
+ File root = artifactDescriptor.getExplodedJar();
+ File currentPackage = getCurrentPackageAsFile(root);
+ assert currentPackage.listFiles().length == 4;
+ File[] cowClasses = currentPackage.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("Cow.class");
+ }
+
+ });
+ assert cowClasses.length == 1;
+ assert cowClasses[0].getName().equals("Cow.class");
+ assert cowClasses[0].isFile();
+
+ File[] testClasses = currentPackage.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.startsWith("ArtifactTest");
+ }
+
+ });
+ assert testClasses.length == 3;
+ }
+
+}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/Cow.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/Cow.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/Cow.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging.subpackages;
+
+class Cow
+{
+
+}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests)
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests/Fox.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.subpackages.pests;
-
-class Fox
-{
-
-}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests/Fox.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging.subpackages.pests;
+
+class Fox
+{
+
+}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war)
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/ArtifactTest.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,87 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.war;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-
-import org.jboss.webbeans.tck.impl.packaging.war.WarArtifactDescriptor;
-import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest;
-import org.testng.annotations.Test;
-
-public class ArtifactTest extends AbstractArtifactTest
-{
- @Test
- public void testDefaultWar() throws Exception
- {
- WarArtifactDescriptor war = new WarArtifactDescriptor(null, null, null);
- war.getClasses().add(Cow.class);
- File root = war.getExplodedJar();
- assert root.listFiles().length == 2;
- assert root.isDirectory();
- assert root.listFiles(WEB_INF_FILTER).length == 1;
- File metaInf = root.listFiles(META_INF_FILTER)[0];
- assert metaInf.getName().equals("META-INF");
- assert metaInf.isDirectory();
- assert metaInf.listFiles().length == 1;
- assert metaInf.listFiles(BEANS_XML_FILTER).length == 1;
- File beansXml = metaInf.listFiles(BEANS_XML_FILTER)[0];
- assert beansXml.isFile();
- assert beansXml.getName().equals("beans.xml");
- assert beansXml.length() == 0;
- File webInf = root.listFiles(WEB_INF_FILTER)[0];
- assert webInf.getName().equals("WEB-INF");
- assert webInf.isDirectory();
- assert webInf.listFiles().length == 2;
- assert webInf.listFiles(WEB_XML_FILTER).length == 1;
- File webXml = webInf.listFiles(WEB_XML_FILTER)[0];
- assert webXml.isFile();
- assert webXml.getName().equals("web.xml");
- assert webXml.length() != 0;
- File currentPackage = getCurrentPackageAsFile(root);
- File[] cowClasses = currentPackage.listFiles(new FilenameFilter()
- {
-
- public boolean accept(File dir, String name)
- {
- return name.equals("Cow.class");
- }
-
- });
- assert cowClasses.length == 1;
- assert cowClasses[0].getName().equals("Cow.class");
- assert cowClasses[0].isFile();
- }
-
-
- @Test
- public void testJarProduction() throws Exception
- {
- WarArtifactDescriptor war = new WarArtifactDescriptor(null, null, null);
- war.getClasses().add(Cow.class);
- JarInputStream is = new JarInputStream(war.getJar());
- JarEntry entry;
- List<String> fileNames = new ArrayList<String>();
- while ((entry = is.getNextJarEntry()) != null)
- {
- fileNames.add(entry.getName());
- }
- assert fileNames.contains("META-INF/beans.xml");
- assert fileNames.contains("WEB-INF/web.xml");
- assert fileNames.contains("WEB-INF/classes/org/jboss/webbeans/tck/impl/test/packaging/war/Cow.class");
- assert fileNames.contains("WEB-INF/classes/org/jboss/webbeans/tck/AbstractTest.class");
- assert fileNames.contains("WEB-INF/classes/org/jboss/webbeans/tck/impl/util/Reflections.class");
- }
-
- @Override
- protected File getPackageAsFile(Package pkg, File root)
- {
- root = root.listFiles(WEB_INF_FILTER)[0];
- root = root.listFiles(CLASSES_FILTER)[0];
- return super.getPackageAsFile(pkg, root);
- }
-
-}
-
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/ArtifactTest.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,100 @@
+package org.jboss.webbeans.tck.test.impl.packaging.war;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+
+import org.jboss.webbeans.tck.AbstractTest;
+import org.jboss.webbeans.tck.impl.packaging.war.WarArtifactDescriptor;
+import org.jboss.webbeans.tck.test.impl.packaging.AbstractArtifactTest;
+import org.testng.annotations.Test;
+
+public class ArtifactTest extends AbstractArtifactTest
+{
+ @Test
+ public void testDefaultWar() throws Exception
+ {
+ WarArtifactDescriptor war = new WarArtifactDescriptor(DummyTest.class, null);
+ war.getClasses().add(Cow.class);
+ File root = war.getExplodedJar();
+ assert root.listFiles().length == 1;
+ assert root.isDirectory();
+ assert root.listFiles(WEB_INF_FILTER).length == 1;
+ File webInf = root.listFiles(WEB_INF_FILTER)[0];
+ assert webInf.getName().equals("WEB-INF");
+ assert webInf.isDirectory();
+ assert webInf.listFiles().length == 4;
+ assert webInf.listFiles(WEB_XML_FILTER).length == 1;
+ File webXml = webInf.listFiles(WEB_XML_FILTER)[0];
+ assert webXml.isFile();
+ assert webXml.getName().equals("web.xml");
+ assert webXml.length() != 0;
+ File beansXml = webInf.listFiles(BEANS_XML_FILTER)[0];
+ assert beansXml.isFile();
+ assert beansXml.getName().equals("web-beans.xml");
+ assert beansXml.length() == 0;
+ File currentPackage = getCurrentPackageAsFile(root);
+ File[] cowClasses = currentPackage.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("Cow.class");
+ }
+
+ });
+ assert cowClasses.length == 1;
+ assert cowClasses[0].getName().equals("Cow.class");
+ assert cowClasses[0].isFile();
+ File tckPackage = getPackageAsFile(AbstractTest.class.getPackage(), root);
+ File[] abstractTestClasses = tckPackage.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("AbstractTest.class");
+ }
+
+ });
+ File webInfLib = new File(webInf, "lib");
+ assert webInfLib.isDirectory();
+ assert webInfLib.list().length == 3;
+ List<String> libs = Arrays.asList(webInfLib.list());
+ assert libs.contains("jsr-299-tck-api.jar");
+ assert libs.contains("testng.jar");
+ assert libs.contains("tck-support.jar");
+ }
+
+
+ @Test
+ public void testJarProduction() throws Exception
+ {
+ WarArtifactDescriptor war = new WarArtifactDescriptor(DummyTest.class, null);
+ war.getClasses().add(Cow.class);
+ JarInputStream is = new JarInputStream(war.getJar());
+ JarEntry entry;
+ List<String> fileNames = new ArrayList<String>();
+ while ((entry = is.getNextJarEntry()) != null)
+ {
+ fileNames.add(entry.getName());
+ }
+ assert fileNames.contains("WEB-INF/web-beans.xml");
+ assert fileNames.contains("WEB-INF/web.xml");
+ assert fileNames.contains("WEB-INF/classes/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.class");
+ assert fileNames.contains("WEB-INF/lib/tck-support.jar");
+ }
+
+ @Override
+ protected File getPackageAsFile(Package pkg, File root)
+ {
+ root = root.listFiles(WEB_INF_FILTER)[0];
+ root = root.listFiles(CLASSES_FILTER)[0];
+ return super.getPackageAsFile(pkg, root);
+ }
+
+}
+
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/Cow.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -1,6 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.war;
-
-class Cow
-{
-
-}
Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/Cow.java)
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging.war;
+
+class Cow
+{
+
+}
Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/DummyTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/DummyTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/DummyTest.java 2009-02-06 21:28:34 UTC (rev 1433)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.test.impl.packaging.war;
+
+public class DummyTest
+{
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/DummyTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 2 months
- 1
- 0