fixed errors related to retaining properties file values and slashes …

…in log and results directory; added the retsStatus code to the test results object and the xml report

config/TestClient.properties

@@ -1,8 +1,9 @@
+esults=
 loginurl=http://demo.rets.interealty.com/Login.asmx/Login
 password=1TR18M
-resultsdirectory=C:\results
+resultsdirectory=C:\projects\RESO\workspace\RESO-Server-Compliance-Tester\config\
 retsVersion=RETS/1.8
-transactionlogdirectory=C:\logs
+transactionlogdirectory=C:\projects\RESO\workspace\RESO-Server-Compliance-Tester\config
 uaPassword=
 useragent=RETS-Connector/1.2
 username=RESOWG

src/com/realtor/rets/compliance/PropertiesEx.java

@@ -0,0 +1,27 @@
+package com.realtor.rets.compliance;
+import java.util.*;
+import java.io.*;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: paula
+ * Date: 1/24/14
+ * Time: 5:36 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class PropertiesEx extends Properties {
+    public void load(InputStream fis) throws IOException {
+        System.out.println("in properties ex load");
+
+        Scanner in = new Scanner(fis);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        while(in.hasNext()) {
+            out.write(in.nextLine().replace("\\","\\\\").getBytes());
+            out.write("\n".getBytes());
+        }
+
+        InputStream is = new ByteArrayInputStream(out.toByteArray());
+        super.load(is);
+    }
+}

src/com/realtor/rets/compliance/PropertyManager.java

@@ -1,11 +1,11 @@
 package com.realtor.rets.compliance;
 
-import java.io.*;
-import java.util.*;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import java.io.*;
+import java.util.*;
+
 /**
  * Created by IntelliJ IDEA.
  * @author pobrien
@@ -69,9 +69,9 @@ public static void setConfigDirectory(String newConfigDirectory) {
         PropertyManager.configDirectory = newConfigDirectory;
     }
 
-    public Properties getProperties() {
+    public PropertiesEx getProperties() {
         Object o = null;
-        Properties props = new Properties();
+        PropertiesEx props = new PropertiesEx();
         if ( map == null || map.isEmpty() ) load();
         Iterator iterator = map.keySet().iterator();
         while ( iterator.hasNext() ) {
@@ -117,9 +117,10 @@ public void persist() throws IOException {
 
 
     public void load() {
+        System.out.println("in property manager load");
         if (filename != null) {
             map.clear();
-            Properties properties = new Properties();
+            PropertiesEx properties = new PropertiesEx();
             try {
                 InputStream inputStream = null;
                 File file = new File(filename);
@@ -161,10 +162,11 @@ public void fixEncodedValues() {
             key = (String) iterator.next();
             value = (String) map.get(key);
             if ( value != null ) {
-                while ( value.indexOf('\\') > -1 ) {
+               /* while ( value.indexOf('\\') > -1 ) {
                     int index = value.indexOf('\\');
                     value = value.substring(0,index) + value.substring(index+1);
                 }
+                */
             }
             map.put(key, value);
         }

src/com/realtor/rets/compliance/TestExecuter.java

@@ -3,21 +3,6 @@
  */
 package com.realtor.rets.compliance;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.realtor.rets.retsapi.RETSConnection;
