You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2014/04/30 15:21:51 UTC

git commit: - Resolved some of the problems in the test-suite that were related to invalid test-data (Some tests were missing properties in the xml input). - Fixed a problem not copying the i18n resources in the normal build.

Repository: flex-blazeds
Updated Branches:
  refs/heads/master 85f1b0487 -> 089523d22


- Resolved some of the problems in the test-suite that were related to invalid test-data (Some tests were missing properties in the xml input).
- Fixed a problem not copying the i18n resources in the normal build.

Note: The remaining failing tests seem to try to connect to a server running on localhost:8400 ... guess we will have to do some config-magic in order to have these test pass (Option: Change these tests into integration tests and have them get executed against a local tomcat deployment using the maven cargo plugin)


Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/089523d2
Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/089523d2
Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/089523d2

Branch: refs/heads/master
Commit: 089523d2261355d503563a5857c09fc1404cc013
Parents: 85f1b04
Author: cdutz <ch...@c-ware.de>
Authored: Wed Apr 30 15:21:41 2014 +0200
Committer: cdutz <ch...@c-ware.de>
Committed: Wed Apr 30 15:21:41 2014 +0200

----------------------------------------------------------------------
 modules/common/pom.xml                                       | 8 ++++++++
 modules/core/pom.xml                                         | 4 ++++
 modules/core/test/src/flex/messaging/io/amfx/date_tag/4d.xml | 3 +++
 .../core/test/src/flex/messaging/io/amfx/double_tag/5b.xml   | 2 ++
 .../core/test/src/flex/messaging/io/amfx/double_tag/5d.xml   | 3 +++
 .../src/flex/messaging/io/amfx/double_tag/Confirm5b.java     | 1 -
 .../core/test/src/flex/messaging/io/amfx/false_tag/6d.xml    | 2 +-
 modules/core/test/src/flex/messaging/io/amfx/int_tag/8b.xml  | 2 ++
 modules/core/test/src/flex/messaging/io/amfx/int_tag/8d.xml  | 3 +++
 modules/core/test/src/flex/messaging/io/amfx/null_tag/9d.xml | 2 +-
 .../core/test/src/flex/messaging/io/amfx/string_tag/11d.xml  | 3 +++
 .../core/test/src/flex/messaging/io/amfx/true_tag/13d.xml    | 2 +-
 .../test/src/flex/messaging/io/amfx/undefined_tag/14d.xml    | 2 +-
 .../src/flex/messaging/services/AbstractServiceTest.java     | 3 +--
 14 files changed, 33 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/common/pom.xml
----------------------------------------------------------------------
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 7588b2f..83a4777 100755
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -47,6 +47,14 @@ limitations under the License.
 	<build>
 		<finalName>flex-messaging-common</finalName>
 		<sourceDirectory>src</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                </includes>
