You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2018/10/21 09:35:26 UTC
[myfaces] branch master updated: fixed API versions
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new 13eccc6 fixed API versions
13eccc6 is described below
commit 13eccc65f78f52934541ec5e953a61f648a305e5
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Sun Oct 21 11:35:22 2018 +0200
fixed API versions
---
test/pom.xml | 86 ++++++++--------------
.../myfaces/test/mock/MockHttpServletRequest.java | 19 +++++
.../myfaces/test/mock/MockHttpServletResponse.java | 6 ++
.../myfaces/test/mock/MockServletContext.java | 48 ++++++++++++
.../myfaces/test/mock/MockServletInputStream.java | 19 +++++
.../myfaces/test/mock/MockServletOutputStream.java | 13 ++++
6 files changed, 136 insertions(+), 55 deletions(-)
diff --git a/test/pom.xml b/test/pom.xml
index 72983db..e64ae72 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -34,18 +34,45 @@
<name>Apache MyFaces Core 3.0 - Test</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.33</version>
- <optional>true</optional>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
</dependency>
+ <!-- Java EE APIs -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-el-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
+ </dependency>
+
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.33</version>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>jmock</groupId>
@@ -78,57 +105,6 @@
<version>0.8</version>
<optional>true</optional>
</dependency>
-
-
-
-
-
-
-
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!--
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>javax.faces-api</artifactId>
- <version>2.2</version>
- <scope>provided</scope>
- </dependency>-->
-
- <!-- Servlet 3.0 -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <!-- JSP 2.1 -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>1.0.1</version>
- <scope>provided</scope>
- </dependency>
- <!-- EL 1.0 -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0.2</version>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
<build>
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
index ee61e8b..65365c7 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
@@ -55,6 +55,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpUpgradeHandler;
import javax.servlet.http.Part;
/**
@@ -1091,4 +1092,22 @@ public class MockHttpServletRequest implements HttpServletRequest
throw new UnsupportedOperationException("Not supported yet.");
}
+ @Override
+ public String changeSessionId()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public <T extends HttpUpgradeHandler> T upgrade(Class<T> type) throws IOException, ServletException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public long getContentLengthLong()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
}
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java
index 35b1716..2715cfc 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java
@@ -471,4 +471,10 @@ public class MockHttpServletResponse implements HttpServletResponse
throw new UnsupportedOperationException("Not supported yet.");
}
+ @Override
+ public void setContentLengthLong(long l)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
}
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockServletContext.java b/test/src/main/java/org/apache/myfaces/test/mock/MockServletContext.java
index 9c3d199..4f36e3e 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockServletContext.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockServletContext.java
@@ -743,4 +743,52 @@ public class MockServletContext implements ServletContext
{
throw new UnsupportedOperationException("Not supported yet.");
}
+
+ @Override
+ public ServletRegistration.Dynamic addJspFile(String string, String string1)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public String getVirtualServerName()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public int getSessionTimeout()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void setSessionTimeout(int i)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public String getRequestCharacterEncoding()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void setRequestCharacterEncoding(String string)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public String getResponseCharacterEncoding()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void setResponseCharacterEncoding(String string)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockServletInputStream.java b/test/src/main/java/org/apache/myfaces/test/mock/MockServletInputStream.java
index 4a57bf0..248e918 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockServletInputStream.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockServletInputStream.java
@@ -22,6 +22,7 @@ package org.apache.myfaces.test.mock;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import javax.servlet.ReadListener;
import javax.servlet.ServletInputStream;
@@ -51,4 +52,22 @@ public class MockServletInputStream extends ServletInputStream
return this.source.read();
}
+ @Override
+ public boolean isFinished()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public boolean isReady()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void setReadListener(ReadListener rl)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
}
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockServletOutputStream.java b/test/src/main/java/org/apache/myfaces/test/mock/MockServletOutputStream.java
index 676bf00..51f4a4f 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockServletOutputStream.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockServletOutputStream.java
@@ -21,6 +21,7 @@ package org.apache.myfaces.test.mock;
import java.io.ByteArrayOutputStream;
import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
/**
* <p>Mock implementation of <code>ServletOutputStream</code>.</p>
@@ -90,4 +91,16 @@ public class MockServletOutputStream extends ServletOutputStream
baos.write(content);
}
+ @Override
+ public boolean isReady()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void setWriteListener(WriteListener wl)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
}