Modify to pass tests on windows

Resolves: https://www.pivotaltracker.com/story/show/72660156
fcrepo4-archive · Jun 5, 2014 · 9676453 · 9676453
1 parent 0dcfcb6
commit 9676453
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/fcrepo-jms-indexer-core/src/test/java/org/fcrepo/indexer/FileSerializerTest.java b/fcrepo-jms-indexer-core/src/test/java/org/fcrepo/indexer/FileSerializerTest.java
@@ -67,7 +67,7 @@ public void pathTest() throws IOException {
 
     @Test
     public void updateTest() throws IOException, InterruptedException, ExecutionException {
-        final String testId = "updateTest:" + randomUUID();
+        final String testId = "updateTest" + randomUUID();
         final Collection<String> values = asList("value1", "value2");
         final NamedFields testContent =
             new NamedFields(of("testProperty", values));
@@ -86,7 +86,7 @@ public void updateTest() throws IOException, InterruptedException, ExecutionExce
 
     @Test
     public void removeTest() throws IOException, InterruptedException, ExecutionException {
-        final String testId = "removeTest:" + randomUUID();
+        final String testId = "removeTest" + randomUUID();
 
         // should write empty file to disk
         final File f = serializer.remove(testId).get();

diff --git a/fcrepo-jms-indexer-core/src/test/java/org/fcrepo/indexer/integration/IndexerGroupIT.java b/fcrepo-jms-indexer-core/src/test/java/org/fcrepo/indexer/integration/IndexerGroupIT.java
@@ -40,6 +40,7 @@
  * @author ajs6f
  * @author Esmé Cowles
  * @date Aug 19, 2013
+ *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration({"/spring-test/test-container.xml"})
@@ -55,11 +56,12 @@ public class IndexerGroupIT extends IndexingIT {
 
     private static final Logger LOGGER = getLogger(IndexerGroupIT.class);
 
+    // FIXME: The tests in these suites sometimes fail on windows builds
+    //        https://www.pivotaltracker.com/story/show/72709646
     @Test
     public void testIndexerGroupUpdate() throws Exception {
         doIndexerGroupUpdateTest(serverAddress + "updateTestPid");
     }
-
     private void doIndexerGroupUpdateTest(final String uri) throws Exception {
         final HttpPut createRequest = new HttpPut(uri);
         final String objectRdf =

diff --git a/...s-indexer-webapp/src/test/java/org/fcrepo/indexer/integration/webapp/FedoraIndexerIT.java b/...s-indexer-webapp/src/test/java/org/fcrepo/indexer/integration/webapp/FedoraIndexerIT.java
@@ -57,6 +57,7 @@ public void testReindex() throws IOException {
         final HttpPost reindex = new HttpPost(serverAddress + "/reindex/");
         final HttpResponse response = client.execute(reindex);
         assertEquals(200, response.getStatusLine().getStatusCode());
-        assertEquals("Reindexing started\n", EntityUtils.toString(response.getEntity()) );
+        //substring required for OS specific differences
+        assertEquals("Reindexing started".substring(0,18), EntityUtils.toString(response.getEntity()).substring(0,18));
     }
 }