Handle default package properly in deployment config (#12461).

Change-Id: Ied046a49c4e3046011658dd77963972ea1e9e806

1 files changed, 53 insertions, 0 deletions

diff --git a/server/tests/src/com/vaadin/server/DefaultDeploymentConfigurationTest.java b/server/tests/src/com/vaadin/server/DefaultDeploymentConfigurationTest.java
new file mode 100644
index 0000000000..45d9853537
--- /dev/null
+++ b/server/tests/src/com/vaadin/server/DefaultDeploymentConfigurationTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "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 com.vaadin.server;
+
+import java.util.Properties;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Tests for {@link DefaultDeploymentConfiguration}
+ * 
+ * @author Vaadin Ltd
+ * @since 7.2
+ */
+public class DefaultDeploymentConfigurationTest {
+
+    @Test
+    public void testGetSystemPropertyForDefaultPackage()
+            throws ClassNotFoundException {
+        Class<?> clazz = Class.forName("ClassInDefaultPackage");
+        String value = "value";
+        String prop = "prop";
+        System.setProperty(prop, value);
+        DefaultDeploymentConfiguration config = new DefaultDeploymentConfiguration(
+                clazz, new Properties());
+        Assert.assertEquals(value, config.getSystemProperty(prop));
+    }
+
+    @Test
+    public void testGetSystemProperty() throws ClassNotFoundException {
+        String value = "value";
+        String prop = "prop";
+        System.setProperty(DefaultDeploymentConfigurationTest.class
+                .getPackage().getName() + '.' + prop, value);
+        DefaultDeploymentConfiguration config = new DefaultDeploymentConfiguration(
+                DefaultDeploymentConfigurationTest.class, new Properties());
+        Assert.assertEquals(value, config.getSystemProperty(prop));
+    }
+}