[Comsuite-svn] SF.net SVN: comsuite: [203] trunk/code/CSTests/src/org/commsuite/sap/ SAPCommTest.java

[<ma...@us...>]

Revision: 203
          http://svn.sourceforge.net/comsuite/?rev=203&view=rev
Author:   marasm
Date:     2006-10-05 06:44:06 -0700 (Thu, 05 Oct 2006)

Log Message:
-----------
test fixed

Modified Paths:
--------------
    trunk/code/CSTests/src/org/commsuite/sap/SAPCommTest.java

Modified: trunk/code/CSTests/src/org/commsuite/sap/SAPCommTest.java
===================================================================
--- trunk/code/CSTests/src/org/commsuite/sap/SAPCommTest.java	2006-10-05 13:34:14 UTC (rev 202)
+++ trunk/code/CSTests/src/org/commsuite/sap/SAPCommTest.java	2006-10-05 13:44:06 UTC (rev 203)
@@ -26,6 +26,7 @@
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
+import java.util.Enumeration;
 import java.util.Properties;
 
 import org.commsuite.model.SAPInstanceDef;
@@ -54,11 +55,6 @@
         this.properties.put(JCO_CLIENT_PREFIX + "user", this.exampleValidInstance.getUser());
         this.properties.put(JCO_CLIENT_PREFIX + "passwd", this.exampleValidInstance.getPassword());
 
-//        if (null != this.exampleValidInstance.getLanguage()) {
-//            this.properties
-//                    .put(JCO_CLIENT_PREFIX + "lang", this.exampleValidInstance.getLanguage());
-//        }
-
         if (this.exampleValidInstance.isLoadBalancing()) {
             this.properties
                     .put(JCO_CLIENT_PREFIX + "r3name", this.exampleValidInstance.getR3name());
@@ -80,6 +76,8 @@
         this.properties.put(JCO_SERVER_PREFIX + "progid", this.exampleValidInstance.getProgid());
         this.properties.put(JCO_SERVER_PREFIX + "unicode",
                 this.exampleValidInstance.isUnicode() ? "1" : "0");
+        this.properties.put(JCO_CLIENT_PREFIX + "unicode",
+                this.exampleValidInstance.isUnicode() ? "1" : "0");
     }
 
     public void onSetUpBeforeTransaction() {
@@ -89,7 +87,6 @@
         this.exampleValidInstance.setUser("sim");
         this.exampleValidInstance.setPassword("secret");
         this.exampleValidInstance.setClient("mandant");
-//        this.exampleValidInstance.setLanguage("Polish");
         this.exampleValidInstance.setHost("localhost");
         this.exampleValidInstance.setMaxConnectionsInPool(10);
         this.exampleValidInstance.setDefaultInstance(false);
@@ -134,19 +131,34 @@
         this.setExampleProperties();
 
         Properties props = testComm.getLogonProperties();
-        assertEquals("Suppose to be equals objects", props, this.properties);
+        
+        Enumeration<Object> keys = props.keys();
+        while (keys.hasMoreElements()) {
+            String key = (String)keys.nextElement();
+            assertEquals(props.getProperty(key), this.properties.getProperty(key));
+        }
 
         this.exampleValidInstance.setLoadBalancing(true);
         this.setExampleProperties();
 
         props = testComm.getLogonProperties();
-        assertEquals("Suppose to be equals objects", props, this.properties);
+        
+        keys = props.keys();
+        while (keys.hasMoreElements()) {
+            String key = (String)keys.nextElement();
+            assertEquals(props.getProperty(key), this.properties.getProperty(key));
+        }
 
         this.exampleValidInstance.setUnicode(false);
         this.setExampleProperties();
 
         props = testComm.getLogonProperties();
-        assertEquals("Suppose to be equals objects", props, this.properties);
+        
+        keys = props.keys();
+        while (keys.hasMoreElements()) {
+            String key = (String)keys.nextElement();
+            assertEquals(props.getProperty(key), this.properties.getProperty(key));
+        }
     }
 
     public void testStopServer() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.