axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kei...@apache.org
Subject svn commit: r519865 - in /webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj: SOAPBodyTest.java SOAPFactoryTest.java SOAPPartTest.java
Date Mon, 19 Mar 2007 07:46:13 GMT
Author: keithc
Date: Mon Mar 19 00:46:13 2007
New Revision: 519865

URL: http://svn.apache.org/viewvc?view=rev&rev=519865
Log:
Removing JDK 1.5 code with help from Sumedha 

Modified:
    webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java
    webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFactoryTest.java
    webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java

Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java?view=diff&rev=519865&r1=519864&r2=519865
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java
(original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java
Mon Mar 19 00:46:13 2007
@@ -167,7 +167,7 @@
                 getContents(iter2, indent + " ");
             } else {
                 text = (Text) node;
-                assertNotNull(text.getTextContent());
+                assertNotNull(text);
             }
         }
     }

Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFactoryTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFactoryTest.java?view=diff&rev=519865&r1=519864&r2=519865
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFactoryTest.java
(original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFactoryTest.java
Mon Mar 19 00:46:13 2007
@@ -144,9 +144,10 @@
     		SOAPElement se1 = sf.createElement(qname);
     		//Create second SOAPElement from first SOAPElement
     		SOAPElement se2 = sf.createElement(se1);
-    		if(!se1.isEqualNode(se2) && !se1.isSameNode(se2)) {
-    			fail("The SOAPElement's are not equal and not the same (unexpected)");
-    		}
+            //commented to support jdk 1.4 build
+            //    		if(!se1.isEqualNode(se2) && !se1.isSameNode(se2)) {
+            //    			fail("The SOAPElement's are not equal and not the same (unexpected)");
+            //    		}
     		if(!se1.getNodeName().equals(se2.getNodeName()) || !se1.getNamespaceURI().equals(
     				se2.getNamespaceURI())) {
     			fail("Got: <URI="+se1.getNamespaceURI()+", PREFIX="+
@@ -178,7 +179,7 @@
     			reason += (String)i.next();
     		}
     		assertNotNull(reason);
-    		assertTrue(reason.contains("This is the fault reason."));
+    		assertTrue(reason.indexOf("This is the fault reason.") > -1);
     		assertTrue(fc.equals(SOAPConstants.SOAP_RECEIVER_FAULT));
     	} catch(SOAPException e) {
     		fail("Caught unexpected SOAPException");
@@ -202,7 +203,7 @@
     		}
     		System.out.println("Actual ReasonText="+reason);
     		assertNotNull(reason);
-    		assertTrue(reason.contains("This is the fault reason."));
+    		assertTrue(reason.indexOf("This is the fault reason.") > -1);
     		assertTrue(fc.equals(SOAPConstants.SOAP_RECEIVER_FAULT));
     	} catch(SOAPException e) {
     		//Caught expected SOAPException

Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java?view=diff&rev=519865&r1=519864&r2=519865
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java
(original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java
Mon Mar 19 00:46:13 2007
@@ -182,8 +182,8 @@
             
             SOAPPart sp = message.getSOAPPart();
 
-            String inputEncoding = sp.getInputEncoding();
-            assertNotNull(inputEncoding);
+//            String inputEncoding = sp.getInputEncoding();
+//            assertNotNull(inputEncoding);
         } catch (Exception e) {
             fail("Unexpected Exception " + e);
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message