Author: rlaidlaw
Date: Wed Aug 6 06:16:03 2014
New Revision: 1616106
URL: http://svn.apache.org/r1616106
Log:
OODT-739: updated tests in file manager metadata and versioning packages to
find test resources and reset system properties
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestMimeTypeExtractor.java
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestMetadataBasedFileVersioner.java
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestSingleFileBasicVersioner.java
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1616106&r1=1616105&r2=1616106&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Wed Aug 6 06:16:03 2014
@@ -4,6 +4,9 @@ Apache OODT Change Log
Release 0.7 - Current Development
--------------------------------------------
+* OODT-739 Fix File Manager unit tests (step 12) - fix test classes in
+ 'metadata' and 'versioning' packages (rlaidlaw)
+
* OODT-738 Contribute workflow scripts to kill all by status or kill by
instance ID (mattmann)
* OODT-737 Fix File Manager unit tests (step 11) - fix test classes in 'cli'
Modified:
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestMimeTypeExtractor.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestMimeTypeExtractor.java?rev=1616106&r1=1616105&r2=1616106&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestMimeTypeExtractor.java
(original)
+++
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestMimeTypeExtractor.java
Wed Aug 6 06:16:03 2014
@@ -19,7 +19,8 @@ package org.apache.oodt.cas.filemgr.meta
//Junit imports
import java.io.File;
-
+import java.net.URL;
+import java.util.Properties;
//OODT imports
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
@@ -39,9 +40,18 @@ import junit.framework.TestCase;
*/
public class TestMimeTypeExtractor extends TestCase implements CoreMetKeys {
- public TestMimeTypeExtractor() {
- System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository",
- new File("./src/main/resources/mime-types.xml").getAbsolutePath());
+ private Properties initialProperties = new
Properties(System.getProperties());
+
+ public void setUp() throws Exception {
+ Properties properties = new Properties(System.getProperties());
+ URL url = this.getClass().getResource("/mime-types.xml");
+ properties.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository",
+ new File(url.getFile()).getAbsolutePath());
+ System.setProperties(properties);
+ }
+
+ public void tearDown() throws Exception {
+ System.setProperties(initialProperties);
}
/**
Modified:
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java?rev=1616106&r1=1616105&r2=1616106&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
(original)
+++
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
Wed Aug 6 06:16:03 2014
@@ -19,8 +19,10 @@ package org.apache.oodt.cas.filemgr.vers
//JDK imports
import java.io.File;
+import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Properties;
import java.util.TimeZone;
//OODT imports
@@ -42,9 +44,18 @@ import junit.framework.TestCase;
*/
public class TestAcquisitionDateVersioner extends TestCase {
- public TestAcquisitionDateVersioner() {
- System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository",
- new File("./src/main/resources/mime-types.xml").getAbsolutePath());
+ private Properties initialProperties = new
Properties(System.getProperties());
+
+ public void setUp() throws Exception {
+ Properties properties = new Properties(System.getProperties());
+ URL url = this.getClass().getResource("/mime-types.xml");
+ properties.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository",
+ new File(url.getFile()).getAbsolutePath());
+ System.setProperties(properties);
+ }
+
+ public void tearDown() throws Exception {
+ System.setProperties(initialProperties);
}
public void testVersionerWithNoStartDateTimeAndNoAcqDate() {
Modified:
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java?rev=1616106&r1=1616105&r2=1616106&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java
(original)
+++
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java
Wed Aug 6 06:16:03 2014
@@ -21,7 +21,9 @@ package org.apache.oodt.cas.filemgr.vers
//JDK imports
import java.io.File;
import java.net.MalformedURLException;
+import java.net.URL;
import java.util.List;
+import java.util.Properties;
import java.util.Vector;
//OODT imports
@@ -48,12 +50,19 @@ public class TestBasicVersioner extends
/* the BasicVersioner we're going to test out */
private BasicVersioner basicVersioner = new BasicVersioner();
- public TestBasicVersioner() {
-
System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository", new
File("./src/main/resources/mime-types.xml").getAbsolutePath());
- }
+ private Properties initialProperties = new
Properties(System.getProperties());
- protected void setUp() {
- }
+ public void setUp() throws Exception {
+ Properties properties = new Properties(System.getProperties());
+ URL url = this.getClass().getResource("/mime-types.xml");
+ properties.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository",
+ new File(url.getFile()).getAbsolutePath());
+ System.setProperties(properties);
+ }
+
+ public void tearDown() throws Exception {
+ System.setProperties(initialProperties);
+ }
public void testVersionFlat() {
Product p = new Product();
@@ -65,7 +74,8 @@ public class TestBasicVersioner extends
List refs = new Vector();
try {
- String refname = new
File("src/testdata/test.txt").toURL().toExternalForm().toString();
+ URL url = this.getClass().getResource("/test.txt");
+ String refname = new
File(url.getFile()).toURL().toExternalForm().toString();
refs.add(refname);
} catch (MalformedURLException e) {
fail(e.getMessage());
Modified:
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java?rev=1616106&r1=1616105&r2=1616106&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java
(original)
+++
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java
Wed Aug 6 06:16:03 2014
@@ -21,9 +21,11 @@ package org.apache.oodt.cas.filemgr.vers
// JDK imports
import java.io.File;
import java.net.MalformedURLException;
+import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Properties;
import java.util.Vector;
//OODT imports
@@ -32,7 +34,6 @@ import org.apache.oodt.cas.filemgr.struc
import org.apache.oodt.cas.filemgr.structs.Reference;
import org.apache.oodt.cas.filemgr.structs.exceptions.VersioningException;
import org.apache.oodt.cas.metadata.Metadata;
-
import org.apache.oodt.commons.util.DateConvert;
//Junit imports
@@ -52,27 +53,19 @@ public class TestDateTimeVersioner exten
/* the versioner that we're going to test out */
private DateTimeVersioner dateTimeVersioner = new DateTimeVersioner();
- /**
- *
- */
- public TestDateTimeVersioner() {
- super();
- // TODO Auto-generated constructor stub
-
System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository", new
File("./src/main/resources/mime-types.xml").getAbsolutePath());
- }
-
- /**
- * @param arg0
- */
- public TestDateTimeVersioner(String arg0) {
- super(arg0);
- // TODO Auto-generated constructor stub
-
System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository", new
File("./src/main/resources/mime-types.xml").getAbsolutePath());
- }
-
- protected void setUp() {
+ private Properties initialProperties = new
Properties(System.getProperties());
- }
+ public void setUp() throws Exception {
+ Properties properties = new Properties(System.getProperties());
+ URL url = this.getClass().getResource("/mime-types.xml");
+ properties.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository",
+ new File(url.getFile()).getAbsolutePath());
+ System.setProperties(properties);
+ }
+
+ public void tearDown() throws Exception {
+ System.setProperties(initialProperties);
+ }
public void testFlat() {
Metadata metadata = new Metadata();
@@ -94,7 +87,8 @@ public class TestDateTimeVersioner exten
List refs = new Vector();
try {
- String refname = new
File("src/testdata/test.txt").toURL().toExternalForm().toString();
+ URL url = this.getClass().getResource("/test.txt");
+ String refname = new
File(url.getFile()).toURL().toExternalForm().toString();
refs.add(refname);
} catch (MalformedURLException e) {
fail(e.getMessage());
Modified:
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java?rev=1616106&r1=1616105&r2=1616106&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java
(original)
+++
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java
Wed Aug 6 06:16:03 2014
@@ -20,6 +20,8 @@ package org.apache.oodt.cas.filemgr.vers
//JDK imports
import java.io.File;
+import java.net.URL;
+import java.util.Properties;
//OODT imports
import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
@@ -39,9 +41,18 @@ import junit.framework.TestCase;
*/
public class TestDirectoryBasedProductVersioner extends TestCase {
- public TestDirectoryBasedProductVersioner() {
- System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository",
- new File("./src/main/resources/mime-types.xml").getAbsolutePath());
+ private Properties initialProperties = new
Properties(System.getProperties());
+
+ public void setUp() throws Exception {
+ Properties properties = new Properties(System.getProperties());
+ URL url = this.getClass().getResource("/mime-types.xml");
+ properties.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository",
+ new File(url.getFile()).getAbsolutePath());
+ System.setProperties(properties);
+ }
+
+ public void tearDown() throws Exception {
+ System.setProperties(initialProperties);
}
public void testVersioner() {
Modified:
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestMetadataBasedFileVersioner.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestMetadataBasedFileVersioner.java?rev=1616106&r1=1616105&r2=1616106&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestMetadataBasedFileVersioner.java
(original)
+++
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestMetadataBasedFileVersioner.java
Wed Aug 6 06:16:03 2014
@@ -21,6 +21,8 @@ package org.apache.oodt.cas.filemgr.vers
//JDK imports
import java.io.File;
+import java.net.URL;
+import java.util.Properties;
//OODT imports
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductType;
@@ -43,16 +45,19 @@ public class TestMetadataBasedFileVersio
private String productTypePath = "file:/foo/bar";
- /**
- *
- */
- public TestMetadataBasedFileVersioner() {
-
System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository", new
File("./src/main/resources/mime-types.xml").getAbsolutePath());
- }
-
- protected void setUp() {
+ private Properties initialProperties = new
Properties(System.getProperties());
- }
+ public void setUp() throws Exception {
+ Properties properties = new Properties(System.getProperties());
+ URL url = this.getClass().getResource("/mime-types.xml");
+ properties.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository",
+ new File(url.getFile()).getAbsolutePath());
+ System.setProperties(properties);
+ }
+
+ public void tearDown() throws Exception {
+ System.setProperties(initialProperties);
+ }
public void testVersionerNoStatic() {
String filePathSpec =
"/[ProductType]/[ProductionDate]/[Filename]";
Modified:
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestSingleFileBasicVersioner.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestSingleFileBasicVersioner.java?rev=1616106&r1=1616105&r2=1616106&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestSingleFileBasicVersioner.java
(original)
+++
oodt/trunk/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestSingleFileBasicVersioner.java
Wed Aug 6 06:16:03 2014
@@ -21,6 +21,8 @@ package org.apache.oodt.cas.filemgr.vers
//JDK imports
import java.io.File;
+import java.net.URL;
+import java.util.Properties;
//OODT imports
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductType;
@@ -46,12 +48,19 @@ public class TestSingleFileBasicVersione
private String productRepoPath = "file:/foo/bar2/";
- /**
- *
- */
- public TestSingleFileBasicVersioner() {
-
System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository", new
File("./src/main/resources/mime-types.xml").getAbsolutePath());
- }
+ private Properties initialProperties = new
Properties(System.getProperties());
+
+ public void setUp() throws Exception {
+ Properties properties = new Properties(System.getProperties());
+ URL url = this.getClass().getResource("/mime-types.xml");
+ properties.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository",
+ new File(url.getFile()).getAbsolutePath());
+ System.setProperties(properties);
+ }
+
+ public void tearDown() throws Exception {
+ System.setProperties(initialProperties);
+ }
public void testVersioning(){
Product product = new Product();
