svn commit: r756431 - in /camel/trunk/components/camel-script: pom.xml src/test/java/org/apache/camel/builder/script/Jsr223Test.java

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r756431 - in /camel/trunk/components/camel-script: pom.xml src/test/java/org/apache/camel/builder/script/Jsr223Test.java

janstey-3
Author: janstey
Date: Fri Mar 20 12:33:12 2009
New Revision: 756431

URL: http://svn.apache.org/viewvc?rev=756431&view=rev
Log:
CAMEL-1030 - Enable Ruby scripting tests on IBM JDK as JRuby 1.2 fixes contains the fix for JRUBY-3073

Modified:
    camel/trunk/components/camel-script/pom.xml
    camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java

Modified: camel/trunk/components/camel-script/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/pom.xml?rev=756431&r1=756430&r2=756431&view=diff
==============================================================================
--- camel/trunk/components/camel-script/pom.xml (original)
+++ camel/trunk/components/camel-script/pom.xml Fri Mar 20 12:33:12 2009
@@ -183,7 +183,7 @@
                     <childDelegation>false</childDelegation>
                     <useFile>true</useFile>
                     <includes>
-                        <include>**/*XXXX.*</include>
+                        <include>**/*Test.*</include>
                     </includes>
                     <!-- TODO: beanshell doesnt work on java 5 yet with the bsh-engine we got in pom right now -->
                     <excludes>
@@ -195,38 +195,4 @@
         </plugins>
     </build>
     
-    <profiles>
-      <profile>
-        <id>on-ibmjdk</id>
-        <activation>
-          <property>
-            <name>java.vendor</name>
-            <value>IBM Corporation</value>
-          </property>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <forkMode>pertest</forkMode>
-                        <childDelegation>false</childDelegation>
-                        <useFile>true</useFile>
-                        <includes>
-                            <include>**/*Test.*</include>
-                        </includes>
-                        <!-- TODO: beanshell doesnt work on java 5 yet with the bsh-engine we got in pom right now -->
-                        <!-- TODO: Ruby scripting doesn't work on IBM's JDK
-                                   See http://jira.codehaus.org/browse/JRUBY-3073 -->
-                        <excludes>
-                            <exclude>**/BeanShellScriptRouteTest.*</exclude>
-                            <exclude>**/BeanShellFilterTest.*</exclude>
-                            <exclude>**/Ruby*Test.*</exclude>
-                        </excludes>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </build>
-      </profile>
-    </profiles>    
 </project>

Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java?rev=756431&r1=756430&r2=756431&view=diff
==============================================================================
--- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java (original)
+++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java Fri Mar 20 12:33:12 2009
@@ -32,15 +32,8 @@
     private String [] scriptNames = {"beanshell", "groovy", "js", "python", "ruby", "javascript"};
 
     public void testLanguageNames() throws Exception {
-        // ruby scripting does not work on IBM's JDK
-        // see http://jira.codehaus.org/browse/JRUBY-3073
-        ArrayList<String> scriptNamesAsList = new ArrayList<String>(Arrays.asList(scriptNames));      
-        if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
-            scriptNamesAsList.remove("ruby");
-        }
-        
         ScriptEngineManager manager = new ScriptEngineManager();
-        for (String scriptName : scriptNamesAsList) {
+        for (String scriptName : scriptNames) {
             ScriptEngine engine = manager.getEngineByName(scriptName);
             assertNotNull("We should get the script engine for " + scriptName , engine);
         }