cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r709636 - in /cxf/branches/2.1.x-fixes: ./ rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js
Date Sat, 01 Nov 2008 03:38:26 GMT
Author: ningjiang
Date: Fri Oct 31 20:38:26 2008
New Revision: 709636

URL: http://svn.apache.org/viewvc?rev=709636&view=rev
Log:
Merged revisions 708044 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r708044 | bimargulies | 2008-10-27 05:20:56 +0800 (Mon, 27 Oct 2008) | 2 lines
  
  Unit test that really tests inherited properties in Javascript.
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
    cxf/branches/2.1.x-fixes/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 31 20:38:26 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,709353-709354
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,709353-709354

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java?rev=709636&r1=709635&r2=709636&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
Fri Oct 31 20:38:26 2008
@@ -237,6 +237,12 @@
         testUtilities.runInsideContext(Void.class, new JSRunnable<Void>() {
 
             public Void run(Context context) {
+                Notifier notifier = testUtilities.rhinoCallConvert("testInheritance", Notifier.class,
+                                                                   testUtilities.javaToJS(getAddress()));
+                boolean notified = notifier.waitForJavascript(1000 * 10);
+                assertTrue(notified);
+                SimpleDocLitWrappedImpl impl = (SimpleDocLitWrappedImpl)rawImplementor;
+                assertEquals("less", impl.getLastInheritanceTestDerived().getName());
                 return null;
             }
             

Modified: cxf/branches/2.1.x-fixes/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js?rev=709636&r1=709635&r2=709636&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js
(original)
+++ cxf/branches/2.1.x-fixes/rt/javascript/src/test/resources/org/apache/cxf/javascript/DocLitWrappedTests.js
Fri Oct 31 20:38:26 2008
@@ -131,7 +131,7 @@
 	derived.setId(33);
 	derived.setDerived("arrived");
 	derived.setName("less");
-	intf.inheritanceTestFunction(derived);
+	intf.inheritanceTestFunction(test1SuccessCallback, test1ErrorCallback, derived);
 
 	return globalNotifier;
 }
\ No newline at end of file



Mime
View raw message