Merge branch 'dev'

Author: germanattanasio

pom.xml

@@ -210,8 +210,9 @@
 		</profile>
 	</profiles>
 	<properties>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<timestamp>${maven.build.timestamp}</timestamp>
-		<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+		<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssa</maven.build.timestamp.format>
 	</properties>
 	<artifactId>java-wrapper</artifactId>
 	<issueManagement>

src/main/java/com/ibm/watson/developer_cloud/tradeoff_analytics/v1/TradeoffAnalytics.java

@@ -77,7 +77,7 @@ public Dilemma dilemmas(final Problem problem,final Boolean generateVisualizatio
 		try {
 			HttpResponse response = execute(request.build());
 			String dilemmaJson = ResponseUtil.getString(response);
-			System.out.println(dilemmaJson);
+
 			Dilemma dilemma = GsonSingleton.getGson().fromJson(dilemmaJson, Dilemma.class);
 			return dilemma;
 		} catch (IOException e) {

src/test/java/com/ibm/watson/developer_cloud/WatsonServiceTest.java

@@ -92,12 +92,12 @@ private void setupLogging() {
 		java.util.logging.Logger.getLogger("org.apache.http.wire").setLevel(java.util.logging.Level.FINEST);
 		java.util.logging.Logger.getLogger("org.apache.http.headers").setLevel(java.util.logging.Level.FINEST);
 
-		System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog");
-		System.setProperty("org.apache.commons.logging.simplelog.showdatetime", "true");
-		System.setProperty("org.apache.commons.logging.simplelog.log.httpclient.wire", "debug");
-		System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http", "debug");
-		System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http.impl.conn", "debug");
-		System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http.impl.client", "debug");
+//		System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog");
+//		System.setProperty("org.apache.commons.logging.simplelog.showdatetime", "true");
+//		System.setProperty("org.apache.commons.logging.simplelog.log.httpclient.wire", "debug");
+//		System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http", "debug");
+//		System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http.impl.conn", "debug");
+//		System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http.impl.client", "debug");
 	}
 
 }

src/test/java/com/ibm/watson/developer_cloud/tradeoff_analytics/v1/ProblemTest.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2015 IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.ibm.watson.developer_cloud.tradeoff_analytics.v1;
+
+import java.io.InputStream;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.ibm.watson.developer_cloud.WatsonServiceTest;
+import com.ibm.watson.developer_cloud.tradeoff_analytics.v1.model.Problem;
+import com.ibm.watson.developer_cloud.util.GsonSingleton;
+
+/**
+ * The Class TradeoffAnalyticsTest.
+ */
+public class ProblemTest {
+
+	/**
+	 * Test convert problem to json and vise versa
+	 */
+	@Test
+	public void testJsonProblem() {
+		InputStream in = this.getClass().getClassLoader().getResourceAsStream("problem.json");
+		String problemJson = WatsonServiceTest.getStringFromInputStream(in);
+		Problem problem = GsonSingleton.getGson().fromJson(problemJson, Problem.class);
+		Assert.assertNotNull(problem.getSubject());
+		Assert.assertNotNull(problem.getColumns());
+		Assert.assertNotNull(problem.getOptions());
+		Assert.assertNotNull(problem.getColumns().get(0));
+		Assert.assertNotNull(problem.getOptions().get(0));
+	}
+
+}