From cf9eb4ed97f1e52c92d2d032b683b6a787cf345a Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Tue, 19 Jul 2016 13:25:53 +0200 Subject: [PATCH] FIX: PathTests - they fail on windows machine, because the OS translates "/tmp" to "c:\tmp". bumped classpath-canner to current API version --- pom.xml | 4 ++-- .../ebeaninternal/server/type/ScalarTypePathTest.java | 10 ++++++---- src/test/java/com/avaje/tests/types/TestNewTypes.java | 7 +++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 90d1e316e..b6ed808b4 100644 --- a/pom.xml +++ b/pom.xml @@ -69,13 +69,13 @@ org.avaje avaje-classpath-scanner-api - 2.1 + 2.2-SNAPSHOT org.avaje avaje-classpath-scanner - 2.1.1 + 2.1.2-SNAPSHOT diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePathTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePathTest.java index 01e6a0c97..b14c2569b 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePathTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePathTest.java @@ -2,21 +2,23 @@ package com.avaje.ebeaninternal.server.type; import org.junit.Test; +import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; import static org.junit.Assert.assertEquals; public class ScalarTypePathTest { - + private static final String TEMP_PATH = new File("/tmp").getAbsolutePath(); + private ScalarTypePath type = new ScalarTypePath(); @Test public void convertFromDbString() throws Exception { - Path path = Paths.get("/tmp"); + Path path = Paths.get(TEMP_PATH); - String asString = type.convertToDbString(path); + String asString = type.convertToDbString(path); // "/tmp" will be converted to "file://c:/tmp" on windows Path converted = type.convertFromDbString(asString); assertEquals(path, converted); @@ -25,7 +27,7 @@ public class ScalarTypePathTest { @Test public void formatAndParse() throws Exception { - Path path = Paths.get("/tmp"); + Path path = Paths.get(TEMP_PATH); String asString = type.formatValue(path); Path converted = type.parse(asString); diff --git a/src/test/java/com/avaje/tests/types/TestNewTypes.java b/src/test/java/com/avaje/tests/types/TestNewTypes.java index 9955ed93e..db0cebe8e 100644 --- a/src/test/java/com/avaje/tests/types/TestNewTypes.java +++ b/src/test/java/com/avaje/tests/types/TestNewTypes.java @@ -5,6 +5,7 @@ import com.avaje.ebean.Ebean; import com.avaje.tests.model.types.SomeNewTypesBean; import org.junit.Test; +import java.io.File; import java.io.IOException; import java.nio.file.Paths; import java.time.*; @@ -16,6 +17,7 @@ import static org.junit.Assert.assertTrue; public class TestNewTypes extends BaseTestCase { + private static final String TEMP_PATH = new File("/tmp").getAbsolutePath(); @Test public void testInsertUpdate() throws IOException { @@ -31,7 +33,7 @@ public class TestNewTypes extends BaseTestCase { bean.setZoneId(ZoneId.systemDefault()); bean.setZoneOffset(ZonedDateTime.now().getOffset()); bean.setYearMonth(YearMonth.of(2014, 9)); - bean.setPath(Paths.get("/tmp")); + bean.setPath(Paths.get(TEMP_PATH)); Ebean.save(bean); @@ -71,7 +73,7 @@ public class TestNewTypes extends BaseTestCase { list = Ebean.find(SomeNewTypesBean.class).where().le("month", Month.SEPTEMBER).findList(); assertTrue(!list.isEmpty()); - list = Ebean.find(SomeNewTypesBean.class).where().eq("path", Paths.get("/tmp")).findList(); + list = Ebean.find(SomeNewTypesBean.class).where().eq("path", Paths.get(TEMP_PATH)).findList(); assertTrue(!list.isEmpty()); SomeNewTypesBean fetched = Ebean.find(SomeNewTypesBean.class, bean.getId()); @@ -100,6 +102,7 @@ public class TestNewTypes extends BaseTestCase { assertEquals(bean.getLocalDateTime(), toBean.getLocalDateTime()); assertEquals(bean.getOffsetDateTime(), toBean.getOffsetDateTime()); assertEquals(bean.getInstant(), toBean.getInstant()); + // FIXME: This test fails on Windows with: expected:<\tmp> but was: assertEquals(bean.getPath(), toBean.getPath()); }