You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/03/15 01:50:38 UTC
incubator-geode git commit: Remove weird files leftover from merge
conflict
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-949-2 8e0693a8b -> 98c122ca4
Remove weird files leftover from merge conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/98c122ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/98c122ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/98c122ca
Branch: refs/heads/feature/GEODE-949-2
Commit: 98c122ca46a944d365af3594b43a2eb7dffda4ec
Parents: 8e0693a
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Mar 14 17:50:10 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Mar 14 17:50:10 2016 -0700
----------------------------------------------------------------------
.../security/PKCSPrincipalTest.java~HEAD | 48 --------------------
.../security/UsernamePrincipalTest.java~HEAD | 48 --------------------
2 files changed, 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/98c122ca/geode-core/src/test/java/templates/security/PKCSPrincipalTest.java~HEAD
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/templates/security/PKCSPrincipalTest.java~HEAD b/geode-core/src/test/java/templates/security/PKCSPrincipalTest.java~HEAD
deleted file mode 100644
index 6ce216f..0000000
--- a/geode-core/src/test/java/templates/security/PKCSPrincipalTest.java~HEAD
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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 templates.security;
-
-import static org.assertj.core.api.Assertions.*;
-
-import java.io.Serializable;
-
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
-import org.apache.commons.lang.SerializationUtils;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-/**
- * Unit tests for {@link PKCSPrincipal}
- */
-@Category(UnitTest.class)
-public class PKCSPrincipalTest {
-
- @Test
- public void isSerializable() throws Exception {
- assertThat(PKCSPrincipal.class).isInstanceOf(Serializable.class);
- }
-
- @Test
- public void canBeSerialized() throws Exception {
- String name = "jsmith";
- PKCSPrincipal instance = new PKCSPrincipal(name);
-
- PKCSPrincipal cloned = (PKCSPrincipal) SerializationUtils.clone(instance);
-
- assertThat(cloned.getName()).isEqualTo(name);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/98c122ca/geode-core/src/test/java/templates/security/UsernamePrincipalTest.java~HEAD
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/templates/security/UsernamePrincipalTest.java~HEAD b/geode-core/src/test/java/templates/security/UsernamePrincipalTest.java~HEAD
deleted file mode 100644
index e88fd18..0000000
--- a/geode-core/src/test/java/templates/security/UsernamePrincipalTest.java~HEAD
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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 templates.security;
-
-import static org.assertj.core.api.Assertions.*;
-
-import java.io.Serializable;
-
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
-import org.apache.commons.lang.SerializationUtils;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-/**
- * Unit tests for {@link UsernamePrincipal}
- */
-@Category(UnitTest.class)
-public class UsernamePrincipalTest {
-
- @Test
- public void isSerializable() throws Exception {
- assertThat(UsernamePrincipal.class).isInstanceOf(Serializable.class);
- }
-
- @Test
- public void canBeSerialized() throws Exception {
- String name = "jsmith";
- UsernamePrincipal instance = new UsernamePrincipal(name);
-
- UsernamePrincipal cloned = (UsernamePrincipal) SerializationUtils.clone(instance);
-
- assertThat(cloned.getName()).isEqualTo(name);
- }
-}