You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2018/05/11 13:53:47 UTC
[juneau] branch master updated: Organize tests.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 66d36fc Organize tests.
66d36fc is described below
commit 66d36fced0d14936e3aee0a1b92c7293f770ee07
Author: JamesBognar <ja...@apache.org>
AuthorDate: Fri May 11 09:53:32 2018 -0400
Organize tests.
---
.../test/java/org/apache/juneau/MaxIndentTest.java | 2 +-
.../rttests/RoundTripPrimitiveObjectBeansTest.java | 2 +-
.../apache/juneau/config/ConfigBuilderTest.java | 0
.../apache/juneau/config/ConfigInterfaceTest.java | 2 +-
.../java/org/apache/juneau/config/ConfigTest.java | 0
.../java/org/apache/juneau/dto/atom/AtomTest.java | 0
.../apache/juneau/dto/cognos/CognosXmlTest.java | 0
.../juneau/dto/jsonschema/JsonSchemaTest.java | 0
.../test/java/org/apache/juneau/html/HtmlTest.java | 2 +-
.../juneau/json/JsonSchemaSerializerTest.java | 46 +++++++++++-----------
.../org/apache/juneau/testutils/TestUtils.java | 0
.../juneau/{test => testutils}/pojos/ABean.java | 2 +-
.../{test => testutils}/pojos/Constants.java | 2 +-
.../pojos/ImplicitSwappedPojo.java | 4 +-
.../pojos}/PrimitiveAtomicObjectsBean.java | 2 +-
.../pojos}/PrimitiveObjectsBean.java | 2 +-
.../{test => testutils}/pojos/SwappedPojo.java | 2 +-
.../{test => testutils}/pojos/SwappedPojoSwap.java | 4 +-
.../juneau/{test => testutils}/pojos/TestEnum.java | 2 +-
.../{TestEnum.java => pojos/TestEnumToString.java} | 6 +--
.../{testbeans => testutils/pojos}/TestURI.java | 2 +-
.../{test => testutils}/pojos/TypedBean.java | 2 +-
.../{test => testutils}/pojos/TypedBeanImpl.java | 2 +-
23 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/MaxIndentTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/MaxIndentTest.java
index df5b018..9b76a53 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/MaxIndentTest.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/MaxIndentTest.java
@@ -17,8 +17,8 @@ import java.util.*;
import org.apache.juneau.html.*;
import org.apache.juneau.json.*;
import org.apache.juneau.serializer.*;
-import org.apache.juneau.test.pojos.*;
import org.apache.juneau.testutils.*;
+import org.apache.juneau.testutils.pojos.*;
import org.apache.juneau.uon.*;
import org.apache.juneau.urlencoding.*;
import org.apache.juneau.xml.*;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java
index a105883..e278292 100755
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripPrimitiveObjectBeansTest.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.*;
import org.apache.juneau.jena.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.serializer.*;
-import org.apache.juneau.testbeans.*;
+import org.apache.juneau.testutils.pojos.*;
import org.junit.*;
/**
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigBuilderTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigBuilderTest.java
old mode 100755
new mode 100644
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java
index e3893bb..a063005 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigInterfaceTest.java
@@ -18,7 +18,7 @@ import static org.junit.Assert.*;
import java.util.*;
import org.apache.juneau.json.*;
-import org.apache.juneau.test.pojos.*;
+import org.apache.juneau.testutils.pojos.*;
import org.apache.juneau.utils.*;
import org.junit.*;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/config/ConfigTest.java
old mode 100755
new mode 100644
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
old mode 100755
new mode 100644
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/cognos/CognosXmlTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/cognos/CognosXmlTest.java
old mode 100755
new mode 100644
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java
old mode 100755
new mode 100644
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlTest.java
index 79d1cf9..4408c1d 100755
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlTest.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/html/HtmlTest.java
@@ -19,7 +19,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.html.annotation.*;
-import org.apache.juneau.testbeans.*;
+import org.apache.juneau.testutils.pojos.*;
import org.junit.*;
@SuppressWarnings({"unchecked","rawtypes","serial"})
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java
index 563cf31..3ddf5d8 100755
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/json/JsonSchemaSerializerTest.java
@@ -21,7 +21,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.jsonschema.*;
import org.apache.juneau.jsonschema.annotation.*;
-import org.apache.juneau.testutils.*;
+import org.apache.juneau.testutils.pojos.*;
import org.apache.juneau.transform.*;
import org.junit.*;
@@ -43,7 +43,7 @@ public class JsonSchemaSerializerTest {
assertEquals("{type:'string'}", s.serialize("foo"));
assertEquals("{type:'string'}", s.serialize(new StringBuilder("foo")));
assertEquals("{type:'string'}", s.serialize('c'));
- assertEquals("{type:'string','enum':['one','two','three']}", s.serialize(TestEnum.ONE));
+ assertEquals("{type:'string','enum':['one','two','three']}", s.serialize(TestEnumToString.ONE));
assertEquals("{type:'object',properties:{f1:{type:'string'}}}", s.serialize(new SimpleBean()));
}
@@ -67,7 +67,7 @@ public class JsonSchemaSerializerTest {
assertObjectEquals("{type:'string'}", s.getSchema(StringBuilder.class));
assertObjectEquals("{type:'string'}", s.getSchema(char.class));
assertObjectEquals("{type:'string'}", s.getSchema(Character.class));
- assertObjectEquals("{type:'string','enum':['one','two','three']}", s.getSchema(TestEnum.class));
+ assertObjectEquals("{type:'string','enum':['one','two','three']}", s.getSchema(TestEnumToString.class));
assertObjectEquals("{type:'object',properties:{f1:{type:'string'}}}", s.getSchema(SimpleBean.class));
}
@@ -99,7 +99,7 @@ public class JsonSchemaSerializerTest {
assertEquals("{type:'array',items:{type:'string'}}", s.serialize(new StringBuilder[]{new StringBuilder("foo")}));
assertEquals("{type:'array',items:{type:'string'}}", s.serialize(new char[]{'c'}));
assertEquals("{type:'array',items:{type:'string'}}", s.serialize(new Character[]{'c'}));
- assertEquals("{type:'array',items:{type:'string','enum':['one','two','three']}}", s.serialize(new TestEnum[]{TestEnum.ONE}));
+ assertEquals("{type:'array',items:{type:'string','enum':['one','two','three']}}", s.serialize(new TestEnumToString[]{TestEnumToString.ONE}));
assertEquals("{type:'array',items:{type:'object',properties:{f1:{type:'string'}}}}", s.serialize(new SimpleBean[]{new SimpleBean()}));
}
@@ -123,7 +123,7 @@ public class JsonSchemaSerializerTest {
assertObjectEquals("{type:'array',items:{type:'string'}}", s.getSchema(StringBuilder[].class));
assertObjectEquals("{type:'array',items:{type:'string'}}", s.getSchema(char[].class));
assertObjectEquals("{type:'array',items:{type:'string'}}", s.getSchema(Character[].class));
- assertObjectEquals("{type:'array',items:{type:'string','enum':['one','two','three']}}", s.getSchema(TestEnum[].class));
+ assertObjectEquals("{type:'array',items:{type:'string','enum':['one','two','three']}}", s.getSchema(TestEnumToString[].class));
assertObjectEquals("{type:'array',items:{type:'object',properties:{f1:{type:'string'}}}}", s.getSchema(SimpleBean[].class));
}
@@ -147,7 +147,7 @@ public class JsonSchemaSerializerTest {
assertEquals("{type:'array',items:{type:'array',items:{type:'string'}}}", s.serialize(new StringBuilder[][]{{new StringBuilder("foo")}}));
assertEquals("{type:'array',items:{type:'array',items:{type:'string'}}}", s.serialize(new char[][]{{'c'}}));
assertEquals("{type:'array',items:{type:'array',items:{type:'string'}}}", s.serialize(new Character[][]{{'c'}}));
- assertEquals("{type:'array',items:{type:'array',items:{type:'string','enum':['one','two','three']}}}", s.serialize(new TestEnum[][]{{TestEnum.ONE}}));
+ assertEquals("{type:'array',items:{type:'array',items:{type:'string','enum':['one','two','three']}}}", s.serialize(new TestEnumToString[][]{{TestEnumToString.ONE}}));
assertEquals("{type:'array',items:{type:'array',items:{type:'object',properties:{f1:{type:'string'}}}}}", s.serialize(new SimpleBean[][]{{new SimpleBean()}}));
}
@@ -171,7 +171,7 @@ public class JsonSchemaSerializerTest {
assertObjectEquals("{type:'array',items:{type:'array',items:{type:'string'}}}", s.getSchema(StringBuilder[][].class));
assertObjectEquals("{type:'array',items:{type:'array',items:{type:'string'}}}", s.getSchema(char[][].class));
assertObjectEquals("{type:'array',items:{type:'array',items:{type:'string'}}}", s.getSchema(Character[][].class));
- assertObjectEquals("{type:'array',items:{type:'array',items:{type:'string','enum':['one','two','three']}}}", s.getSchema(TestEnum[][].class));
+ assertObjectEquals("{type:'array',items:{type:'array',items:{type:'string','enum':['one','two','three']}}}", s.getSchema(TestEnumToString[][].class));
assertObjectEquals("{type:'array',items:{type:'array',items:{type:'object',properties:{f1:{type:'string'}}}}}", s.getSchema(SimpleBean[][].class));
}
@@ -823,37 +823,37 @@ public class JsonSchemaSerializerTest {
@Test
public void addExample_ENUM() throws Exception {
JsonSchemaSerializerSession s = JsonSchemaSerializer.DEFAULT_LAX.builder().addExamplesTo("enum").build().createSession();
- assertObjectEquals("{type:'string','enum':['one','two','three'],'x-example':'one'}", s.getSchema(TestEnum.class));
+ assertObjectEquals("{type:'string','enum':['one','two','three'],'x-example':'one'}", s.getSchema(TestEnumToString.class));
}
@Test
public void addExample_ENUM_wDefault() throws Exception {
- JsonSchemaSerializerSession s = JsonSchemaSerializer.DEFAULT_LAX.builder().addExamplesTo("enum").example(TestEnum.class, TestEnum.TWO).build().createSession();
- assertObjectEquals("{type:'string','enum':['one','two','three'],'x-example':'two'}", s.getSchema(TestEnum.class));
+ JsonSchemaSerializerSession s = JsonSchemaSerializer.DEFAULT_LAX.builder().addExamplesTo("enum").example(TestEnumToString.class, TestEnumToString.TWO).build().createSession();
+ assertObjectEquals("{type:'string','enum':['one','two','three'],'x-example':'two'}", s.getSchema(TestEnumToString.class));
}
@Test
public void addExample_ENUM_2darray() throws Exception {
JsonSchemaSerializerSession s = JsonSchemaSerializer.DEFAULT_LAX.builder().addExamplesTo("enum").build().createSession();
- assertObjectEquals("{type:'array',items:{type:'array',items:{type:'string','enum':['one','two','three'],'x-example':'one'}}}", s.getSchema(TestEnum[][].class));
+ assertObjectEquals("{type:'array',items:{type:'array',items:{type:'string','enum':['one','two','three'],'x-example':'one'}}}", s.getSchema(TestEnumToString[][].class));
}
@Test
public void addExample_ENUM_useEnumNames() throws Exception {
JsonSchemaSerializerSession s = JsonSchemaSerializer.DEFAULT_LAX.builder().useEnumNames().addExamplesTo("enum").build().createSession();
- assertObjectEquals("{type:'string','enum':['ONE','TWO','THREE'],'x-example':'ONE'}", s.getSchema(TestEnum.class));
+ assertObjectEquals("{type:'string','enum':['ONE','TWO','THREE'],'x-example':'ONE'}", s.getSchema(TestEnumToString.class));
}
@Test
public void addExample_ENUM_wDefault_useEnumNames() throws Exception {
- JsonSchemaSerializerSession s = JsonSchemaSerializer.DEFAULT_LAX.builder().useEnumNames().addExamplesTo("enum").example(TestEnum.class, TestEnum.TWO).build().createSession();
- assertObjectEquals("{type:'string','enum':['ONE','TWO','THREE'],'x-example':'TWO'}", s.getSchema(TestEnum.class));
+ JsonSchemaSerializerSession s = JsonSchemaSerializer.DEFAULT_LAX.builder().useEnumNames().addExamplesTo("enum").example(TestEnumToString.class, TestEnumToString.TWO).build().createSession();
+ assertObjectEquals("{type:'string','enum':['ONE','TWO','THREE'],'x-example':'TWO'}", s.getSchema(TestEnumToString.class));
}
@Test
public void addExample_ENUM_2darray_useEnumNames() throws Exception {
JsonSchemaSerializerSession s = JsonSchemaSerializer.DEFAULT_LAX.builder().useEnumNames().addExamplesTo("enum").build().createSession();
- assertObjectEquals("{type:'array',items:{type:'array',items:{type:'string','enum':['ONE','TWO','THREE'],'x-example':'ONE'}}}", s.getSchema(TestEnum[][].class));
+ assertObjectEquals("{type:'array',items:{type:'array',items:{type:'string','enum':['ONE','TWO','THREE'],'x-example':'ONE'}}}", s.getSchema(TestEnumToString[][].class));
}
//====================================================================================================
@@ -881,7 +881,7 @@ public class JsonSchemaSerializerTest {
assertObjectEquals("{type:'string','x-example':'foo'}", s.getSchema(StringBuilder.class));
assertObjectEquals("{type:'string','x-example':'a'}", s.getSchema(Character.class));
assertObjectEquals("{type:'string','x-example':'a'}", s.getSchema(char.class));
- assertObjectEquals("{type:'string','enum':['one','two','three'],'x-example':'one'}", s.getSchema(TestEnum.class));
+ assertObjectEquals("{type:'string','enum':['one','two','three'],'x-example':'one'}", s.getSchema(TestEnumToString.class));
}
//====================================================================================================
@@ -1017,13 +1017,13 @@ public class JsonSchemaSerializerTest {
@Test
public void addDescription_ENUM() throws Exception {
JsonSchemaSerializerSession s = JsonSchemaSerializer.DEFAULT_LAX.builder().addDescriptionsTo("enum").build().createSession();
- assertObjectEquals("{type:'string','enum':['one','two','three'],description:'org.apache.juneau.testutils.TestEnum'}", s.getSchema(TestEnum.class));
+ assertObjectEquals("{type:'string','enum':['one','two','three'],description:'org.apache.juneau.testutils.pojos.TestEnumToString'}", s.getSchema(TestEnumToString.class));
}
@Test
public void addDescription_ENUM_2darray() throws Exception {
JsonSchemaSerializerSession s = JsonSchemaSerializer.DEFAULT_LAX.builder().addDescriptionsTo("enum").build().createSession();
- assertObjectEquals("{type:'array',items:{type:'array',items:{type:'string','enum':['one','two','three'],description:'org.apache.juneau.testutils.TestEnum'}}}", s.getSchema(TestEnum[][].class));
+ assertObjectEquals("{type:'array',items:{type:'array',items:{type:'string','enum':['one','two','three'],description:'org.apache.juneau.testutils.pojos.TestEnumToString'}}}", s.getSchema(TestEnumToString[][].class));
}
//====================================================================================================
@@ -1052,7 +1052,7 @@ public class JsonSchemaSerializerTest {
assertObjectEquals("{type:'string',description:'java.lang.StringBuilder'}", s.getSchema(StringBuilder.class));
assertObjectEquals("{type:'string',description:'java.lang.Character'}", s.getSchema(Character.class));
assertObjectEquals("{type:'string',description:'char'}", s.getSchema(char.class));
- assertObjectEquals("{type:'string','enum':['one','two','three'],description:'org.apache.juneau.testutils.TestEnum'}", s.getSchema(TestEnum.class));
+ assertObjectEquals("{type:'string','enum':['one','two','three'],description:'org.apache.juneau.testutils.pojos.TestEnumToString'}", s.getSchema(TestEnumToString.class));
}
//====================================================================================================
@@ -1083,7 +1083,7 @@ public class JsonSchemaSerializerTest {
.defaultSchema(StringBuilder.class, new ObjectMap().append("type", "bar"))
.defaultSchema(Character.class, new ObjectMap().append("type", "bar"))
.defaultSchema(char.class, new ObjectMap().append("type", "bar"))
- .defaultSchema(TestEnum.class, new ObjectMap().append("type", "bar"))
+ .defaultSchema(TestEnumToString.class, new ObjectMap().append("type", "bar"))
.build().createSession();
assertObjectEquals("{type:'bar'}", s.getSchema(SimpleBean.class));
assertObjectEquals("{type:'bar'}", s.getSchema(BeanMap.class));
@@ -1105,7 +1105,7 @@ public class JsonSchemaSerializerTest {
assertObjectEquals("{type:'bar'}", s.getSchema(StringBuilder.class));
assertObjectEquals("{type:'bar'}", s.getSchema(Character.class));
assertObjectEquals("{type:'bar'}", s.getSchema(char.class));
- assertObjectEquals("{type:'bar'}", s.getSchema(TestEnum.class));
+ assertObjectEquals("{type:'bar'}", s.getSchema(TestEnumToString.class));
}
// If default schema does not contain 'type', the value is augmented
@@ -1132,7 +1132,7 @@ public class JsonSchemaSerializerTest {
.defaultSchema(StringBuilder.class, new ObjectMap().append("foo", "bar"))
.defaultSchema(Character.class, new ObjectMap().append("foo", "bar"))
.defaultSchema(char.class, new ObjectMap().append("foo", "bar"))
- .defaultSchema(TestEnum.class, new ObjectMap().append("foo", "bar"))
+ .defaultSchema(TestEnumToString.class, new ObjectMap().append("foo", "bar"))
.build().createSession();
assertObjectEquals("{type:'object',properties:{f1:{type:'string',foo:'bar'}},foo:'bar'}", s.getSchema(SimpleBean.class));
assertObjectEquals("{type:'object',additionalProperties:{type:'object',properties:{f1:{type:'string',foo:'bar'}},foo:'bar'},foo:'bar'}", s.getSchema(BeanMap.class));
@@ -1154,7 +1154,7 @@ public class JsonSchemaSerializerTest {
assertObjectEquals("{type:'string',foo:'bar'}", s.getSchema(StringBuilder.class));
assertObjectEquals("{type:'string',foo:'bar'}", s.getSchema(Character.class));
assertObjectEquals("{type:'string',foo:'bar'}", s.getSchema(char.class));
- assertObjectEquals("{type:'string','enum':['one','two','three'],foo:'bar'}", s.getSchema(TestEnum.class));
+ assertObjectEquals("{type:'string','enum':['one','two','three'],foo:'bar'}", s.getSchema(TestEnumToString.class));
}
//====================================================================================================
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/TestUtils.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/TestUtils.java
old mode 100755
new mode 100644
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/ABean.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/ABean.java
similarity index 97%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/ABean.java
rename to juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/ABean.java
index aa6a724..ad0c44e 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/ABean.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/ABean.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.test.pojos;
+package org.apache.juneau.testutils.pojos;
public class ABean {
public int a;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/Constants.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/Constants.java
similarity index 97%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/Constants.java
rename to juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/Constants.java
index cb31a01..29788db 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/Constants.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/Constants.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.test.pojos;
+package org.apache.juneau.testutils.pojos;
/**
* Description.
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/ImplicitSwappedPojo.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/ImplicitSwappedPojo.java
similarity index 94%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/ImplicitSwappedPojo.java
rename to juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/ImplicitSwappedPojo.java
index cd1bc0d..18d0036 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/ImplicitSwappedPojo.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/ImplicitSwappedPojo.java
@@ -10,9 +10,9 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.test.pojos;
+package org.apache.juneau.testutils.pojos;
-import static org.apache.juneau.test.pojos.Constants.*;
+import static org.apache.juneau.testutils.pojos.Constants.*;
import org.apache.juneau.annotation.*;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testbeans/PrimitiveAtomicObjectsBean.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveAtomicObjectsBean.java
similarity index 96%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testbeans/PrimitiveAtomicObjectsBean.java
rename to juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveAtomicObjectsBean.java
index 38e634c..a788f92 100755
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testbeans/PrimitiveAtomicObjectsBean.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveAtomicObjectsBean.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.testbeans;
+package org.apache.juneau.testutils.pojos;
import java.util.*;
import java.util.concurrent.atomic.*;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testbeans/PrimitiveObjectsBean.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java
similarity index 96%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testbeans/PrimitiveObjectsBean.java
rename to juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java
index c82d703..cd7d40c 100755
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testbeans/PrimitiveObjectsBean.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/PrimitiveObjectsBean.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.testbeans;
+package org.apache.juneau.testutils.pojos;
import java.math.*;
import java.util.*;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/SwappedPojo.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojo.java
similarity index 97%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/SwappedPojo.java
rename to juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojo.java
index 2cba47c..859e655 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/SwappedPojo.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojo.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.test.pojos;
+package org.apache.juneau.testutils.pojos;
import org.apache.juneau.annotation.*;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/SwappedPojoSwap.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojoSwap.java
similarity index 95%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/SwappedPojoSwap.java
rename to juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojoSwap.java
index 950b754..7d698c3 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/SwappedPojoSwap.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/SwappedPojoSwap.java
@@ -10,9 +10,9 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.test.pojos;
+package org.apache.juneau.testutils.pojos;
-import static org.apache.juneau.test.pojos.Constants.*;
+import static org.apache.juneau.testutils.pojos.Constants.*;
import org.apache.juneau.*;
import org.apache.juneau.parser.*;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TestEnum.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestEnum.java
similarity index 97%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TestEnum.java
rename to juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestEnum.java
index 63368a4..a369389 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TestEnum.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestEnum.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.test.pojos;
+package org.apache.juneau.testutils.pojos;
public enum TestEnum {
ONE,TWO,THREE
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/TestEnum.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestEnumToString.java
similarity index 93%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/TestEnum.java
rename to juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestEnumToString.java
index 12024b6..408e8a3 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/TestEnum.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestEnumToString.java
@@ -10,15 +10,15 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.testutils;
+package org.apache.juneau.testutils.pojos;
-public enum TestEnum {
+public enum TestEnumToString {
ONE("one"), TWO("two"), THREE("three");
private String val;
- private TestEnum(String val) {
+ private TestEnumToString(String val) {
this.val = val;
}
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testbeans/TestURI.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestURI.java
similarity index 96%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testbeans/TestURI.java
rename to juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestURI.java
index 378a882..69ef3d5 100755
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testbeans/TestURI.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TestURI.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.testbeans;
+package org.apache.juneau.testutils.pojos;
import java.net.*;
import java.net.URI;
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TypedBean.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TypedBean.java
similarity index 97%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TypedBean.java
rename to juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TypedBean.java
index 2a50d98..7d36849 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TypedBean.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TypedBean.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.test.pojos;
+package org.apache.juneau.testutils.pojos;
@org.apache.juneau.annotation.Bean(beanDictionary={TypedBeanImpl.class})
public interface TypedBean {
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TypedBeanImpl.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TypedBeanImpl.java
similarity index 97%
rename from juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TypedBeanImpl.java
rename to juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TypedBeanImpl.java
index 7b00644..a78a874 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TypedBeanImpl.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/testutils/pojos/TypedBeanImpl.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.test.pojos;
+package org.apache.juneau.testutils.pojos;
@org.apache.juneau.annotation.Bean(typeName="TypedBeanImpl", sort=true)
public class TypedBeanImpl implements TypedBean {
--
To stop receiving notification emails like this one, please contact
jamesbognar@apache.org.