cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r596469 - in /incubator/cxf/trunk/rt/javascript/src/test: java/org/apache/cxf/javascript/JsHttpRequestTest.java resources/logging.properties
Date Mon, 19 Nov 2007 22:36:29 GMT
Author: bimargulies
Date: Mon Nov 19 14:36:28 2007
New Revision: 596469

URL: http://svn.apache.org/viewvc?rev=596469&view=rev
Log:
By pushing all the testing into one @Test, avoid all the crazyness with engine restart issues.

Modified:
    incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
    incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties

Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java?rev=596469&r1=596468&r2=596469&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
(original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
Mon Nov 19 14:36:28 2007
@@ -38,7 +38,6 @@
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.context.support.GenericApplicationContext;
 
-
 /**
  * 
  */
@@ -77,20 +76,15 @@
         testUtilities.readResourceIntoRhino("/org/apache/cxf/javascript/XMLHttpRequestTests.js");
     }
     
+    
+    // just one test function to avoid muddles with engine startup/shutdown
     @Test
-    public void testInvalidURI() throws Exception {
+    public void runTests() throws Exception {
         testUtilities.rhinoCallExpectingException("SYNTAX_ERR", "testOpaqueURI");
         testUtilities.rhinoCallExpectingException("SYNTAX_ERR", "testNonAbsolute");
         testUtilities.rhinoCallExpectingException("SYNTAX_ERR", "testNonHttp");
-    }
-    
-    @Test
-    public void testSequencing() throws Exception {
         testUtilities.rhinoCallExpectingException("INVALID_STATE_ERR", "testSendNotOpenError");
         testUtilities.rhinoCall("testStateNotificationSync");
-    }
-    
-    @Test public void testAsync() throws Exception {
         Notifier notifier = testUtilities.rhinoCallConvert("testAsyncHttpFetch1", Notifier.class);
         testUtilities.rhinoCall("testAsyncHttpFetch2");
         boolean notified = notifier.waitForJavascript(10);
@@ -109,22 +103,12 @@
                      testUtilities.rhinoEvaluateConvert("asyncStatusText", String.class));
         assertTrue("headers", testUtilities.rhinoEvaluateConvert("asyncResponseHeaders",
String.class)
                    .contains("Content-Type: text/html"));
-    }
-
-    @Test
-    public void testSyncHttpFetch() throws Exception {
-        setupRhino();
         Object httpObj = testUtilities.rhinoCall("testSyncHttpFetch");
         assertNotNull(httpObj);
         assertTrue(httpObj instanceof String);
         String httpResponse = (String) httpObj;
         // check for 'Shalom' in Hebrew as a charset check.
         assertTrue(httpResponse.contains("\u05e9\u05dc\u05d5\u05dd"));
-    }
-    
-    @org.junit.Ignore
-    @Test
-    public void testSyncWebServiceInteraction() throws Exception {
         Reader r = getResourceAsReader("/org/apache/cxf/javascript/XML_GreetMeDocLiteralReq.xml");
         StringWriter writer = new StringWriter();
         char[] buffer = new char[1024];

Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties?rev=596469&r1=596468&r2=596469&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties Mon Nov 19 14:36:28
2007
@@ -24,3 +24,4 @@
 java.util.logging.ConsoleHandler.level = INFO
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 org.apache.cxf.javascript.level=FINE
+org.apache.cxf.test.AbstractCXFSpringTest.level=FINE



Mime
View raw message