You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/12/30 12:28:46 UTC
[1/3] directory-kerby git commit: Added a test for KerberosTime
Repository: directory-kerby
Updated Branches:
refs/heads/trunk 663b8902f -> 6a223db19
Added a test for KerberosTime
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/4d7f1cdb
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/4d7f1cdb
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/4d7f1cdb
Branch: refs/heads/trunk
Commit: 4d7f1cdb94196e5c41762c6d7065e40f7e89e68b
Parents: 663b890
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed Dec 30 12:23:05 2015 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed Dec 30 12:23:05 2015 +0100
----------------------------------------------------------------------
.../kerberos/kerb/codec/KerberosTimeTest.java | 64 ++++++++++++++++++++
1 file changed, 64 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4d7f1cdb/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/KerberosTimeTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/KerberosTimeTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/KerberosTimeTest.java
new file mode 100644
index 0000000..41eb9f3
--- /dev/null
+++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/KerberosTimeTest.java
@@ -0,0 +1,64 @@
+/*
+ * 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.kerby.kerberos.kerb.codec;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.kerby.kerberos.kerb.type.KerberosTime;
+import org.junit.Test;
+
+/**
+ * Testing the KerberosTime class
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class KerberosTimeTest {
+ @Test
+ public void testLessThan() {
+ KerberosTime kerberosTime = new KerberosTime();
+
+ assertTrue( kerberosTime.lessThan(System.currentTimeMillis() + 100));
+ assertFalse( kerberosTime.lessThan(System.currentTimeMillis() - 10000));
+ }
+
+
+ @Test
+ public void testGreaterThan() {
+ KerberosTime kerberosTime = new KerberosTime();
+
+ assertTrue( kerberosTime.greaterThan(new KerberosTime(System.currentTimeMillis() - 10000)));
+ assertFalse( kerberosTime.greaterThan(new KerberosTime(System.currentTimeMillis() + 100)));
+ }
+
+
+ @Test
+ public void testExtend() {
+ KerberosTime kerberosTime = new KerberosTime();
+
+ KerberosTime extended = kerberosTime.extend(1000);
+
+ assertTrue(kerberosTime.lessThan(extended));
+ assertFalse(kerberosTime.greaterThan(extended));
+
+ assertEquals( -1000L, kerberosTime.diff(extended));
+ }
+}
[2/3] directory-kerby git commit: o Added Javadoc o Some slight
modifications
Posted by el...@apache.org.
o Added Javadoc
o Some slight modifications
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/f8884fa8
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/f8884fa8
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/f8884fa8
Branch: refs/heads/trunk
Commit: f8884fa84735ed2975fd03c67d69847bd76033eb
Parents: 4d7f1cd
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed Dec 30 12:23:39 2015 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed Dec 30 12:23:39 2015 +0100
----------------------------------------------------------------------
.../kerby/kerberos/kerb/type/KerberosTime.java | 82 ++++++++++++++------
1 file changed, 57 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/f8884fa8/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KerberosTime.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KerberosTime.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KerberosTime.java
index 3a78bf0..844efb9 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KerberosTime.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/KerberosTime.java
@@ -19,10 +19,10 @@
*/
package org.apache.kerby.kerberos.kerb.type;
-import org.apache.kerby.asn1.type.Asn1GeneralizedTime;
-
import java.util.Date;
+import org.apache.kerby.asn1.type.Asn1GeneralizedTime;
+
/**
* A specialization of the ASN.1 GeneralTime. The Kerberos time contains date and
* time up to the seconds, but with no fractional seconds. It's also always
@@ -67,6 +67,7 @@ public class KerberosTime extends Asn1GeneralizedTime {
}
/**
+ * Set the Kerberos time
* @param time set time in milliseconds
*/
public void setTime(long time) {
@@ -74,35 +75,50 @@ public class KerberosTime extends Asn1GeneralizedTime {
}
/**
- * get the time in seconds
+ * Gets the time in seconds
+ *
* @return The time
*/
public long getTimeInSeconds() {
return getTime() / 1000;
}
+ /**
+ * Compare the KerberosTime with another one, and return <tt>true</tt>
+ * if it's lesser than the provided one
+ *
+ * @param time in milliseconds
+ * @return <tt>true</tt> if less
+ */
public boolean lessThan(KerberosTime ktime) {
return getValue().compareTo(ktime.getValue()) < 0;
}
/**
+ * Compare the KerberosTime with a time, and return <tt>true</tt>
+ * if it's lesser than the provided one
+ *
* @param time in milliseconds
- * @return true if less
+ * @return <tt>true</tt> if less
*/
public boolean lessThan(long time) {
return getValue().getTime() < time;
}
/**
+ * Compare the KerberosTime with another one, and return <tt>true</tt>
+ * if it's greater than the provided one
+ *
* @param ktime compare with milliseconds
- * @return true if greater
+ * @return <tt>true</tt> if greater
*/
public boolean greaterThan(KerberosTime ktime) {
return getValue().compareTo(ktime.getValue()) > 0;
}
/**
- * time in milliseconds
+ * Check if the KerberosTime is within the provided clock skew
+ *
* @param clockSkew The clock skew
* @return true if in clock skew
*/
@@ -112,49 +128,65 @@ public class KerberosTime extends Asn1GeneralizedTime {
return delta < clockSkew;
}
+ /**
+ * @return A copy of the KerbeorsTime
+ */
public KerberosTime copy() {
long time = getTime();
+
return new KerberosTime(time);
}
/**
- * time in milliseconds.
+ * Create a KerberosTime based on a time in milliseconds.
+ *
* @param duration The duration
- * @return The kerberos time
+ * @return The created kerberos time
*/
public KerberosTime extend(long duration) {
long result = getTime() + duration;
+
return new KerberosTime(result);
}
/**
- * Return diff time in milliseconds
- * @param other The kerberos time
- * @return The diff time
+ * Return the difference between the currentKerberosTime and the provided one
+ *
+ * @param kerberosTime The kerberos time
+ * @return The difference between the two KerberosTime
*/
- public long diff(KerberosTime other) {
- return getTime() - other.getTime();
+ public long diff(KerberosTime kerberosTime) {
+ return getTime() - kerberosTime.getTime();
}
+ /**
+ * @return The current KerberosTime
+ */
public static KerberosTime now() {
- return new KerberosTime(new Date().getTime());
+ return new KerberosTime(System.currentTimeMillis());
}
+ /**
+ * @see Object#hashCode()
+ */
@Override
- public boolean equals(Object o) {
- if (this == o) {
+ public int hashCode() {
+ return getValue().hashCode();
+ }
+
+ /**
+ * @see Object#equals()
+ */
+ @Override
+ public boolean equals(Object that) {
+ if (this == that) {
return true;
}
- if (o == null || getClass() != o.getClass()) {
+
+ if (!(that instanceof KerberosTime)) {
return false;
}
-
- KerberosTime time = (KerberosTime) o;
- return this.getValue().equals(time.getValue());
- }
-
- @Override
- public int hashCode() {
- return getValue().hashCode();
+
+ return this.getValue().equals(((KerberosTime) that).getValue());
}
}
\ No newline at end of file
[3/3] directory-kerby git commit: Fixed some PMD errors
Posted by el...@apache.org.
Fixed some PMD errors
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/6a223db1
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/6a223db1
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/6a223db1
Branch: refs/heads/trunk
Commit: 6a223db19709a38db9213679a120776c5264d03c
Parents: f8884fa
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed Dec 30 12:28:32 2015 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed Dec 30 12:28:32 2015 +0100
----------------------------------------------------------------------
.../kerby/kerberos/kerb/codec/KerberosTimeTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/6a223db1/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/KerberosTimeTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/KerberosTimeTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/KerberosTimeTest.java
index 41eb9f3..5732d57 100644
--- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/KerberosTimeTest.java
+++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/codec/KerberosTimeTest.java
@@ -36,8 +36,8 @@ public class KerberosTimeTest {
public void testLessThan() {
KerberosTime kerberosTime = new KerberosTime();
- assertTrue( kerberosTime.lessThan(System.currentTimeMillis() + 100));
- assertFalse( kerberosTime.lessThan(System.currentTimeMillis() - 10000));
+ assertTrue(kerberosTime.lessThan(System.currentTimeMillis() + 100));
+ assertFalse(kerberosTime.lessThan(System.currentTimeMillis() - 10000));
}
@@ -45,8 +45,8 @@ public class KerberosTimeTest {
public void testGreaterThan() {
KerberosTime kerberosTime = new KerberosTime();
- assertTrue( kerberosTime.greaterThan(new KerberosTime(System.currentTimeMillis() - 10000)));
- assertFalse( kerberosTime.greaterThan(new KerberosTime(System.currentTimeMillis() + 100)));
+ assertTrue(kerberosTime.greaterThan(new KerberosTime(System.currentTimeMillis() - 10000)));
+ assertFalse(kerberosTime.greaterThan(new KerberosTime(System.currentTimeMillis() + 100)));
}
@@ -59,6 +59,6 @@ public class KerberosTimeTest {
assertTrue(kerberosTime.lessThan(extended));
assertFalse(kerberosTime.greaterThan(extended));
- assertEquals( -1000L, kerberosTime.diff(extended));
+ assertEquals(-1000L, kerberosTime.diff(extended));
}
}