+            </resource>
+        </resources>
 	</build>
 
 </project>

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 8c3555c..00bb179 100755
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -79,6 +79,10 @@ limitations under the License.
         <testResources>
             <testResource>
                 <directory>test/src</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                    <include>**/*.xsd</include>
+                </includes>
             </testResource>
         </testResources>
 		<plugins>

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/core/test/src/flex/messaging/io/amfx/date_tag/4d.xml
----------------------------------------------------------------------
diff --git a/modules/core/test/src/flex/messaging/io/amfx/date_tag/4d.xml b/modules/core/test/src/flex/messaging/io/amfx/date_tag/4d.xml
index f57b740..cd4ef06 100755
--- a/modules/core/test/src/flex/messaging/io/amfx/date_tag/4d.xml
+++ b/modules/core/test/src/flex/messaging/io/amfx/date_tag/4d.xml
@@ -32,6 +32,9 @@
                 <string>prop8</string>
                 <string>prop9</string>
             </traits>
+
+            <date>1119647239994</date>
+
             <date>1119647239994  </date>
 
             <!-- Both sides with spaces -->

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/core/test/src/flex/messaging/io/amfx/double_tag/5b.xml
----------------------------------------------------------------------
diff --git a/modules/core/test/src/flex/messaging/io/amfx/double_tag/5b.xml b/modules/core/test/src/flex/messaging/io/amfx/double_tag/5b.xml
index 87b31b2..2195fa9 100755
--- a/modules/core/test/src/flex/messaging/io/amfx/double_tag/5b.xml
+++ b/modules/core/test/src/flex/messaging/io/amfx/double_tag/5b.xml
@@ -34,6 +34,8 @@
                 <string>prop10</string>
             </traits>
 
+            <double>-1.7976931348623157e+308</double>
+
             <double>-4.9E-324</double>
 
             <!-- 0 -->

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/core/test/src/flex/messaging/io/amfx/double_tag/5d.xml
----------------------------------------------------------------------
diff --git a/modules/core/test/src/flex/messaging/io/amfx/double_tag/5d.xml b/modules/core/test/src/flex/messaging/io/amfx/double_tag/5d.xml
index d740f8d..96fdc76 100755
--- a/modules/core/test/src/flex/messaging/io/amfx/double_tag/5d.xml
+++ b/modules/core/test/src/flex/messaging/io/amfx/double_tag/5d.xml
@@ -32,6 +32,9 @@
                 <string>prop8</string>
                 <string>prop9</string>
             </traits>
+
+            <double>-1.000001</double>
+
             <double>2.2  </double>
 
             <!-- Both sides with spaces -->

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/core/test/src/flex/messaging/io/amfx/double_tag/Confirm5b.java
----------------------------------------------------------------------
diff --git a/modules/core/test/src/flex/messaging/io/amfx/double_tag/Confirm5b.java b/modules/core/test/src/flex/messaging/io/amfx/double_tag/Confirm5b.java
index 020bfec..45aeb9e 100755
--- a/modules/core/test/src/flex/messaging/io/amfx/double_tag/Confirm5b.java
+++ b/modules/core/test/src/flex/messaging/io/amfx/double_tag/Confirm5b.java
@@ -39,7 +39,6 @@ public class Confirm5b extends DeserializationConfirmation
         aso.put("prop3", new Double(0.0));
         aso.put("prop4", new Double(Double.MIN_VALUE)); // 4.9e-324
         aso.put("prop5", new Double(Double.MAX_VALUE)); // 1.7976931348623157e+308
-
         aso.put("prop6", new Double(Double.NaN));
         aso.put("prop7", new Double(Double.POSITIVE_INFINITY));
         aso.put("prop8", new Double(Double.NEGATIVE_INFINITY));

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/core/test/src/flex/messaging/io/amfx/false_tag/6d.xml
----------------------------------------------------------------------
diff --git a/modules/core/test/src/flex/messaging/io/amfx/false_tag/6d.xml b/modules/core/test/src/flex/messaging/io/amfx/false_tag/6d.xml
index a30109d..e8268b4 100755
--- a/modules/core/test/src/flex/messaging/io/amfx/false_tag/6d.xml
+++ b/modules/core/test/src/flex/messaging/io/amfx/false_tag/6d.xml
@@ -22,7 +22,7 @@
         <array length="7">
             <false benign="true"  />
             <false   />
-            <false
+            <false></false>
             <false>     	 </false>
             <false   	 >
 

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/core/test/src/flex/messaging/io/amfx/int_tag/8b.xml
----------------------------------------------------------------------
diff --git a/modules/core/test/src/flex/messaging/io/amfx/int_tag/8b.xml b/modules/core/test/src/flex/messaging/io/amfx/int_tag/8b.xml
index 098d86f..1659419 100755
--- a/modules/core/test/src/flex/messaging/io/amfx/int_tag/8b.xml
+++ b/modules/core/test/src/flex/messaging/io/amfx/int_tag/8b.xml
@@ -26,6 +26,8 @@
                 <string>prop2</string>
             </traits>
 
+            <int>-2147483648</int>
+
             <int>0</int>
 
             <!-- int.MAX_VALUE -->

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/core/test/src/flex/messaging/io/amfx/int_tag/8d.xml
----------------------------------------------------------------------
diff --git a/modules/core/test/src/flex/messaging/io/amfx/int_tag/8d.xml b/modules/core/test/src/flex/messaging/io/amfx/int_tag/8d.xml
index 52198e8..2224ec1 100755
--- a/modules/core/test/src/flex/messaging/io/amfx/int_tag/8d.xml
+++ b/modules/core/test/src/flex/messaging/io/amfx/int_tag/8d.xml
@@ -32,6 +32,9 @@
                 <string>prop8</string>
                 <string>prop9</string>
             </traits>
+
+            <int>-1</int>
+
             <int>2  </int>
 
             <!-- Both sides with spaces -->

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/core/test/src/flex/messaging/io/amfx/null_tag/9d.xml
----------------------------------------------------------------------
diff --git a/modules/core/test/src/flex/messaging/io/amfx/null_tag/9d.xml b/modules/core/test/src/flex/messaging/io/amfx/null_tag/9d.xml
index f398c04..614927a 100755
--- a/modules/core/test/src/flex/messaging/io/amfx/null_tag/9d.xml
+++ b/modules/core/test/src/flex/messaging/io/amfx/null_tag/9d.xml
@@ -22,7 +22,7 @@
         <array length="7">
             <null benign="true"  />
             <null   />
-            <null
+            <null></null>
             <null>     	 </null>
             <null   	 >
 

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/core/test/src/flex/messaging/io/amfx/string_tag/11d.xml
----------------------------------------------------------------------
diff --git a/modules/core/test/src/flex/messaging/io/amfx/string_tag/11d.xml b/modules/core/test/src/flex/messaging/io/amfx/string_tag/11d.xml
index 1cc5a26..0181563 100755
--- a/modules/core/test/src/flex/messaging/io/amfx/string_tag/11d.xml
+++ b/modules/core/test/src/flex/messaging/io/amfx/string_tag/11d.xml
@@ -32,6 +32,9 @@
                 <string>prop8</string>
                 <string>prop9</string>
             </traits>
+
+            <string>  Alpha</string>
+
             <string>Beta  </string>
 
             <!-- Both sides with spaces -->

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/core/test/src/flex/messaging/io/amfx/true_tag/13d.xml
----------------------------------------------------------------------
diff --git a/modules/core/test/src/flex/messaging/io/amfx/true_tag/13d.xml b/modules/core/test/src/flex/messaging/io/amfx/true_tag/13d.xml
index 17c17da..ad3650e 100755
--- a/modules/core/test/src/flex/messaging/io/amfx/true_tag/13d.xml
+++ b/modules/core/test/src/flex/messaging/io/amfx/true_tag/13d.xml
@@ -22,7 +22,7 @@
         <array length="7">
             <true benign="true"  />
             <true   />
-            <true
+            <true></true>
             <true>     	 </true>
             <true   	 >
 

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/core/test/src/flex/messaging/io/amfx/undefined_tag/14d.xml
----------------------------------------------------------------------
diff --git a/modules/core/test/src/flex/messaging/io/amfx/undefined_tag/14d.xml b/modules/core/test/src/flex/messaging/io/amfx/undefined_tag/14d.xml
index 1ba3805..747bfed 100755
--- a/modules/core/test/src/flex/messaging/io/amfx/undefined_tag/14d.xml
+++ b/modules/core/test/src/flex/messaging/io/amfx/undefined_tag/14d.xml
@@ -22,7 +22,7 @@
         <array length="7">
             <undefined benign="true"  />
             <undefined   />
-            <undefined
+            <undefined></undefined>
             <undefined>     	 </undefined>
             <undefined   	 >
 

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/089523d2/modules/core/test/src/flex/messaging/services/AbstractServiceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/test/src/flex/messaging/services/AbstractServiceTest.java b/modules/core/test/src/flex/messaging/services/AbstractServiceTest.java
index 815f482..0398022 100755
--- a/modules/core/test/src/flex/messaging/services/AbstractServiceTest.java
+++ b/modules/core/test/src/flex/messaging/services/AbstractServiceTest.java
@@ -32,9 +32,8 @@ import flex.messaging.config.ChannelSettings;
 import flex.messaging.config.ConfigurationConstants;
 import flex.messaging.config.ConfigurationException;
 import flex.messaging.messages.AsyncMessage;
-import flex.messaging.messages.Message;
 
-public class AbstractServiceTest extends TestCase
+public abstract class AbstractServiceTest extends TestCase
 {
     protected AbstractService service;
     protected MessageBroker broker;