@@ -29,6 +14,15 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.*;
+
 /**
  * The test Executer executes RETS Compliance tests defined in XML documents
  * Calls RETSTransactions defined in the XML documents and evaluates the
@@ -333,7 +327,7 @@ public TestReport execute(RETSConnection conn, String xmlFileName) {
      * @param conn        An active connection to a RETS server (login transaction
      *                    already performed)
      * @param xmlFileName name of the xml file to load
-     * @param props       TestParametersproperties fileName to load
+     * @param propertiesFile       TestParametersproperties fileName to load
      * @return test report for the tests defined in xmlFileName
      */
     public TestReport execute(RETSConnection conn, String xmlFileName, String propertiesFile) {
@@ -526,6 +520,7 @@ private boolean executeTransaction(RETSConnection conn, RETSTransaction trans,
         }
 
         if (trans.getResponseStatus() != null)
+
             if (!trans.getResponseStatus().equalsIgnoreCase("0")) {
                 TestResult testResult = new TestResult("Response Status " +
                         trans.getResponseStatus(),
@@ -534,6 +529,7 @@ private boolean executeTransaction(RETSConnection conn, RETSTransaction trans,
                         trans.getResponseStatus());
                 testResult.setJavaException("");
                 testResult.setStatus("Info");
+                testResult.setRetsReplyCode(trans.getResponseStatus());
 
                 StringBuffer sb = new StringBuffer();
                 sb.append("Transaction Name : " + trans.getClass().getName());
@@ -737,7 +733,6 @@ public static TestResult reportException(Exception e, String message) {
      * Reports an excepption in a testResult object
      *
      * @param e       Exception to report
-     * @param message Additional message used for notes
      * @return test Result object
      */
     public static TestResult reportTransactionException(Exception e, RETSTransaction trans) {

src/com/realtor/rets/compliance/TestReport.java

@@ -4,12 +4,12 @@
  */
 package com.realtor.rets.compliance;
 
+import org.realtor.rets.retsapi.RETSConnection;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.realtor.rets.retsapi.RETSConnection;
-
 
 /**
  * The TestReport object is intended to contain a collection of related TestResult
@@ -156,6 +156,7 @@ public String generateXML() {
           test = (TestResult) iterator.next();
           stringBuffer.append("    <Test>\n");
           stringBuffer.append("      <name>" + test.getName() + "</name>\n");
+          stringBuffer.append("      <retsStatus>" + test.getRetsReplyCode() + "</retsStatus>\n");
           stringBuffer.append("      <description><![CDATA[" + test.getDescription() + "]]></description>\n");
           stringBuffer.append("      <status>" + test.getStatus()+ "</status>\n");
           stringBuffer.append("      <notes>\n");

src/com/realtor/rets/compliance/TestResult.java

@@ -22,6 +22,16 @@ public class TestResult {
   private String status = null;
   private String responseBody = null;
 
+    public String getRetsReplyCode() {
+        return retsReplyCode;
+    }
+
+    public void setRetsReplyCode(String retsReplyCode) {
+        this.retsReplyCode = retsReplyCode;
+    }
+
+    private String retsReplyCode="0";
+
   /**
    * Creates a new TestResult object.
    */

src/com/realtor/rets/compliance/gui/Client.java

@@ -5,47 +5,19 @@
  *
   */
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
+import com.realtor.rets.compliance.*;
+
+import javax.swing.*;
+import javax.swing.border.CompoundBorder;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.net.URL;
 import java.util.Enumeration;
 
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.border.CompoundBorder;
-
-import com.realtor.rets.compliance.DMQLTestConfigurer;
-import com.realtor.rets.compliance.ExampleFileFilter;
-import com.realtor.rets.compliance.PropertyManager;
-import com.realtor.rets.compliance.ResourceManager;
-import com.realtor.rets.compliance.TestExecuter;
-
 /**
  *  This is a GUI client for the RETS Compliance Platform.  This class provides
  *  a GUI interface for executing and evaluating Compliance Test Scripts
@@ -487,13 +459,14 @@ private void loadProperties()
     {
         PropertyManager pm = PropertyManager.getClientPropertyManager();
         pm.load();
+
         textUsername.setText(pm.getProperty("username"));
         textPassword.setText(pm.getProperty("password"));
         textServerURL.setText(pm.getProperty("loginurl"));
         textUserAgent.setText(pm.getProperty("useragent"));
         textUserAgentPassword.setText(pm.getProperty("uaPassword"));
         textLogDir.setText(pm.getProperty("transactionlogdirectory"));
-        textLogDir.setText(pm.getProperty("resultsdirectory"));
+        textResultsDir.setText(pm.getProperty("resultsdirectory"));
         String versionString = pm.getProperty("retsVersion");
         if (versionString == null) {
             retsVersion.setSelectedItem(DEFAULT_RETS_VERSION);

src/com/realtor/rets/compliance/tests/BaseEvaluator.java

@@ -4,12 +4,15 @@
  */
 package com.realtor.rets.compliance.tests;
 
-import com.realtor.rets.compliance.*;
-
-import java.util.*;
-
+import com.realtor.rets.compliance.TestEvaluator;
+import com.realtor.rets.compliance.TestReport;
+import com.realtor.rets.compliance.TestResult;
 import org.realtor.rets.retsapi.RETSTransaction;
 
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
 /**
  * Base class that can be extended -- adds methods that could be used often by
  * TestEvaluators
@@ -150,6 +153,10 @@ protected TestResult reportResult(RETSTransaction trans, String name,
     TestResult testResult = new TestResult(name, description);
     testResult.setJavaException("");
     testResult.setStatus(status);
+      if (trans.getResponseStatus() != null) {
+
+          testResult.setRetsReplyCode(trans.getResponseStatus());
+      }
 
     StringBuffer sb = new StringBuffer();
     sb.append("Transaction Name : " + trans.getClass().getName());

src/com/realtor/rets/compliance/tests/NegativeBaseEvaluator.java

@@ -2,13 +2,12 @@
  */
 package com.realtor.rets.compliance.tests;
 
-import java.util.Map;
-
+import com.realtor.rets.compliance.TestResult;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.realtor.rets.retsapi.RETSTransaction;
 
-import com.realtor.rets.compliance.TestResult;
+import java.util.Map;
 
 /**
  *  Base class for Negative Tests Result Evaluator classes will evaluate each of the  
@@ -23,6 +22,7 @@ public abstract class NegativeBaseEvaluator extends BaseEvaluator {
     protected String testResultStatus = null;
     protected String testResultDesc = null;       //testResult Description
     protected String testResultNotes = null;
+
 
     protected String correctResponseStatus = null;
 
@@ -58,7 +58,7 @@ protected TestResult processResults(String transName, RETSTransaction transactio
                                                         transRespStatus);    
             }
         }
-
+        testResult.setRetsReplyCode(transRespStatus);
         return testResult;
     }