svn commit: r1211011 - in /wicket/trunk/wicket-core/src: main/java/org/apache/wicket/protocol/https/HttpsMapper.java main/java/org/apache/wicket/protocol/https/Scheme.java test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java

[ivaynberg]

Author: ivaynberg
Date: Tue Dec  6 16:46:59 2011
New Revision: 1211011

URL: http://svn.apache.org/viewvc?rev=1211011&view=rev
Log:
fixed tests

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/Scheme.java
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java?rev=1211011&r1=1211010&r2=1211011&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
 Tue Dec  6 16:46:59 2011
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.wicket.protocol.https;
 
 import javax.servlet.http.HttpServletRequest;

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/Scheme.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/Scheme.java?rev=1211011&r1=1211010&r2=1211011&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/Scheme.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/Scheme.java
 Tue Dec  6 16:46:59 2011
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.wicket.protocol.https;
 
 /**
@@ -5,7 +21,7 @@ package org.apache.wicket.protocol.https
  * 
  * @author igor
  */
-enum Scheme {
+public enum Scheme {
        /** https */
        HTTPS {
                @Override

Modified: 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java?rev=1211011&r1=1211010&r2=1211011&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java
 (original)
+++ 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java
 Tue Dec  6 16:46:59 2011
@@ -93,12 +93,10 @@ public class HttpsMapperApplicationTest
                WicketTester tester = new WicketTester(new 
HttpsMapperApplication());
 
                tester.getRequest().setScheme("http");
-               tester.getRequest().setServerPort(80);
 
                requestPage(tester, HttpsPage.class);
 
                assertEquals("https", tester.getLastRequest().getScheme());
-               assertEquals(443, tester.getLastRequest().getServerPort());
        }
 
        @Test
@@ -123,9 +121,7 @@ public class HttpsMapperApplicationTest
                requestPage(tester, HttpsPage.class);
 
                assertEquals("https", tester.getLastRequest().getScheme());
-               assertEquals(443, tester.getLastRequest().getServerPort());
 
                assertEquals("https", tester.getRequest().getScheme());
-               assertEquals(443, tester.getRequest().getServerPort());
        }
 }