You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/10/31 13:06:07 UTC
[1/2] git commit: trying to make the ldpath-functions-date tests more
robust
Repository: marmotta
Updated Branches:
refs/heads/develop 8f32c8179 -> e17047295
trying to make the ldpath-functions-date tests more robust
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e1704729
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e1704729
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e1704729
Branch: refs/heads/develop
Commit: e17047295eb8ca3d49d4292ef891f0f0d05aa5f9
Parents: 23b6404
Author: Jakob Frank <ja...@apache.org>
Authored: Fri Oct 31 13:02:55 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri Oct 31 13:05:52 2014 +0100
----------------------------------------------------------------------
.../marmotta/ldpath/model/functions/date/DateFunctionsTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e1704729/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java b/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java
index ea8c9e8..e79d52c 100644
--- a/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java
+++ b/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java
@@ -47,7 +47,7 @@ public class DateFunctionsTest extends AbstractTestBase {
@Before
public void loadData() throws RepositoryException, RDFParseException, IOException {
- final int delta = 60 * 60 * 24 * 365;
+ final int day = 60 * 60 * 24, delta = day * 365;
now = new Date(1000*(System.currentTimeMillis() / 1000));
first = new Date(now.getTime() - 1000l * delta);
@@ -64,7 +64,7 @@ public class DateFunctionsTest extends AbstractTestBase {
final Random rnd = new Random();
for (int i = 0; i < 20; i++) {
- Date d = new Date(first.getTime() + rnd.nextInt(delta) * 1000l);
+ Date d = new Date(first.getTime() + (day + rnd.nextInt(delta-2)) * 1000l);
con.add(vF.createStatement(uri, prop, vF.createLiteral(DateUtils.getXMLCalendar(d))));
}
[2/2] git commit: MARMOTTA-559: Skip locales that contain Java7
script/extensions to avoid test-regression until this issue has been fixed.
Posted by ja...@apache.org.
MARMOTTA-559: Skip locales that contain Java7 script/extensions to avoid test-regression until this issue has been fixed.
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/23b6404b
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/23b6404b
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/23b6404b
Branch: refs/heads/develop
Commit: 23b6404b306cec2b08563362834d3a66d0ca68be
Parents: 8f32c81
Author: Jakob Frank <ja...@apache.org>
Authored: Fri Oct 31 11:30:36 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri Oct 31 13:05:52 2014 +0100
----------------------------------------------------------------------
.../sesame/facading/primitive/BoxedFacadingTest.java | 14 ++++++++++----
.../sesame/facading/primitive/model/PropBuilder.java | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/23b6404b/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/BoxedFacadingTest.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/BoxedFacadingTest.java b/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/BoxedFacadingTest.java
index 5efc18a..0f6e330 100644
--- a/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/BoxedFacadingTest.java
+++ b/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/BoxedFacadingTest.java
@@ -36,14 +36,13 @@ import org.openrdf.repository.RepositoryException;
public class BoxedFacadingTest extends AbstractFacadingTest {
- private URI subject;
private Random random;
private RepositoryConnection facadingConnection;
private Boxed boxed;
@Before
public void before() throws Exception {
- subject = repositoryRDF.getValueFactory().createURI("urn:", UUID.randomUUID().toString());
+ final URI subject = repositoryRDF.getValueFactory().createURI("urn:", UUID.randomUUID().toString());
random = new Random();
facadingConnection = repositoryRDF.getConnection();
@@ -137,9 +136,16 @@ public class BoxedFacadingTest extends AbstractFacadingTest {
Assert.assertNull(boxed.getLocale());
for (Locale l: Locale.getAvailableLocales()) {
+ // FIXME: This is to avoid MARMOTTA-559
+ if (l.toString().contains("#")) continue;
+
boxed.setLocale(l);
- //Assert.assertEquals(l, boxed.getLocale());
- Assert.assertEquals(l.getDisplayLanguage(), boxed.getLocale().getDisplayLanguage());
+
+ final Locale locale = boxed.getLocale();
+
+ Assert.assertNotNull(locale);
+ //Assert.assertEquals(l, locale);
+ Assert.assertEquals(l.getDisplayLanguage(), locale.getDisplayLanguage());
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/23b6404b/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/PropBuilder.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/PropBuilder.java b/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/PropBuilder.java
index 98bfc3e..3049035 100644
--- a/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/PropBuilder.java
+++ b/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/PropBuilder.java
@@ -23,7 +23,7 @@ public class PropBuilder extends AbstractNamespacePropBuilder {
@Override
protected String getNamespace() {
- return "http://persistence.text/prop#";
+ return "http://persistence.test/prop#";
}
}