From b74893ce05a5f3adbe2b6f92e1a0fb18a9919504 Mon Sep 17 00:00:00 2001 From: Patrick Schmitz Date: Tue, 6 Oct 2009 21:18:06 +0000 Subject: [PATCH] NOJIRA Changed the package of the test files to match their folder (put them in a test subpackage). Fixed scope of constant declaration in UUIDGeneratorPart to be public. These changes should not affect functionality, but they correct build problems in eclipse (that maven ignores). --- .../services/id/UUIDGeneratorPart.java | 2 +- .../id/test/AlphabeticIDGeneratorPartTest.java | 6 ++++-- .../services/id/test/BaseIDGeneratorTest.java | 11 +++++++---- .../services/id/test/NumericIDGeneratorPartTest.java | 6 ++++-- .../services/id/test/SettableIDGeneratorTest.java | 12 ++++++------ .../services/id/test/StringIDGeneratorPartTest.java | 6 ++++-- .../services/id/test/UUIDGeneratorPartTest.java | 6 ++++-- .../services/id/test/YearIDGeneratorPartTest.java | 7 +++++-- 8 files changed, 35 insertions(+), 21 deletions(-) diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/UUIDGeneratorPart.java b/services/id/service/src/main/java/org/collectionspace/services/id/UUIDGeneratorPart.java index 905bb3509..49ad98a2f 100644 --- a/services/id/service/src/main/java/org/collectionspace/services/id/UUIDGeneratorPart.java +++ b/services/id/service/src/main/java/org/collectionspace/services/id/UUIDGeneratorPart.java @@ -57,7 +57,7 @@ public class UUIDGeneratorPart implements IDGeneratorPart { "[a-z0-9\\-]{12}" + ")"; - final static int UUID_LENGTH = 36; + public final static int UUID_LENGTH = 36; /** * Constructor (no-argument). diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/AlphabeticIDGeneratorPartTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/AlphabeticIDGeneratorPartTest.java index 85e601397..6a597e5d4 100644 --- a/services/id/service/src/test/java/org/collectionspace/services/id/test/AlphabeticIDGeneratorPartTest.java +++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/AlphabeticIDGeneratorPartTest.java @@ -21,11 +21,13 @@ * limitations under the License. */ -package org.collectionspace.services.id; +package org.collectionspace.services.id.test; -import static org.junit.Assert.fail; import junit.framework.TestCase; +import org.collectionspace.services.id.AlphabeticIDGeneratorPart; +import org.collectionspace.services.id.SequenceIDGeneratorPart; + /** * AlphabeticIDGeneratorPartTest * diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/BaseIDGeneratorTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/BaseIDGeneratorTest.java index 10b6d511c..30573630a 100644 --- a/services/id/service/src/test/java/org/collectionspace/services/id/test/BaseIDGeneratorTest.java +++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/BaseIDGeneratorTest.java @@ -21,15 +21,18 @@ * limitations under the License. */ -package org.collectionspace.services.id; +package org.collectionspace.services.id.test; -import java.util.Calendar; -import java.util.GregorianCalendar; import java.util.Vector; import junit.framework.TestCase; -import static org.junit.Assert.fail; +import org.collectionspace.services.id.AlphabeticIDGeneratorPart; +import org.collectionspace.services.id.BaseIDGenerator; +import org.collectionspace.services.id.IDGeneratorPart; +import org.collectionspace.services.id.NumericIDGeneratorPart; +import org.collectionspace.services.id.StringIDGeneratorPart; +import org.collectionspace.services.id.UUIDGeneratorPart; import org.collectionspace.services.id.YearIDGeneratorPart; /** diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/NumericIDGeneratorPartTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/NumericIDGeneratorPartTest.java index b87f32382..a778b6b98 100644 --- a/services/id/service/src/test/java/org/collectionspace/services/id/test/NumericIDGeneratorPartTest.java +++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/NumericIDGeneratorPartTest.java @@ -25,11 +25,13 @@ * limitations under the License. */ -package org.collectionspace.services.id; +package org.collectionspace.services.id.test; -import static org.junit.Assert.fail; import junit.framework.TestCase; +import org.collectionspace.services.id.NumericIDGeneratorPart; +import org.collectionspace.services.id.SequenceIDGeneratorPart; + /** * NumericIDGeneratorPartTest * diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/SettableIDGeneratorTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/SettableIDGeneratorTest.java index 741343c46..55e6e2148 100644 --- a/services/id/service/src/test/java/org/collectionspace/services/id/test/SettableIDGeneratorTest.java +++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/SettableIDGeneratorTest.java @@ -21,15 +21,15 @@ * limitations under the License. */ -package org.collectionspace.services.id; - -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.Vector; +package org.collectionspace.services.id.test; import junit.framework.TestCase; -import static org.junit.Assert.fail; +import org.collectionspace.services.id.AlphabeticIDGeneratorPart; +import org.collectionspace.services.id.IDGeneratorPart; +import org.collectionspace.services.id.NumericIDGeneratorPart; +import org.collectionspace.services.id.SettableIDGenerator; +import org.collectionspace.services.id.StringIDGeneratorPart; import org.collectionspace.services.id.YearIDGeneratorPart; /** diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/StringIDGeneratorPartTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/StringIDGeneratorPartTest.java index 11d60dd06..3340d3423 100644 --- a/services/id/service/src/test/java/org/collectionspace/services/id/test/StringIDGeneratorPartTest.java +++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/StringIDGeneratorPartTest.java @@ -21,11 +21,13 @@ * limitations under the License. */ -package org.collectionspace.services.id; +package org.collectionspace.services.id.test; -import static org.junit.Assert.fail; import junit.framework.TestCase; +import org.collectionspace.services.id.StoredValueIDGeneratorPart; +import org.collectionspace.services.id.StringIDGeneratorPart; + /** * StringIDGeneratorPartTest * diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/UUIDGeneratorPartTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/UUIDGeneratorPartTest.java index 15bf30b83..e2dc50ff0 100644 --- a/services/id/service/src/test/java/org/collectionspace/services/id/test/UUIDGeneratorPartTest.java +++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/UUIDGeneratorPartTest.java @@ -21,11 +21,13 @@ * limitations under the License. */ -package org.collectionspace.services.id; +package org.collectionspace.services.id.test; -import static org.junit.Assert.fail; import junit.framework.TestCase; +import org.collectionspace.services.id.IDGeneratorPart; +import org.collectionspace.services.id.UUIDGeneratorPart; + /** * UUIDGeneratorPartTest * diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/YearIDGeneratorPartTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/YearIDGeneratorPartTest.java index 41ae11b1a..ff8d65078 100644 --- a/services/id/service/src/test/java/org/collectionspace/services/id/test/YearIDGeneratorPartTest.java +++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/YearIDGeneratorPartTest.java @@ -21,13 +21,16 @@ * limitations under the License. */ -package org.collectionspace.services.id; +package org.collectionspace.services.id.test; -import static org.junit.Assert.fail; import java.util.Calendar; import java.util.GregorianCalendar; + import junit.framework.TestCase; +import org.collectionspace.services.id.IDGeneratorPart; +import org.collectionspace.services.id.YearIDGeneratorPart; + /* * YearIDGeneratorPartTest * -- 2.47.3