[jackson-jaxrs-providers] 10/162: Clean up tests
Timo Aaltonen
tjaalton at moszumanska.debian.org
Mon Sep 8 22:16:23 UTC 2014
This is an automated email from the git hooks/post-receive script.
tjaalton pushed a commit to branch master
in repository jackson-jaxrs-providers.
commit 07e3c6a115a7727f3f8ed1cd98ebb0e25417707d
Author: Tatu Saloranta <tsaloranta at gmail.com>
Date: Mon Feb 4 14:51:47 2013 -0800
Clean up tests
---
.../{TestVersions.java => TestJSONVersions.java} | 2 +-
.../jackson/jaxrs/smile/JacksonSmileProvider.java | 6 ++--
.../jackson/jaxrs/smile/ModuleVersion.java | 12 -------
.../jaxrs/smile/annotation/EndpointConfig.java | 2 +-
.../jackson/jaxrs/smile/TestSmileVersions.java | 6 ++--
.../jackson/jaxrs/xml/JacksonXMLProvider.java | 6 ++--
.../fasterxml/jackson/jaxrs/xml/ModuleVersion.java | 12 -------
.../jaxrs/xml/annotation/EndpointConfig.java | 4 +--
.../jackson/jaxrs/xml/cfg/MapperConfigurator.java | 3 --
.../fasterxml/jackson/jaxrs/xml/TestVersions.java | 42 ----------------------
.../jackson/jaxrs/xml/TestXMLVersions.java | 7 ++--
11 files changed, 17 insertions(+), 85 deletions(-)
diff --git a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestVersions.java b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestJSONVersions.java
similarity index 93%
copy from json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestVersions.java
copy to json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestJSONVersions.java
index be30cff..57bc25a 100644
--- a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestVersions.java
+++ b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestJSONVersions.java
@@ -3,7 +3,7 @@ package com.fasterxml.jackson.jaxrs.json;
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.core.Versioned;
-public class TestVersions extends JaxrsTestBase
+public class TestJSONVersions extends JaxrsTestBase
{
public void testMapperVersions()
{
diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java
index 68139cd..4c9d867 100644
--- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java
+++ b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java
@@ -235,7 +235,7 @@ public class JacksonSmileProvider
* that contains this class.
*/
public Version version() {
- return ModuleVersion.instance.version();
+ return PackageVersion.VERSION;
}
/*
@@ -427,7 +427,7 @@ public class JacksonSmileProvider
}
}
ObjectReader reader = endpoint.getReader();
- JsonParser jp = reader.getFactory().createJsonParser(entityStream);
+ JsonParser jp = reader.getFactory().createParser(entityStream);
// [Issue#1]: should return null for empty/missing payload
// (note! Requires smile module v2.1.1)
if (jp.nextToken() == null) {
@@ -529,7 +529,7 @@ public class JacksonSmileProvider
* HTTP headers?
*/
JsonEncoding enc = findEncoding(mediaType, httpHeaders);
- JsonGenerator jg = writer.getJsonFactory().createJsonGenerator(entityStream, enc);
+ JsonGenerator jg = writer.getFactory().createGenerator(entityStream, enc);
// Want indentation?
if (writer.isEnabled(SerializationFeature.INDENT_OUTPUT)) {
diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/ModuleVersion.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/ModuleVersion.java
deleted file mode 100644
index cd2efca..0000000
--- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/ModuleVersion.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.fasterxml.jackson.jaxrs.smile;
-
-import com.fasterxml.jackson.core.util.VersionUtil;
-
-/**
-* Helper class used for finding and caching version information
-* for this module.
-*/
-class ModuleVersion extends VersionUtil
-{
- public final static ModuleVersion instance = new ModuleVersion();
-}
\ No newline at end of file
diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/EndpointConfig.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/EndpointConfig.java
index 03d9acd..0c6d9af 100644
--- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/EndpointConfig.java
+++ b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/EndpointConfig.java
@@ -145,7 +145,7 @@ public class EndpointConfig
/* Important: we are NOT to close the underlying stream after
* mapping, so we need to instruct parser:
*/
- _writer.getJsonFactory().disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+ _writer.getFactory().disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
return this;
}
diff --git a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestVersions.java b/smile/src/test/java/com/fasterxml/jackson/jaxrs/smile/TestSmileVersions.java
similarity index 81%
copy from json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestVersions.java
copy to smile/src/test/java/com/fasterxml/jackson/jaxrs/smile/TestSmileVersions.java
index be30cff..6144ac4 100644
--- a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestVersions.java
+++ b/smile/src/test/java/com/fasterxml/jackson/jaxrs/smile/TestSmileVersions.java
@@ -1,13 +1,13 @@
-package com.fasterxml.jackson.jaxrs.json;
+package com.fasterxml.jackson.jaxrs.smile;
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.core.Versioned;
-public class TestVersions extends JaxrsTestBase
+public class TestSmileVersions extends JaxrsTestBase
{
public void testMapperVersions()
{
- assertVersion(new JacksonJsonProvider());
+ assertVersion(new JacksonSmileProvider());
}
/*
diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java
index 01dd4e7..122080e 100644
--- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java
+++ b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java
@@ -238,7 +238,7 @@ public class JacksonXMLProvider
* that contains this class.
*/
public Version version() {
- return ModuleVersion.instance.version();
+ return PackageVersion.VERSION;
}
/*
@@ -419,7 +419,7 @@ public class JacksonXMLProvider
return null;
}
wrappedStream.unread(firstByte);
- JsonParser jp = reader.getJsonFactory().createJsonParser(wrappedStream);
+ JsonParser jp = reader.getFactory().createParser(wrappedStream);
return reader.withType(genericType).readValue(jp);
}
@@ -498,7 +498,7 @@ public class JacksonXMLProvider
* HTTP headers?
*/
JsonEncoding enc = findEncoding(mediaType, httpHeaders);
- JsonGenerator jg = writer.getJsonFactory().createJsonGenerator(entityStream, enc);
+ JsonGenerator jg = writer.getFactory().createGenerator(entityStream, enc);
// Want indentation?
if (writer.isEnabled(SerializationFeature.INDENT_OUTPUT)) {
diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/ModuleVersion.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/ModuleVersion.java
deleted file mode 100644
index c7ca123..0000000
--- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/ModuleVersion.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.fasterxml.jackson.jaxrs.xml;
-
-import com.fasterxml.jackson.core.util.VersionUtil;
-
-/**
- * Helper class used for finding and caching version information
- * for this module.
- */
-class ModuleVersion extends VersionUtil
-{
- public final static ModuleVersion instance = new ModuleVersion();
-}
diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/annotation/EndpointConfig.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/annotation/EndpointConfig.java
index 8816aec..f5fc3b7 100644
--- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/annotation/EndpointConfig.java
+++ b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/annotation/EndpointConfig.java
@@ -115,7 +115,7 @@ public class EndpointConfig
/* Important: we are NOT to close the underlying stream after
* mapping, so we need to instruct parser:
*/
- _reader.getJsonFactory().disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
+ _reader.getFactory().disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
return this;
}
@@ -145,7 +145,7 @@ public class EndpointConfig
/* Important: we are NOT to close the underlying stream after
* mapping, so we need to instruct parser:
*/
- _writer.getJsonFactory().disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+ _writer.getFactory().disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
return this;
}
diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/cfg/MapperConfigurator.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/cfg/MapperConfigurator.java
index 67f2749..9129d53 100644
--- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/cfg/MapperConfigurator.java
+++ b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/cfg/MapperConfigurator.java
@@ -5,7 +5,6 @@ import java.util.*;
import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
import com.fasterxml.jackson.dataformat.xml.JacksonXmlAnnotationIntrospector;
import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
@@ -14,8 +13,6 @@ import com.fasterxml.jackson.dataformat.xml.jaxb.XmlJaxbAnnotationIntrospector;
import com.fasterxml.jackson.jaxrs.xml.Annotations;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
-
/**
* Helper class used to encapsulate details of configuring an
* {@link XmlMapper} instance to be used for data binding, as
diff --git a/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestVersions.java b/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestVersions.java
deleted file mode 100644
index c97586d..0000000
--- a/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestVersions.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.fasterxml.jackson.jaxrs.xml;
-
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.core.Versioned;
-import com.fasterxml.jackson.jaxrs.xml.JacksonXMLProvider;
-
-public class TestVersions extends JaxrsTestBase
-{
- /**
- * Not a good to do this, but has to do, for now...
- */
- private final static int MAJOR_VERSION = 2;
- private final static int MINOR_VERSION = 1;
-
- // could inject using Maven filters as well...
- private final static String GROUP_ID = "com.fasterxml.jackson.jaxrs";
- private final static String ARTIFACT_ID = "jackson-jaxrs-xml-provider";
-
- public void testMapperVersions()
- {
- assertVersion(new JacksonXMLProvider());
- }
-
- /*
- /**********************************************************
- /* Helper methods
- /**********************************************************
- */
-
- private void assertVersion(Versioned vers)
- {
- final Version v = vers.version();
- assertFalse("Should find version information (got "+v+")", v.isUknownVersion());
- assertEquals(MAJOR_VERSION, v.getMajorVersion());
- assertEquals(MINOR_VERSION, v.getMinorVersion());
- // Check patch level initially, comment out for maint versions
-// assertEquals(0, v.getPatchLevel());
- assertEquals(GROUP_ID, v.getGroupId());
- assertEquals(ARTIFACT_ID, v.getArtifactId());
- }
-}
-
diff --git a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestVersions.java b/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestXMLVersions.java
similarity index 76%
rename from json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestVersions.java
rename to xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestXMLVersions.java
index be30cff..bfa8847 100644
--- a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestVersions.java
+++ b/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestXMLVersions.java
@@ -1,13 +1,14 @@
-package com.fasterxml.jackson.jaxrs.json;
+package com.fasterxml.jackson.jaxrs.xml;
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.core.Versioned;
+import com.fasterxml.jackson.jaxrs.xml.JacksonXMLProvider;
-public class TestVersions extends JaxrsTestBase
+public class TestXMLVersions extends JaxrsTestBase
{
public void testMapperVersions()
{
- assertVersion(new JacksonJsonProvider());
+ assertVersion(new JacksonXMLProvider());
}
/*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git
More information about the pkg-java-commits
mailing list