Skip to content
This repository was archived by the owner on Jun 23, 2022. It is now read-only.

Replace MockRequest with DocRequest. #116

Merged
wiarlawd merged 1 commit into from
Jan 26, 2018
Merged

Replace MockRequest with DocRequest. #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions test/com/google/enterprise/adaptor/database/DatabaseAdaptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import com.google.enterprise.adaptor.AuthzStatus;
import com.google.enterprise.adaptor.Config;
import com.google.enterprise.adaptor.DocId;
import com.google.enterprise.adaptor.DocRequest;
import com.google.enterprise.adaptor.GroupPrincipal;
import com.google.enterprise.adaptor.InvalidConfigurationException;
import com.google.enterprise.adaptor.Metadata;
Expand Down Expand Up @@ -2160,7 +2161,7 @@ public void testGetDocContent() throws Exception {
configEntries.put("db.metadataColumns", "ID:col1, NAME:col2");

DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
MockRequest request = new MockRequest(new DocId("1001"));
DocRequest request = new DocRequest(new DocId("1001"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);

Expand All @@ -2184,7 +2185,7 @@ public void testGetDocContent_noUniqueKeyFieldsInSelect() throws Exception {
configEntries.put("db.modeOfOperation.contentColumn.columnName", "content");

DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
MockRequest request = new MockRequest(new DocId("1"));
DocRequest request = new DocRequest(new DocId("1"));
ByteArrayOutputStream baos = new ByteArrayOutputStream();
RecordingResponse response = new RecordingResponse(baos);
adaptor.getDocContent(request, response);
Expand All @@ -2206,7 +2207,7 @@ public void testGetDocContent_wrongParameterColumnInQuery() throws Exception {
configEntries.put("db.metadataColumns", "id:id, notId:notId");

DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
MockRequest request = new MockRequest(new DocId("1"));
DocRequest request = new DocRequest(new DocId("1"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);

Expand Down Expand Up @@ -2235,7 +2236,7 @@ public void testGetDocContent_modeOfOperationConfig() throws Exception {
configEntries.put("db.modeOfOperation.contentColumn.displayUrlCol", "url");

DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
MockRequest request = new MockRequest(new DocId("1"));
DocRequest request = new DocRequest(new DocId("1"));
ByteArrayOutputStream baos = new ByteArrayOutputStream();
RecordingResponse response = new RecordingResponse(baos);
adaptor.getDocContent(request, response);
Expand All @@ -2257,7 +2258,7 @@ public void testGetDocContent_lister() throws Exception {
moreEntries.put("db.everyDocIdSql", "select * from data");

DatabaseAdaptor adaptor = getObjectUnderTest(moreEntries);
MockRequest request = new MockRequest(new DocId("http://"));
DocRequest request = new DocRequest(new DocId("http://"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);
assertEquals(RecordingResponse.State.NOT_FOUND, response.getState());
Expand All @@ -2276,7 +2277,7 @@ public void testGetDocContent_noResults() throws Exception {
configEntries.put("db.modeOfOperation", "rowToText");

DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
MockRequest request = new MockRequest(new DocId("1002"));
DocRequest request = new DocRequest(new DocId("1002"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);
assertEquals(RecordingResponse.State.NOT_FOUND, response.getState());
Expand All @@ -2299,7 +2300,7 @@ public void testGetDocContent_sqlException() throws Exception {

executeUpdate("drop table data");

MockRequest request = new MockRequest(new DocId("1002"));
DocRequest request = new DocRequest(new DocId("1002"));
RecordingResponse response = new RecordingResponse();
thrown.expect(IOException.class);
thrown.expectMessage("retrieval error");
Expand Down Expand Up @@ -2340,7 +2341,7 @@ private void testMetadataColumns(int sqlType, String sqlTypeDecl,
configEntries.put("db.metadataColumns", "ID:col1, CONTENT:col2");

DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
MockRequest request = new MockRequest(new DocId("1"));
DocRequest request = new DocRequest(new DocId("1"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);

Expand Down Expand Up @@ -2377,7 +2378,7 @@ public void testMetadataColumns_date() throws Exception {
moreEntries.put("db.metadataColumns", "ID:col1, COL:col2");

DatabaseAdaptor adaptor = getObjectUnderTest(moreEntries);
MockRequest request = new MockRequest(new DocId("1001"));
DocRequest request = new DocRequest(new DocId("1001"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);

Expand Down Expand Up @@ -2407,7 +2408,7 @@ public void testMetadataColumns_time() throws Exception {
moreEntries.put("db.metadataColumns", "ID:col1, COL:col2");

DatabaseAdaptor adaptor = getObjectUnderTest(moreEntries);
MockRequest request = new MockRequest(new DocId("1001"));
DocRequest request = new DocRequest(new DocId("1001"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);

Expand Down Expand Up @@ -2438,7 +2439,7 @@ public void testMetadataColumns_timestamp() throws Exception {
moreEntries.put("db.metadataColumns", "ID:col1, COL:col2");

DatabaseAdaptor adaptor = getObjectUnderTest(moreEntries);
MockRequest request = new MockRequest(new DocId("1001"));
DocRequest request = new DocRequest(new DocId("1001"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);

Expand Down Expand Up @@ -2500,7 +2501,7 @@ public void testMetadataColumns_sqlxml() throws Exception {
configEntries.put("db.metadataColumns", "ID:col1, CONTENT:col2");

DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
MockRequest request = new MockRequest(new DocId("1"));
DocRequest request = new DocRequest(new DocId("1"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);

Expand Down Expand Up @@ -2558,7 +2559,7 @@ public void testMetadataColumns_array() throws Exception {
captureLogMessages(DatabaseAdaptor.class,
"Metadata column type not supported", messages);
DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
MockRequest request = new MockRequest(new DocId("1"));
DocRequest request = new DocRequest(new DocId("1"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);

Expand Down Expand Up @@ -2594,7 +2595,7 @@ public void testMetadataColumns_arrayNull() throws Exception {
captureLogMessages(DatabaseAdaptor.class,
"Metadata column type not supported", messages);
DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
MockRequest request = new MockRequest(new DocId("1"));
DocRequest request = new DocRequest(new DocId("1"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);

Expand Down Expand Up @@ -2633,7 +2634,7 @@ public void testMetadataColumns_columnAlias() throws Exception {
configEntries.put("db.metadataColumns", "id, quote");

DatabaseAdaptor adaptor = getObjectUnderTest(configEntries);
MockRequest request = new MockRequest(new DocId("6"));
DocRequest request = new DocRequest(new DocId("6"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);

Expand Down Expand Up @@ -2674,7 +2675,7 @@ public void testGetDocContentAcl() throws Exception {
moreEntries.put("db.modeOfOperation", "rowToText");

DatabaseAdaptor adaptor = getObjectUnderTest(moreEntries);
MockRequest request = new MockRequest(new DocId("1001"));
DocRequest request = new DocRequest(new DocId("1001"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);

Expand All @@ -2700,7 +2701,7 @@ public void testGetDocContentAcl_empty() throws Exception {
moreEntries.put("db.modeOfOperation", "rowToText");

DatabaseAdaptor adaptor = getObjectUnderTest(moreEntries);
MockRequest request = new MockRequest(new DocId("1001"));
DocRequest request = new DocRequest(new DocId("1001"));
RecordingResponse response = new RecordingResponse();
adaptor.getDocContent(request, response);

Expand All @@ -2727,7 +2728,7 @@ public void testGetDocContentAcl_sqlException() throws Exception {

executeUpdate("drop table acl");

MockRequest request = new MockRequest(new DocId("1001"));
DocRequest request = new DocRequest(new DocId("1001"));
RecordingResponse response = new RecordingResponse();
thrown.expect(IOException.class);
thrown.expectMessage("retrieval error");
Expand Down
57 changes: 0 additions & 57 deletions test/com/google/enterprise/adaptor/database/MockRequest.java
View file
Open in desktop

This file was deleted.