Merge pull request #27 from watson-developer-cloud/dev

Mock API test cases

Author: alseddnm

README.md

@@ -1,6 +1,6 @@
 # Watson Developer Cloud Java Wrapper
 [![Build Status](https://secure.travis-ci.org/watson-developer-cloud/java-wrapper.png)](http://travis-ci.org/watson-developer-cloud/java-wrapper)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson.developer_cloud/java-wrapper/badge.svg)](https://maven-badges.herokuapp.com/maven-central/cz.jirutka.rsql/rsql-parser)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson.developer_cloud/java-wrapper/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson.developer_cloud/java-wrapper)
 [![Coverage Status](https://coveralls.io/repos/watson-developer-cloud/java-wrapper/badge.svg?branch=master&service=github)](https://coveralls.io/github/watson-developer-cloud/java-wrapper?branch=master)
 
 Java code wrappers to quickly get started with the various [Watson Developer Cloud][wdc] services - A collection of REST APIs and SDKs that use cognitive computing to solve complex problems.

pom.xml

@@ -28,12 +28,6 @@
 			<version>2.3.1</version>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>1.10.19</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
@@ -46,6 +40,13 @@
 			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
+		<!-- mockserver -->
+		<dependency>
+			<groupId>org.mock-server</groupId>
+			<artifactId>mockserver-netty</artifactId>
+			<version>3.9.17</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<developers>
 		<developer>

src/main/java/com/ibm/watson/developer_cloud/natural_language_classifier/v1/model/Classification.java

@@ -140,11 +140,37 @@ public List<ClassifiedClass> getClasses() {
 		return classes;
 	}
 
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		Classification that = (Classification) o;
+
+		if (!id.equals(that.id)) return false;
+		if (url != null ? !url.equals(that.url) : that.url != null) return false;
+		if (text != null ? !text.equals(that.text) : that.text != null) return false;
+		if (topClass != null ? !topClass.equals(that.topClass) : that.topClass != null) return false;
+		return !(classes != null ? !classes.equals(that.classes) : that.classes != null);
+
+	}
+
+	@Override
+	public int hashCode() {
+		int result = id.hashCode();
+		result = 31 * result + (url != null ? url.hashCode() : 0);
+		result = 31 * result + (text != null ? text.hashCode() : 0);
+		result = 31 * result + (topClass != null ? topClass.hashCode() : 0);
+		result = 31 * result + (classes != null ? classes.hashCode() : 0);
+		return result;
+	}
+
 	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#toString()
+         */
 	@Override
 	public String toString() {
 		return getClass().getName() + " "

src/main/java/com/ibm/watson/developer_cloud/natural_language_classifier/v1/model/ClassifiedClass.java

@@ -72,11 +72,33 @@ public void setConfidence(double confidence) {
 		this.confidence = confidence;
 	}
 
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		ClassifiedClass that = (ClassifiedClass) o;
+
+		if (Double.compare(that.confidence, confidence) != 0) return false;
+		return name.equals(that.name);
+
+	}
+
+	@Override
+	public int hashCode() {
+		int result;
+		long temp;
+		result = name.hashCode();
+		temp = Double.doubleToLongBits(confidence);
+		result = 31 * result + (int) (temp ^ (temp >>> 32));
+		return result;
+	}
+
 	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#toString()
+         */
 	@Override
 	public String toString() {
 		return getClass().getName() + " "

src/main/java/com/ibm/watson/developer_cloud/natural_language_classifier/v1/model/Classifier.java

@@ -142,11 +142,34 @@ public void setStatusDescription(String statusDescription) {
 		this.statusDescription = statusDescription;
 	}
 
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		Classifier that = (Classifier) o;
+
+		if (!id.equals(that.id)) return false;
+		if (url != null ? !url.equals(that.url) : that.url != null) return false;
+		if (status != that.status) return false;
+		return !(statusDescription != null ? !statusDescription.equals(that.statusDescription) : that.statusDescription != null);
+
+	}
+
+	@Override
+	public int hashCode() {
+		int result = id.hashCode();
+		result = 31 * result + (url != null ? url.hashCode() : 0);
+		result = 31 * result + (status != null ? status.hashCode() : 0);
+		result = 31 * result + (statusDescription != null ? statusDescription.hashCode() : 0);
+		return result;
+	}
+
 	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#toString()
+         */
 	@Override
 	public String toString() {
 		return getClass().getName() + " "

src/main/java/com/ibm/watson/developer_cloud/personality_insights/v2/model/Profile.java

@@ -160,11 +160,39 @@ public void setWordCount(int wordCount) {
 		this.wordCount = wordCount;
 	}
 
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		Profile profile = (Profile) o;
+
+		if (wordCount != profile.wordCount) return false;
+		if (!id.equals(profile.id)) return false;
+		if (source != null ? !source.equals(profile.source) : profile.source != null) return false;
+		if (tree != null ? !tree.equals(profile.tree) : profile.tree != null) return false;
+		if (wordCountMessage != null ? !wordCountMessage.equals(profile.wordCountMessage) : profile.wordCountMessage != null)
+			return false;
+		return !(processedLanguage != null ? !processedLanguage.equals(profile.processedLanguage) : profile.processedLanguage != null);
+
+	}
+
+	@Override
+	public int hashCode() {
+		int result = id.hashCode();
+		result = 31 * result + (source != null ? source.hashCode() : 0);
+		result = 31 * result + (tree != null ? tree.hashCode() : 0);
+		result = 31 * result + wordCount;
+		result = 31 * result + (wordCountMessage != null ? wordCountMessage.hashCode() : 0);
+		result = 31 * result + (processedLanguage != null ? processedLanguage.hashCode() : 0);
+		return result;
+	}
+
 	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#toString()
+         */
 	@Override
 	public String toString() {
 		return getClass().getName() + " "

src/main/java/com/ibm/watson/developer_cloud/personality_insights/v2/model/Trait.java

@@ -211,9 +211,45 @@ public void setSamplingError(double samplingError) {
 		this.samplingError = samplingError;
 	}
 
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		Trait trait = (Trait) o;
+
+		if (Double.compare(trait.percentage, percentage) != 0) return false;
+		if (Double.compare(trait.samplingError, samplingError) != 0) return false;
+		if (category != null ? !category.equals(trait.category) : trait.category != null) return false;
+		if (children != null ? !children.equals(trait.children) : trait.children != null) return false;
+		if (!id.equals(trait.id)) return false;
+		if (name != null ? !name.equals(trait.name) : trait.name != null) return false;
+		if (rawSamplingError != null ? !rawSamplingError.equals(trait.rawSamplingError) : trait.rawSamplingError != null)
+			return false;
+		return !(rawScore != null ? !rawScore.equals(trait.rawScore) : trait.rawScore != null);
+
+	}
+
+	@Override
+	public int hashCode() {
+		int result;
+		long temp;
+		result = category != null ? category.hashCode() : 0;
+		result = 31 * result + (children != null ? children.hashCode() : 0);
+		result = 31 * result + id.hashCode();
+		result = 31 * result + (name != null ? name.hashCode() : 0);
+		temp = Double.doubleToLongBits(percentage);
+		result = 31 * result + (int) (temp ^ (temp >>> 32));
+		result = 31 * result + (rawSamplingError != null ? rawSamplingError.hashCode() : 0);
+		result = 31 * result + (rawScore != null ? rawScore.hashCode() : 0);
+		temp = Double.doubleToLongBits(samplingError);
+		result = 31 * result + (int) (temp ^ (temp >>> 32));
+		return result;
+	}
+
 	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
+         * @see java.lang.Object#toString()
+         */
 	@Override
 	public String toString() {
 		return getClass().getName() + " "

src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/SpeechAlternative.java

@@ -57,11 +57,27 @@ public SpeechAlternative withTranscript(final String transcript) {
 		return this;
 	}
 
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		SpeechAlternative that = (SpeechAlternative) o;
+
+		return transcript.equals(that.transcript);
+
+	}
+
+	@Override
+	public int hashCode() {
+		return transcript.hashCode();
+	}
+
 	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#toString()
+         */
 	@Override
 	public String toString() {
 		return getClass().getName() + " "

src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/SpeechModel.java

@@ -139,11 +139,32 @@ public void setSessions(final String sessions) {
 		this.sessions = sessions;
 	}
 
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		SpeechModel that = (SpeechModel) o;
+
+		if (rate != that.rate) return false;
+		if (name != null ? !name.equals(that.name) : that.name != null) return false;
+		return !(sessions != null ? !sessions.equals(that.sessions) : that.sessions != null);
+
+	}
+
+	@Override
+	public int hashCode() {
+		int result = name != null ? name.hashCode() : 0;
+		result = 31 * result + rate;
+		result = 31 * result + (sessions != null ? sessions.hashCode() : 0);
+		return result;
+	}
+
 	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
+             * (non-Javadoc)
+             *
+             * @see java.lang.Object#toString()
+             */
 	@Override
 	public String toString() {
 		return getClass().getName() + " "

src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/SpeechModelSet.java

@@ -62,11 +62,27 @@ public SpeechModelSet withModels(final List<SpeechModel> models) {
 		return this;
 	}
 
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		SpeechModelSet that = (SpeechModelSet) o;
+
+		return !(models != null ? !models.equals(that.models) : that.models != null);
+
+	}
+
+	@Override
+	public int hashCode() {
+		return models != null ? models.hashCode() : 0;
+	}
+
 	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
+         * (non-Javadoc)
+         *
+         * @see java.lang.Object#toString()
+         */
 	@Override
 	public String toString() {
 		return getClass().getName() + " "