Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2010-09-16 22:05:34 -0400
committerRyan D. Brooks2010-09-16 22:05:34 -0400
commit3dbf43ff72614422ee10bdbdd3dbf0c1c5ff3d71 (patch)
tree31db0a526b42ac0f53190d557afbba5a5a9acd17
parent01b057a3930b4e4f9b68ecd1df49b90d59fbd99d (diff)
downloadorg.eclipse.osee-3dbf43ff72614422ee10bdbdd3dbf0c1c5ff3d71.tar.gz
org.eclipse.osee-3dbf43ff72614422ee10bdbdd3dbf0c1c5ff3d71.tar.xz
org.eclipse.osee-3dbf43ff72614422ee10bdbdd3dbf0c1c5ff3d71.zip
refactor: Move PropertyStoreTestUtil to mock package in jdk.core.tests
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/MockPropertyStore.java54
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/PropertyStoreTestUtil.java (renamed from plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreTestUtil.java)45
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreTest.java3
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreWriterTest.java3
5 files changed, 65 insertions, 41 deletions
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF
index ae2c7c7c8f4..8bde3ed4543 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Fragment-Host: org.eclipse.osee.framework.jdk.core;bundle-version="0.4.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.osee.framework.jdk.core.test,
+ org.eclipse.osee.framework.jdk.core.test.mock,
org.eclipse.osee.framework.jdk.core.test.type
Require-Bundle: org.junit4
Import-Package: org.eclipse.osee.framework.jdk.core.text.rules
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/MockPropertyStore.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/MockPropertyStore.java
new file mode 100644
index 00000000000..69bf6226592
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/MockPropertyStore.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.jdk.core.test.mock;
+
+import java.util.Properties;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
+
+/**
+ * @author Roberto E. Escobar
+ */
+public class MockPropertyStore extends PropertyStore {
+
+ private static final long serialVersionUID = 750608597542081776L;
+
+ public MockPropertyStore() {
+ super();
+ }
+
+ public MockPropertyStore(String id) {
+ super(id);
+ }
+
+ public MockPropertyStore(Properties properties) {
+ super(properties);
+ }
+
+ @Override
+ public void setId(String name) {
+ super.setId(name);
+ }
+
+ @Override
+ public Properties getItems() {
+ return super.getItems();
+ }
+
+ @Override
+ public Properties getArrays() {
+ return super.getArrays();
+ }
+
+ @Override
+ public Properties getPropertyStores() {
+ return super.getPropertyStores();
+ }
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreTestUtil.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/PropertyStoreTestUtil.java
index 6d22185cf25..576004ee581 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreTestUtil.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/mock/PropertyStoreTestUtil.java
@@ -8,17 +8,20 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.jdk.core.test.type;
+package org.eclipse.osee.framework.jdk.core.test.mock;
import java.util.Map.Entry;
import java.util.Properties;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.junit.Assert;
/**
* @author Roberto E. Escobar
*/
-public class PropertyStoreTestUtil {
+public final class PropertyStoreTestUtil {
+
+ private PropertyStoreTestUtil() {
+ // Utility Class
+ }
public static void checkArrays(String[] expArray, String[] actualArray) {
Assert.assertEquals(expArray.length, actualArray.length);
@@ -75,40 +78,4 @@ public class PropertyStoreTestUtil {
}
}
- public static final class MockPropertyStore extends PropertyStore {
-
- private static final long serialVersionUID = 750608597542081776L;
-
- MockPropertyStore() {
- super();
- }
-
- MockPropertyStore(String id) {
- super(id);
- }
-
- MockPropertyStore(Properties properties) {
- super(properties);
- }
-
- @Override
- public void setId(String name) {
- super.setId(name);
- }
-
- @Override
- public Properties getItems() {
- return super.getItems();
- }
-
- @Override
- public Properties getArrays() {
- return super.getArrays();
- }
-
- @Override
- public Properties getPropertyStores() {
- return super.getPropertyStores();
- }
- }
}
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreTest.java
index d1a502324fe..bd137f8c997 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreTest.java
@@ -17,7 +17,8 @@ import java.io.StringWriter;
import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
-import org.eclipse.osee.framework.jdk.core.test.type.PropertyStoreTestUtil.MockPropertyStore;
+import org.eclipse.osee.framework.jdk.core.test.mock.MockPropertyStore;
+import org.eclipse.osee.framework.jdk.core.test.mock.PropertyStoreTestUtil;
import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.junit.Assert;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreWriterTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreWriterTest.java
index b5399433e7f..926ff1f02f5 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreWriterTest.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/type/PropertyStoreWriterTest.java
@@ -14,7 +14,8 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.StringReader;
import java.io.StringWriter;
-import org.eclipse.osee.framework.jdk.core.test.type.PropertyStoreTestUtil.MockPropertyStore;
+import org.eclipse.osee.framework.jdk.core.test.mock.MockPropertyStore;
+import org.eclipse.osee.framework.jdk.core.test.mock.PropertyStoreTestUtil;
import org.eclipse.osee.framework.jdk.core.type.PropertyStoreWriter;
import org.junit.Before;
import org.junit.Test;

Back to the top