From 5d29687a02daa7d272f131f19c6f3ba12c706175 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sat, 23 May 2015 00:59:16 +0200 Subject: [PATCH] moved settings JSON serialization test to gateway test for now --- .../test}/SettingsJsonSerializationTest.java | 9 +++++- .../sap/sse/common/settings/MapSettings.java | 2 +- java/com.sap.sse.test/.classpath | 7 ----- java/com.sap.sse.test/.project | 28 ------------------- .../.settings/org.eclipse.jdt.core.prefs | 7 ----- .../.settings/org.eclipse.pde.core.prefs | 3 -- java/com.sap.sse.test/META-INF/MANIFEST.MF | 9 ------ java/com.sap.sse.test/build.properties | 4 --- java/com.sap.sse.test/pom.xml | 12 -------- java/com.sap.sse/META-INF/MANIFEST.MF | 1 + 10 files changed, 10 insertions(+), 72 deletions(-) rename java/{com.sap.sse.test/src/com/sap/sse/common/settings => com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test}/SettingsJsonSerializationTest.java (91%) delete mode 100755 java/com.sap.sse.test/.classpath delete mode 100755 java/com.sap.sse.test/.project delete mode 100755 java/com.sap.sse.test/.settings/org.eclipse.jdt.core.prefs delete mode 100755 java/com.sap.sse.test/.settings/org.eclipse.pde.core.prefs delete mode 100755 java/com.sap.sse.test/META-INF/MANIFEST.MF delete mode 100755 java/com.sap.sse.test/build.properties delete mode 100755 java/com.sap.sse.test/pom.xml diff --git a/java/com.sap.sse.test/src/com/sap/sse/common/settings/SettingsJsonSerializationTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/SettingsJsonSerializationTest.java similarity index 91% rename from java/com.sap.sse.test/src/com/sap/sse/common/settings/SettingsJsonSerializationTest.java rename to java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/SettingsJsonSerializationTest.java index 5f3d6e67fdf..58b82e1e8c9 100755 --- a/java/com.sap.sse.test/src/com/sap/sse/common/settings/SettingsJsonSerializationTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/SettingsJsonSerializationTest.java @@ -1,4 +1,4 @@ -package com.sap.sse.common.settings; +package com.sap.sailing.server.gateway.serialization.test; import static org.junit.Assert.assertEquals; @@ -14,6 +14,13 @@ import org.junit.Test; import com.sap.sse.common.filter.TextOperator; import com.sap.sse.common.filter.TextOperator.Operators; +import com.sap.sse.common.settings.EnumSetting; +import com.sap.sse.common.settings.ListSetting; +import com.sap.sse.common.settings.MapSettings; +import com.sap.sse.common.settings.NumberSetting; +import com.sap.sse.common.settings.Setting; +import com.sap.sse.common.settings.Settings; +import com.sap.sse.common.settings.StringSetting; import com.sap.sse.settings.SettingsToJsonSerializer; public class SettingsJsonSerializationTest { diff --git a/java/com.sap.sse.common/src/com/sap/sse/common/settings/MapSettings.java b/java/com.sap.sse.common/src/com/sap/sse/common/settings/MapSettings.java index 100ffea9016..5fab975bac5 100755 --- a/java/com.sap.sse.common/src/com/sap/sse/common/settings/MapSettings.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/settings/MapSettings.java @@ -5,7 +5,7 @@ import java.util.Map; public class MapSettings extends AbstractSettings { private final Map settingsMap; - protected MapSettings(Map settingsMap) { + public MapSettings(Map settingsMap) { this.settingsMap = settingsMap; } diff --git a/java/com.sap.sse.test/.classpath b/java/com.sap.sse.test/.classpath deleted file mode 100755 index b862a296d38..00000000000 --- a/java/com.sap.sse.test/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/java/com.sap.sse.test/.project b/java/com.sap.sse.test/.project deleted file mode 100755 index 3366ea5434b..00000000000 --- a/java/com.sap.sse.test/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - com.sap.sse.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/java/com.sap.sse.test/.settings/org.eclipse.jdt.core.prefs b/java/com.sap.sse.test/.settings/org.eclipse.jdt.core.prefs deleted file mode 100755 index 295926d9641..00000000000 --- a/java/com.sap.sse.test/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/java/com.sap.sse.test/.settings/org.eclipse.pde.core.prefs b/java/com.sap.sse.test/.settings/org.eclipse.pde.core.prefs deleted file mode 100755 index b7e72d019c2..00000000000 --- a/java/com.sap.sse.test/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/java/com.sap.sse.test/META-INF/MANIFEST.MF b/java/com.sap.sse.test/META-INF/MANIFEST.MF deleted file mode 100755 index d52e3fc73d3..00000000000 --- a/java/com.sap.sse.test/META-INF/MANIFEST.MF +++ /dev/null @@ -1,9 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: SSE Test -Bundle-SymbolicName: com.sap.sse.test -Bundle-Version: 1.0.0.qualifier -Bundle-Vendor: SAP -Fragment-Host: com.sap.sse -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.junit4;bundle-version="4.8.2" diff --git a/java/com.sap.sse.test/build.properties b/java/com.sap.sse.test/build.properties deleted file mode 100755 index 41eb6ade2b4..00000000000 --- a/java/com.sap.sse.test/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/java/com.sap.sse.test/pom.xml b/java/com.sap.sse.test/pom.xml deleted file mode 100755 index 26c8a069929..00000000000 --- a/java/com.sap.sse.test/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - 4.0.0 - - root - com.sap.sailing - 1.0.0-SNAPSHOT - - com.sap.sse.test - eclipse-test-plugin - diff --git a/java/com.sap.sse/META-INF/MANIFEST.MF b/java/com.sap.sse/META-INF/MANIFEST.MF index 3adeecda510..c1d1ed3529f 100644 --- a/java/com.sap.sse/META-INF/MANIFEST.MF +++ b/java/com.sap.sse/META-INF/MANIFEST.MF @@ -11,6 +11,7 @@ Export-Package: com.sap.sse, com.sap.sse.i18n.impl, com.sap.sse.osgi, com.sap.sse.qrcode, + com.sap.sse.settings, com.sap.sse.util, com.sap.sse.util.impl, com.sap.sse.util.kmeans