You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by im...@apache.org on 2019/08/25 07:02:03 UTC
[oodt] branch development updated: move metadata/test/org to
metadata/test/java/org for consistency
This is an automated email from the ASF dual-hosted git repository.
imesha pushed a commit to branch development
in repository https://gitbox.apache.org/repos/asf/oodt.git
The following commit(s) were added to refs/heads/development by this push:
new 4361c19 move metadata/test/org to metadata/test/java/org for consistency
new 4681849 Merge pull request #108 from yasithmilinda/OODT-1022
4361c19 is described below
commit 4361c191a327ab5899238c0e7cea88e4156fc0f6
Author: yasith <ya...@cs.odu.edu>
AuthorDate: Wed Aug 21 05:20:12 2019 -0400
move metadata/test/org to metadata/test/java/org for consistency
---
.../org/apache/oodt/cas/metadata/MetadataTestCase.java | 0
.../org/apache/oodt/cas/metadata/TestMetadata.java | 0
.../oodt/cas/metadata/TestSerializableMetadata.java | 18 ++++++++----------
.../extractors/TestAbstractSAXConfigReader.java | 0
.../extractors/TestCopyAndRewriteExtractor.java | 6 +++---
.../extractors/TestDataSourceMetExtractor.java | 0
.../metadata/extractors/TestExternMetExtractor.java | 4 ++--
.../extractors/TestExternMetExtractorConfigReader.java | 0
.../oodt/cas/metadata/extractors/TestMetReader.java | 6 +++---
.../extractors/TestProdTypePatternMetExtractor.java | 0
.../filenaming/TestPathUtilsNamingConvention.java | 0
.../metadata/preconditions/TestPreCondEvalUtils.java | 0
.../oodt/cas/metadata/util/TestMimeTypeUtils.java | 0
.../apache/oodt/cas/metadata/util/TestPathUtils.java | 0
14 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/MetadataTestCase.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/MetadataTestCase.java
similarity index 100%
rename from metadata/src/test/org/apache/oodt/cas/metadata/MetadataTestCase.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/MetadataTestCase.java
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/TestMetadata.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/TestMetadata.java
similarity index 100%
rename from metadata/src/test/org/apache/oodt/cas/metadata/TestMetadata.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/TestMetadata.java
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/TestSerializableMetadata.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/TestSerializableMetadata.java
similarity index 93%
rename from metadata/src/test/org/apache/oodt/cas/metadata/TestSerializableMetadata.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/TestSerializableMetadata.java
index 3c523d5..2ddf9f3 100644
--- a/metadata/src/test/org/apache/oodt/cas/metadata/TestSerializableMetadata.java
+++ b/metadata/src/test/java/org/apache/oodt/cas/metadata/TestSerializableMetadata.java
@@ -73,8 +73,8 @@ public class TestSerializableMetadata extends TestCase {
ois.close();
assertNotNull(sm2);
- assertNotNull(sm2.getHashtable());
- assertEquals(2, sm2.getHashtable().size());
+ assertNotNull(sm2.getMap());
+ assertEquals(2, sm2.getMap().size());
assertNotNull(sm2.getMetadata("key1"));
assertEquals("val1", sm2.getMetadata("key1"));
assertNotNull(sm2.getMetadata("key2"));
@@ -106,8 +106,8 @@ public class TestSerializableMetadata extends TestCase {
out.close();
assertNotNull(metadata2);
- assertNotNull(metadata2.getHashtable());
- assertEquals(2, metadata2.getHashtable().size());
+ assertNotNull(metadata2.getMap());
+ assertEquals(2, metadata2.getMap().size());
assertNotNull(metadata2.getMetadata("Name1"));
assertEquals("Value1", metadata2.getMetadata("Name1"));
assertNotNull(metadata2.getMetadata("Name2"));
@@ -127,8 +127,8 @@ public class TestSerializableMetadata extends TestCase {
Metadata mConv = sm.getMetadata();
assertNotNull(mConv);
- assertNotNull(mConv.getHashtable());
- assertEquals(2, mConv.getHashtable().size());
+ assertNotNull(mConv.getMap());
+ assertEquals(2, mConv.getMap().size());
assertNotNull(mConv.getMetadata("key1"));
assertEquals("val1", mConv.getMetadata("key1"));
assertNotNull(mConv.getMetadata("key2"));
@@ -146,7 +146,6 @@ public class TestSerializableMetadata extends TestCase {
try {
XMLUtils.writeXmlToStream(metadata.toXML(), out);
} catch (Exception e) {
- LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
@@ -155,14 +154,13 @@ public class TestSerializableMetadata extends TestCase {
metadata2 = new SerializableMetadata(new ByteArrayInputStream(out
.toByteArray()));
} catch (Exception e) {
- LOG.log(Level.SEVERE, e.getMessage());
fail(e.getMessage());
}
assertNotNull(metadata2);
- assertNotNull(metadata2.getHashtable());
+ assertNotNull(metadata2.getMap());
- assertEquals(2, metadata2.getHashtable().size());
+ assertEquals(2, metadata2.getMap().size());
assertNotNull(metadata2.getMetadata("Name1"));
assertEquals("Value1", metadata2.getMetadata("Name1"));
assertNotNull(metadata2.getMetadata("Name2"));
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestAbstractSAXConfigReader.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestAbstractSAXConfigReader.java
similarity index 100%
rename from metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestAbstractSAXConfigReader.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestAbstractSAXConfigReader.java
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java
similarity index 96%
rename from metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java
index 5c69f30..65a476c 100644
--- a/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java
+++ b/metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java
@@ -68,9 +68,9 @@ public class TestCopyAndRewriteExtractor extends MetadataTestCase {
}
assertNotNull(met);
- assertNotNull(met.getHashtable());
- assertNotNull(met.getHashtable().keySet());
- assertEquals(3, met.getHashtable().keySet().size());
+ assertNotNull(met.getMap());
+ assertNotNull(met.getMap().keySet());
+ assertEquals(3, met.getMap().keySet().size());
assertTrue(met.containsKey(FILENAME));
assertEquals(expectedFilename, met.getMetadata(FILENAME));
assertTrue(met.containsKey(PRODUCT_TYPE));
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestDataSourceMetExtractor.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestDataSourceMetExtractor.java
similarity index 100%
rename from metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestDataSourceMetExtractor.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestDataSourceMetExtractor.java
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractor.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractor.java
similarity index 99%
rename from metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractor.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractor.java
index 9be4f07..d577b08 100644
--- a/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractor.java
+++ b/metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractor.java
@@ -144,11 +144,11 @@ public class TestExternMetExtractor extends MetadataTestCase {
replaceMet.addMetadata(testPathKey, extractorFile.getParent());
confFileContents = PathUtils.replaceEnvVariables(confFileContents, replaceMet);
FileUtils.writeStringToFile(this.confFile, confFileContents);
-
+
try {
extractor = new ExternMetExtractor();
- } catch (InstantiationException e) {
+ } catch (Exception e) {
fail(e.getMessage());
}
}
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractorConfigReader.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractorConfigReader.java
similarity index 100%
rename from metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractorConfigReader.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractorConfigReader.java
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestMetReader.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestMetReader.java
similarity index 95%
rename from metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestMetReader.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestMetReader.java
index dd944a3..55bdb61 100644
--- a/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestMetReader.java
+++ b/metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestMetReader.java
@@ -64,9 +64,9 @@ public class TestMetReader extends MetadataTestCase {
}
assertNotNull(met);
- assertNotNull(met.getHashtable());
- assertNotNull(met.getHashtable().keySet());
- assertEquals(3, met.getHashtable().keySet().size());
+ assertNotNull(met.getMap());
+ assertNotNull(met.getMap().keySet());
+ assertEquals(3, met.getMap().keySet().size());
assertTrue(met.containsKey(FILENAME));
assertEquals(met.getMetadata(FILENAME), expectedFilename);
assertTrue(met.containsKey(FILE_LOCATION));
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestProdTypePatternMetExtractor.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestProdTypePatternMetExtractor.java
similarity index 100%
rename from metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestProdTypePatternMetExtractor.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/extractors/TestProdTypePatternMetExtractor.java
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/filenaming/TestPathUtilsNamingConvention.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/filenaming/TestPathUtilsNamingConvention.java
similarity index 100%
rename from metadata/src/test/org/apache/oodt/cas/metadata/filenaming/TestPathUtilsNamingConvention.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/filenaming/TestPathUtilsNamingConvention.java
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java
similarity index 100%
rename from metadata/src/test/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/util/TestMimeTypeUtils.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/util/TestMimeTypeUtils.java
similarity index 100%
rename from metadata/src/test/org/apache/oodt/cas/metadata/util/TestMimeTypeUtils.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/util/TestMimeTypeUtils.java
diff --git a/metadata/src/test/org/apache/oodt/cas/metadata/util/TestPathUtils.java b/metadata/src/test/java/org/apache/oodt/cas/metadata/util/TestPathUtils.java
similarity index 100%
rename from metadata/src/test/org/apache/oodt/cas/metadata/util/TestPathUtils.java
rename to metadata/src/test/java/org/apache/oodt/cas/metadata/util/TestPathUtils.java