Fixes for wildfly-10 sipservlet arquillian managed container

RestComm · Apr 16, 2018 · 582f83b · 582f83b
1 parent f2f4cd0
commit 582f83b
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 7 deletions.
diff --git a/restcomm-connect-root.iml b/restcomm-connect-root.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
diff --git a/restcomm/restcomm.testsuite/pom.xml b/restcomm/restcomm.testsuite/pom.xml
@@ -374,6 +374,8 @@
                                     <classifier>assembly</classifier>
                                 </artifactItem>
                             </artifactItems>
+                            <includes>**/**</includes>
+                            <excludes>**/mobicents-dar.properties, **/click2call.**, **/media-jsr309-servlet.**, **/websockets-sip-servlet.**</excludes>
                         </configuration>
                     </execution>
                 </executions>
@@ -452,6 +454,32 @@
                     <redirectTestOutputToFile>false</redirectTestOutputToFile>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dar-file</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.basedir}/target/dependency/restcomm-sip-servlets-3.2.0-89-wildfly-10.0.0.Final/standalone/configuration/dars/</outputDirectory>
+                            <overwrite>true</overwrite>
+                            <resources>
+                                <resource>
+                                    <directory>${project.basedir}/src/test/resources</directory>
+                                    <includes>
+                                        <include>mobicents-dar.properties</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <profiles>

diff --git a/...rc/test/java/org/restcomm/connect/testsuite/telephony/ua/UserAgentManagerWithSBCTest.java b/...rc/test/java/org/restcomm/connect/testsuite/telephony/ua/UserAgentManagerWithSBCTest.java
@@ -38,7 +38,7 @@
 import org.cafesip.sipunit.SipPhone;
 import org.cafesip.sipunit.SipRequest;
 import org.cafesip.sipunit.SipStack;
-import org.jboss.arquillian.container.mss.extension.SipStackTool;
+import org.restcomm.connect.testsuite.SipStackTool;
 import org.jboss.arquillian.container.test.api.Deployer;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;

diff --git a/restcomm/restcomm.testsuite/src/test/resources/arquillian.xml b/restcomm/restcomm.testsuite/src/test/resources/arquillian.xml
@@ -10,19 +10,19 @@
         <configuration>
             <property name="enableAssertions">false</property>
             <property name="outputToConsole">true</property>
-            <property name="serverConfig">standalone-sip.xml</property>           
+            <property name="serverConfig">standalone-sip.xml</property>
         </configuration>
     </container>
-    
+
     <container qualifier="wildfly10-remote" default="false">
         <configuration>
-            <property name="managementAddress">localhost</property>             
+            <property name="managementAddress">localhost</property>
             <property name="managementPort">9990</property>
             <property name="outputToConsole">true</property>
             <property name="serverConfig">standalone-sip.xml</property>
             <property name="javaVmArguments">-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=y -Dorg.jboss.server.bootstrap.maxThreads=1
-            </property>            
+            </property>
         </configuration>
-    </container>    
-        
+    </container>
+
 </arquillian>
diff --git a/restcomm/restcomm.testsuite/src/test/resources/mobicents-dar.properties b/restcomm/restcomm.testsuite/src/test/resources/mobicents-dar.properties
@@ -0,0 +1,2 @@
+#Application Router Configuration
+ALL=("RestComm","DAR\:From","ORIGINATING","","NO_ROUTE","0")