s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1390 from jackyq2015/issue/1389

Browse Source 
fix Issue #1389
This commit is contained in:
Jacky 2017-12-21 08:26:09 -05:00 committed by GitHub
commit 6c06424183
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 66 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main/tests/server/src/com/google/refine/tests/model/UrlFetchingTests.java
View File

@ -37,6 +37,7 @@ import static org.mockito.Mockito.mock;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress;
import java.util.Properties; import java.util.Properties;
import org.json.JSONException; import org.json.JSONException;
@ -51,8 +52,6 @@ import org.testng.annotations.Test;
import com.google.refine.ProjectManager; import com.google.refine.ProjectManager;
import com.google.refine.ProjectMetadata; import com.google.refine.ProjectMetadata;
import com.google.refine.browsing.Engine; import com.google.refine.browsing.Engine;
import com.google.refine.browsing.RowVisitor;
import com.google.refine.grel.Function;
import com.google.refine.io.FileProjectManager; import com.google.refine.io.FileProjectManager;
import com.google.refine.expr.ExpressionUtils; import com.google.refine.expr.ExpressionUtils;
import com.google.refine.model.Cell; import com.google.refine.model.Cell;
@ -118,12 +117,27 @@ public class UrlFetchingTests extends RefineTest {
bindings = null; bindings = null;
} }
private boolean isHostReachable(String host, int timeout){
boolean state = false;
try {
state = InetAddress.getByName(host).isReachable(timeout);
} catch (IOException e) {
// e.printStackTrace();
}
return state;
}
/** /**
* Test for caching * Test for caching
*/ */
@Test @Test
public void testUrlCaching() throws Exception { public void testUrlCaching() throws Exception {
if (!isHostReachable("www.random.org", 5000))
return;
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {
Row row = new Row(2); Row row = new Row(2);
row.setCell(0, new Cell(i < 5 ? "apple":"orange", null)); row.setCell(0, new Cell(i < 5 ? "apple":"orange", null));
@ -132,7 +146,7 @@ public class UrlFetchingTests extends RefineTest {
EngineDependentOperation op = new ColumnAdditionByFetchingURLsOperation(engine_config, EngineDependentOperation op = new ColumnAdditionByFetchingURLsOperation(engine_config,
"fruits", "fruits",
"\"https://www.random.org/integers/?num=1&min=1&max=100&col=1&base=10&format=plain&rnd=new&city=\"+value", "\"https://www.random.org/integers/?num=1&min=1&max=100&col=1&base=10&format=plain&rnd=new&city=\"+value",
OnError.SetToBlank, OnError.StoreError,
"rand", "rand",
1, 1,
500, 500,
@ -151,15 +165,17 @@ public class UrlFetchingTests extends RefineTest {
} catch (InterruptedException e) { } catch (InterruptedException e) {
Assert.fail("Test interrupted"); Assert.fail("Test interrupted");
} }
Assert.assertFalse(process.isRunning());
// Inspect rows // Inspect rows
String ref_val = (String)project.rows.get(0).getCellValue(1); String ref_val = (String)project.rows.get(0).getCellValue(1).toString();
Assert.assertTrue(ref_val != "apple"); // just to make sure I picked the right column Assert.assertTrue(ref_val != "apple"); // just to make sure I picked the right column
for (int i = 1; i < 4; i++) { for (int i = 1; i < 4; i++) {
System.out.println("value:" + project.rows.get(i).getCellValue(1));
// all random values should be equal due to caching // all random values should be equal due to caching
Assert.assertEquals(project.rows.get(i).getCellValue(1), ref_val); Assert.assertEquals(project.rows.get(i).getCellValue(1), ref_val);
} }
Assert.assertFalse(process.isRunning());
} }
/** /**