Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: remove dependency of history entry tests to column addition operation #6573

Merged
merged 1 commit into from
May 10, 2024
Merged

tests: remove dependency of history entry tests to column addition operation #6573

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions main/tests/server/src/com/google/refine/history/FileHistoryEntryManagerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import com.google.refine.io.FileHistoryEntryManager;
import com.google.refine.model.Project;
import com.google.refine.operations.OperationRegistry;
import com.google.refine.operations.column.ColumnAdditionOperation;
import com.google.refine.util.TestUtils;

public class FileHistoryEntryManagerTests extends RefineTest {
Expand All @@ -25,7 +24,7 @@ public class FileHistoryEntryManagerTests extends RefineTest {
@BeforeMethod
public void setUp() {
project = mock(Project.class);
OperationRegistry.registerOperation(getCoreModule(), "column-addition", ColumnAdditionOperation.class);
OperationRegistry.registerOperation(getCoreModule(), "mock-operation", HistoryEntryTests.MockOperation.class);
}

@Test
Expand Down
27 changes: 17 additions & 10 deletions main/tests/server/src/com/google/refine/history/HistoryEntryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@

import java.io.IOException;

import com.fasterxml.jackson.annotation.JsonProperty;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;

import com.google.refine.RefineTest;
import com.google.refine.model.AbstractOperation;
import com.google.refine.model.Project;
import com.google.refine.operations.OperationRegistry;
import com.google.refine.operations.column.ColumnAdditionOperation;
import com.google.refine.util.TestUtils;

public class HistoryEntryTests extends RefineTest {
Expand All @@ -47,14 +48,9 @@ public class HistoryEntryTests extends RefineTest {
+ "\"id\":1533633623158,"
+ "\"description\":\"Create new column uri based on column country by filling 269 rows with grel:\\\"https://www.wikidata.org/wiki/\\\"+cell.recon.match.id\","
+ "\"time\":\"2018-08-07T09:06:37Z\","
+ "\"operation\":{\"op\":\"core/column-addition\","
+ " \"description\":\"Create column uri at index 2 based on column country using expression grel:\\\"https://www.wikidata.org/wiki/\\\"+cell.recon.match.id\","
+ " \"engineConfig\":{\"mode\":\"row-based\",\"facets\":[]},"
+ " \"newColumnName\":\"uri\","
+ " \"columnInsertIndex\":2,"
+ " \"baseColumnName\":\"country\","
+ " \"expression\":\"grel:\\\"https://www.wikidata.org/wiki/\\\"+cell.recon.match.id\","
+ " \"onError\":\"set-to-blank\"}"
+ "\"operation\":{\"op\":\"core/mock-operation\","
+ " \"description\":\"some description\","
+ " \"foo\":\"bar\"}"
+ "}";

public static final String unknownOperationJson = "{"
Expand All @@ -69,9 +65,20 @@ public class HistoryEntryTests extends RefineTest {

Project project;

public static class MockOperation extends AbstractOperation {

@JsonProperty("foo")
public String someParameter = "bar";

@Override
public String getJsonDescription() {
return "some description";
}
}

@BeforeTest
public void register() {
OperationRegistry.registerOperation(getCoreModule(), "column-addition", ColumnAdditionOperation.class);
OperationRegistry.registerOperation(getCoreModule(), "mock-operation", MockOperation.class);
}

@BeforeMethod
Expand Down