0035088: Make 2 junit tests more robust against c_country.name being translated directly (not using _trl table)

diff -r 150033493bce src-test/src/org/openbravo/test/xml/UniqueConstraintImportTest.java
--- a/src-test/src/org/openbravo/test/xml/UniqueConstraintImportTest.java	Mon Jan 23 11:26:31 2017 +0100
+++ b/src-test/src/org/openbravo/test/xml/UniqueConstraintImportTest.java	Sun Jan 29 19:46:12 2017 +0100
@@ -63,7 +63,7 @@
   @Test
   public void testACreateCountryTrl() {
     setSystemAdministratorContext();
-    final Country country = getCountry("Norway");
+    final Country country = getCountryByCode("NO");
     final OBCriteria<CountryTrl> obc = OBDal.getInstance().createCriteria(CountryTrl.class);
     obc.add(Restrictions.eq("country", country));
     final List<CountryTrl> countryTrls = obc.list();
@@ -104,7 +104,7 @@
     setTestAdminContext();
 
     // read countrytrl
-    String xml = exportClass(CountryTrl.class, "country", getCountry("Norway"));
+    String xml = exportClass(CountryTrl.class, "country", getCountryByCode("NO"));
 
     // change the id
     xml = xml.replaceAll("<CountryTrl id=\"..", "<CountryTrl id=\"1k");
@@ -129,10 +129,11 @@
     }
   }
 
-  private Country getCountry(String name) {
+  private Country getCountryByCode(String name) {
     final OBCriteria<Country> obc = OBDal.getInstance().createCriteria(Country.class);
-    obc.add(Restrictions.eq("name", name));
-    return obc.list().get(0);
+    // has unique constraint
+    obc.add(Restrictions.eq("iSOCountryCode", name));
+    return (Country) obc.uniqueResult();
   }
 
   private <T extends BaseOBObject> String exportClass(Class<T> clz, String field, Object value) {

diff -r 150033493bce src-test/src/org/openbravo/test/webservice/JSONWebServicesWhereParameter.java
--- a/src-test/src/org/openbravo/test/webservice/JSONWebServicesWhereParameter.java	Mon Jan 23 11:26:31 2017 +0100
+++ b/src-test/src/org/openbravo/test/webservice/JSONWebServicesWhereParameter.java	Mon Jan 30 17:51:23 2017 +0100
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C)2016 Openbravo SLU 
+ * All portions are Copyright (C)2016-2017 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -33,15 +33,17 @@
  * 
  */
 public class JSONWebServicesWhereParameter extends BaseWSTest {
+  private static final String SPAIN_ID = "106";
 
   @Test
   public void WebserviceWithWhereParameter() throws Exception {
     JSONWebServices jws = new JSONWebServices();
-    JSONObject resp = new JSONObject(jws.request("Country", null, "_where=name='Spain'", "GET"))
-        .getJSONObject("response");
+    JSONObject resp = new JSONObject(
+        jws.request("Country", null, "_where=iSOCountryCode='ES'", "GET"))
+            .getJSONObject("response");
     assertThat("Total Rows", resp.getInt("totalRows"), is(1));
     JSONObject firstRecord = resp.getJSONArray("data").getJSONObject(0);
-    assertThat("Spanish Country", firstRecord.getString("_identifier"), is(equalTo("Spain")));
+    assertThat("Spanish Country", firstRecord.getString("id"), is(equalTo(SPAIN_ID)));
     assertThat("Sucess status", resp.getInt("status"), is(0));
   }
 }