Fixed a handful of unit tests.

netarchivesuite · Oct 17, 2016 · 613f81f · 613f81f
1 parent 2f054e8
commit 613f81f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/common/common-core/src/main/resources/dk/netarkivet/common/settings.xml b/common/common-core/src/main/resources/dk/netarkivet/common/settings.xml
@@ -37,7 +37,7 @@ National Library.
         <organization>netarkivet.dk</organization>
         <tempDir>./tests/commontempdir</tempDir>
         <metadata>
-            <fileregexsuffix>-metadata-[0-9]+.(w)?arc(\\.gz)?</fileregexsuffix>
+            <fileregexsuffix>-metadata-[0-9]+.(w)?arc(.gz)?</fileregexsuffix>
         </metadata>
         <remoteFile>
             <class>dk.netarkivet.common.distribute.HTTPRemoteFile</class>

diff --git a/harvester/harvester-test/src/test/java/dk/netarkivet/viewerproxy/GetDataResolverTester.java b/harvester/harvester-test/src/test/java/dk/netarkivet/viewerproxy/GetDataResolverTester.java
@@ -86,10 +86,12 @@ public void tearDown() {
     @Test
     public void testExecuteCommand() throws Exception {
         String urlPrefix = "http://" + "netarchivesuite.viewerproxy.invalid";
-        URIResolver res = new GetDataResolver(new URIResolver() {
+        URIResolver res = new GetDataResolver(
+                new URIResolver() {
             public int lookup(Request request, Response response) {
                 return 201;
             }
+
         }, arcrep);
         Response response = makeNewResponse();
         File testFile = new File(TestInfo.WORKING_DIR, "fyensdk.arc");
@@ -159,6 +161,10 @@ public int lookup(Request request, Response response) {
 
     private Response makeNewResponse() {
         return new Response() {
+            @Override public int hashCode() {
+                throw new RuntimeException("Not yet implemented");
+            }
+
             int status = 500;
             private String reason = "Never set";
             ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -178,7 +184,7 @@ public void setStatus(int statusCode, String reason) {
 
             public void addHeaderField(String name, String value) {
                 // TODO: implement method
-                throw new NotImplementedException("Not implemented");
+                // throw new NotImplementedException("Not implemented");
             }
 
             public int getStatus() {

diff --git a/...t/src/test/java/dk/netarkivet/wayback/batch/DeduplicationCDXExtractionBatchJobTester.java b/...t/src/test/java/dk/netarkivet/wayback/batch/DeduplicationCDXExtractionBatchJobTester.java
@@ -47,7 +47,7 @@
  */
 public class DeduplicationCDXExtractionBatchJobTester {
 
-    public static final String METADATA_FILENAME = "duplicate.metadata.arc";
+    public static final String METADATA_FILENAME = "12345-metadata-4.arc";
     /** The two next files doesn't exist, therefore renamed from REAL to UNREAL */
     public static final String METADATA_FILENAME_UNREAL_1 = "124412-metadata-1.arc";
     public static final String METADATA_FILENAME_UNREAL_2 = "124399-metadata-1.arc";

diff --git a/wayback/wayback-test/src/test/java/dk/netarkivet/wayback/indexer/ArchiveFileTester.java b/wayback/wayback-test/src/test/java/dk/netarkivet/wayback/indexer/ArchiveFileTester.java
@@ -70,7 +70,7 @@ public void testIndexerArc() {
     @Test
     public void testIndexerMetadata() {
         ArchiveFile file = new ArchiveFile();
-        file.setFilename("duplicate.metadata.arc");
+        file.setFilename("12345-metadata-4.arc");
         (new ArchiveFileDAO()).create(file);
         file.index();
         File outputFile = new File(destDir, file.getOriginalIndexFileName());

diff --git a/...ack/data/originals/duplicate.metadata.arc → ...yback/data/originals/12345-metadata-4.arc b/...ack/data/originals/duplicate.metadata.arc → ...yback/data/originals/12345-metadata-4.arc
diff --git a/.../originals/filedir/duplicate.metadata.arc → ...ta/originals/filedir/12345-metadata-4.arc b/.../originals/filedir/duplicate.metadata.arc → ...ta/originals/filedir/12345-metadata-4.arc