Merge branch 'master' of github.com:jzy3d/jzy3d-api

This commit is contained in:
Martin Pernollet 2016-03-12 15:01:13 +01:00
commit c4b44e97f0
2 changed files with 10 additions and 4 deletions

View File

@ -193,6 +193,11 @@ public class PickingSupport {
}
return picked;
}
public synchronized void unRegisterAllPickableObjects(){
pickables.clear();
pickableTargets.clear();
}
/*********************/

View File

@ -4,6 +4,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.List;
@ -27,13 +28,13 @@ public class SmokeTest {
IOParsers.exportSmf(dt.getTriangulation(), smfTemp);
assertThat(
data + " trangulation is correct for smf",
IOUtils.contentEquals(FileUtils.openInputStream(smfTemp),
this.getClass().getResourceAsStream("/outputs/" + data + "_result.smf")));
IOUtils.contentEqualsIgnoreEOL(new InputStreamReader(FileUtils.openInputStream(smfTemp)),
new InputStreamReader(this.getClass().getResourceAsStream("/outputs/" + data + "_result.smf"))));
IOParsers.exportTsin(dt, tsinTemp);
assertThat(
data + " trangulation is correct tsin",
IOUtils.contentEquals(FileUtils.openInputStream(tsinTemp),
this.getClass().getResourceAsStream("/outputs/" + data + "_result.tsin")));
IOUtils.contentEqualsIgnoreEOL(new InputStreamReader(FileUtils.openInputStream(tsinTemp)),
new InputStreamReader(this.getClass().getResourceAsStream("/outputs/" + data + "_result.tsin"))));
} catch (IOException e) {
e.printStackTrace();
Assert.fail("Failed on " + data);