Skip to content

Commit

Permalink
Added tests
Browse files Browse the repository at this point in the history
MJonker committed Nov 23, 2016
1 parent f55253c commit a67b8aa
Showing 2 changed files with 48 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -19,6 +19,9 @@

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.List;

import org.junit.Assume;
@@ -45,6 +48,7 @@ public class VisualRecognitionIT extends WatsonServiceTest {
private static final String IMAGE_FACE_FILE = "src/test/resources/visual_recognition/faces.zip";
private static final String IMAGE_FACE_URL = "https://watson-test-resources.mybluemix.net/resources/obama.jpg";
private static final String IMAGE_FILE = "src/test/resources/visual_recognition/test.zip";
private static final String SINGLE_IMAGE_FILE = "src/test/resources/visual_recognition/car.png";
private static final String IMAGE_TEXT_FILE = "src/test/resources/visual_recognition/open.png";
private static final String IMAGE_TEXT_URL = "https://watson-test-resources.mybluemix.net/resources/open.png";
private static final String IMAGE_URL = "https://watson-test-resources.mybluemix.net/resources/car.png";
@@ -145,6 +149,18 @@ public void testClassifyImagesFromUrl() {
VisualClassification result = service.classify(options).execute();
assertClassifyImage(result, options);
}

/**
* Test classify images from bytes or stream.
*/
@Test
public void testClassifyImagesFromBytes()throws IOException {
File images = new File(SINGLE_IMAGE_FILE);
byte[] fileBytes = Files.readAllBytes(Paths.get(images.getPath()));
ClassifyImagesOptions options = new ClassifyImagesOptions.Builder().images(fileBytes,"car.png").build();
VisualClassification result = service.classify(options).execute();
assertClassifyImage(result, options);
}

/**
* Test create a classifier.
Original file line number Diff line number Diff line change
@@ -17,6 +17,8 @@

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;

@@ -49,6 +51,7 @@ public class VisualRecognitionTest extends WatsonServiceUnitTest {
private static final String FIXTURE_FACES = "src/test/resources/visual_recognition/detected_faces.json";
private static final String FIXTURE_TEXT = "src/test/resources/visual_recognition/detected_text.json";
private static final String IMAGE_FILE = "src/test/resources/visual_recognition/test.zip";
private static final String SINGLE_IMAGE_FILE = "src/test/resources/visual_recognition/car.png";
private static final String PATH_CLASSIFY = "/v3/classify";
private static final String VERSION_DATE = "version";
private static final String PATH_CLASSIFIERS = "/v3/classifiers";
@@ -99,6 +102,35 @@ public void testClassifyWithFile() throws IOException, InterruptedException {
assertEquals(serviceResponse, mockResponse);
}


/**
* Test classify with bytes or stream.
*
* @throws IOException Signals that an I/O exception has occurred.
* @throws InterruptedException the interrupted exception
*/
@Test
public void testClassifyWithBytes() throws IOException, InterruptedException {
VisualClassification mockResponse = loadFixture(FIXTURE_CLASSIFICATION, VisualClassification.class);
server.enqueue(new MockResponse().setBody(mockResponse.toString()));

// execute request
File images = new File(SINGLE_IMAGE_FILE);

byte[] fileBytes = Files.readAllBytes(Paths.get(images.getPath()));

ClassifyImagesOptions options = new ClassifyImagesOptions.Builder().images(fileBytes,"car.png").classifierIds("car").build();
VisualClassification serviceResponse = service.classify(options).execute();

// first request
RecordedRequest request = server.takeRequest();

String path =
PATH_CLASSIFY + "?" + VERSION_DATE + "=" + VisualRecognition.VERSION_DATE_2016_05_20 + "&api_key=" + API_KEY;
assertEquals(path, request.getPath());
assertEquals("POST", request.getMethod());
assertEquals(serviceResponse, mockResponse);
}
/**
* Test update classifier.
*

0 comments on commit a67b8aa

Please sign in to comment.