You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/07/06 12:51:21 UTC
svn commit: r1358111 [13/13] - in
/incubator/isis/trunk/framework/core/commons: ./
src/main/java/org/apache/isis/core/commons/authentication/
src/main/java/org/apache/isis/core/commons/components/
src/main/java/org/apache/isis/core/commons/config/ src/...
Modified: incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLineSeparated.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLineSeparated.java?rev=1358111&r1=1358110&r2=1358111&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLineSeparated.java (original)
+++ incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLineSeparated.java Fri Jul 6 10:51:16 2012
@@ -1,52 +1,52 @@
-/*
- * 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.isis.core.commons.lang;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assume.assumeThat;
-
-import org.junit.Test;
-
-public class StringUtils_toLineSeparated {
-
- @Test
- public void convertsCarriageReturnToLineSeparator() throws Exception {
- assertThat(StringUtils.lineSeparated("ok\n"), is("ok" + System.getProperty("line.separator")));
- }
-
- @Test
- public void windowsStyleCarriageReturnLeftUnchanged() throws Exception {
- assumeThatRunningOnWindows(); // ie windows
- assertThat(StringUtils.lineSeparated("ok\r\n"), is("ok" + System.getProperty("line.separator")));
- }
-
- @Test
- public void macStyleCarriageReturnLeftUnchanged() throws Exception {
- assumeThatRunningOnWindows(); // ie windows
- assertThat(StringUtils.lineSeparated("ok\r"), is("ok\r"));
- }
-
- private static void assumeThatRunningOnWindows() {
- assumeThat(System.getProperty("file.separator"), is(equalTo("\\")));
- }
-
-}
+/*
+ * 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.isis.core.commons.lang;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeThat;
+
+import org.junit.Test;
+
+public class StringUtils_toLineSeparated {
+
+ @Test
+ public void convertsCarriageReturnToLineSeparator() throws Exception {
+ assertThat(StringUtils.lineSeparated("ok\n"), is("ok" + System.getProperty("line.separator")));
+ }
+
+ @Test
+ public void windowsStyleCarriageReturnLeftUnchanged() throws Exception {
+ assumeThatRunningOnWindows(); // ie windows
+ assertThat(StringUtils.lineSeparated("ok\r\n"), is("ok" + System.getProperty("line.separator")));
+ }
+
+ @Test
+ public void macStyleCarriageReturnLeftUnchanged() throws Exception {
+ assumeThatRunningOnWindows(); // ie windows
+ assertThat(StringUtils.lineSeparated("ok\r"), is("ok\r"));
+ }
+
+ private static void assumeThatRunningOnWindows() {
+ assumeThat(System.getProperty("file.separator"), is(equalTo("\\")));
+ }
+
+}
Modified: incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_ContainsStripNewLinesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_ContainsStripNewLinesTest.java?rev=1358111&r1=1358110&r2=1358111&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_ContainsStripNewLinesTest.java (original)
+++ incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_ContainsStripNewLinesTest.java Fri Jul 6 10:51:16 2012
@@ -1,68 +1,68 @@
-/*
- * 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.isis.core.commons.matchers;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IsisMatchers_ContainsStripNewLinesTest {
-
- private Matcher<String> fooMatcher;
-
- @Before
- public void setUp() {
- fooMatcher = IsisMatchers.containsStripNewLines("foo");
- }
-
- @Test
- public void shouldMatchExactString() {
- assertThat(fooMatcher.matches("foo"), is(true));
- }
-
- @Test
- public void shouldMatchIfContainsStringNoNewLines() {
- assertThat(fooMatcher.matches("abcfoodef"), is(true));
- }
-
- @Test
- public void shouldMatchIfContainsStringHasNewLinesBefore() {
- assertThat(fooMatcher.matches("a\nb\rc\r\ndfoodef"), is(true));
- }
-
- @Test
- public void shouldMatchIfContainsStringHasNewLinesAfter() {
- assertThat(fooMatcher.matches("abrdfood\ne\rfan\rg"), is(true));
- }
-
- @Test
- public void shouldMatchIfContainsStringHasNewLinesWithin() {
- assertThat(fooMatcher.matches("abcf\ro\nodef"), is(true));
- }
-
- @Test
- public void shouldNotMatchIfDoesNotContainsString() {
- assertThat(fooMatcher.matches("fob"), is(false));
- }
-
-}
+/*
+ * 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.isis.core.commons.matchers;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.hamcrest.Matcher;
+import org.junit.Before;
+import org.junit.Test;
+
+public class IsisMatchers_ContainsStripNewLinesTest {
+
+ private Matcher<String> fooMatcher;
+
+ @Before
+ public void setUp() {
+ fooMatcher = IsisMatchers.containsStripNewLines("foo");
+ }
+
+ @Test
+ public void shouldMatchExactString() {
+ assertThat(fooMatcher.matches("foo"), is(true));
+ }
+
+ @Test
+ public void shouldMatchIfContainsStringNoNewLines() {
+ assertThat(fooMatcher.matches("abcfoodef"), is(true));
+ }
+
+ @Test
+ public void shouldMatchIfContainsStringHasNewLinesBefore() {
+ assertThat(fooMatcher.matches("a\nb\rc\r\ndfoodef"), is(true));
+ }
+
+ @Test
+ public void shouldMatchIfContainsStringHasNewLinesAfter() {
+ assertThat(fooMatcher.matches("abrdfood\ne\rfan\rg"), is(true));
+ }
+
+ @Test
+ public void shouldMatchIfContainsStringHasNewLinesWithin() {
+ assertThat(fooMatcher.matches("abcf\ro\nodef"), is(true));
+ }
+
+ @Test
+ public void shouldNotMatchIfDoesNotContainsString() {
+ assertThat(fooMatcher.matches("fob"), is(false));
+ }
+
+}
Modified: incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EndsWithStripNewLinesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EndsWithStripNewLinesTest.java?rev=1358111&r1=1358110&r2=1358111&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EndsWithStripNewLinesTest.java (original)
+++ incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EndsWithStripNewLinesTest.java Fri Jul 6 10:51:16 2012
@@ -1,63 +1,63 @@
-/*
- * 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.isis.core.commons.matchers;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IsisMatchers_EndsWithStripNewLinesTest {
-
- private Matcher<String> fooMatcher;
-
- @Before
- public void setUp() {
- fooMatcher = IsisMatchers.endsWithStripNewLines("foo");
- }
-
- @Test
- public void shouldMatchExactString() {
- assertThat(fooMatcher.matches("foo"), is(true));
- }
-
- @Test
- public void shouldMatchIfEndsWithAndStringNoNewLines() {
- assertThat(fooMatcher.matches("abcfoo"), is(true));
- }
-
- @Test
- public void shouldMatchIfEndsWithStringHasNewLinesAfter() {
- assertThat(fooMatcher.matches("a\nb\rc\r\nfoo"), is(true));
- }
-
- @Test
- public void shouldMatchIfEndsWithStringHasNewLinesWithin() {
- assertThat(fooMatcher.matches("abcf\ro\no"), is(true));
- }
-
- @Test
- public void shouldNotMatchIfDoesNotEndsWithString() {
- assertThat(fooMatcher.matches("fob"), is(false));
- }
-
-}
+/*
+ * 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.isis.core.commons.matchers;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.hamcrest.Matcher;
+import org.junit.Before;
+import org.junit.Test;
+
+public class IsisMatchers_EndsWithStripNewLinesTest {
+
+ private Matcher<String> fooMatcher;
+
+ @Before
+ public void setUp() {
+ fooMatcher = IsisMatchers.endsWithStripNewLines("foo");
+ }
+
+ @Test
+ public void shouldMatchExactString() {
+ assertThat(fooMatcher.matches("foo"), is(true));
+ }
+
+ @Test
+ public void shouldMatchIfEndsWithAndStringNoNewLines() {
+ assertThat(fooMatcher.matches("abcfoo"), is(true));
+ }
+
+ @Test
+ public void shouldMatchIfEndsWithStringHasNewLinesAfter() {
+ assertThat(fooMatcher.matches("a\nb\rc\r\nfoo"), is(true));
+ }
+
+ @Test
+ public void shouldMatchIfEndsWithStringHasNewLinesWithin() {
+ assertThat(fooMatcher.matches("abcf\ro\no"), is(true));
+ }
+
+ @Test
+ public void shouldNotMatchIfDoesNotEndsWithString() {
+ assertThat(fooMatcher.matches("fob"), is(false));
+ }
+
+}
Modified: incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EqualToStripNewLinesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EqualToStripNewLinesTest.java?rev=1358111&r1=1358110&r2=1358111&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EqualToStripNewLinesTest.java (original)
+++ incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EqualToStripNewLinesTest.java Fri Jul 6 10:51:16 2012
@@ -1,63 +1,63 @@
-/*
- * 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.isis.core.commons.matchers;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IsisMatchers_EqualToStripNewLinesTest {
-
- private Matcher<String> fooMatcher;
-
- @Before
- public void setUp() {
- fooMatcher = IsisMatchers.equalToStripNewLines("foo");
- }
-
- @Test
- public void shouldMatchExactString() {
- assertThat(fooMatcher.matches("foo"), is(true));
- }
-
- @Test
- public void shouldNotMatchIfStartsWithAnything() {
- assertThat(fooMatcher.matches("afoo"), is(false));
- }
-
- @Test
- public void shouldNotMatchIfEndsWithAnything() {
- assertThat(fooMatcher.matches("fooz"), is(false));
- }
-
- @Test
- public void shouldMatchIfEqualToStringHasNewLinesWithin() {
- assertThat(fooMatcher.matches("f\ro\no"), is(true));
- }
-
- @Test
- public void shouldNotMatchIfDoesNotStartWithString() {
- assertThat(fooMatcher.matches("fob"), is(false));
- }
-
-}
+/*
+ * 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.isis.core.commons.matchers;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.hamcrest.Matcher;
+import org.junit.Before;
+import org.junit.Test;
+
+public class IsisMatchers_EqualToStripNewLinesTest {
+
+ private Matcher<String> fooMatcher;
+
+ @Before
+ public void setUp() {
+ fooMatcher = IsisMatchers.equalToStripNewLines("foo");
+ }
+
+ @Test
+ public void shouldMatchExactString() {
+ assertThat(fooMatcher.matches("foo"), is(true));
+ }
+
+ @Test
+ public void shouldNotMatchIfStartsWithAnything() {
+ assertThat(fooMatcher.matches("afoo"), is(false));
+ }
+
+ @Test
+ public void shouldNotMatchIfEndsWithAnything() {
+ assertThat(fooMatcher.matches("fooz"), is(false));
+ }
+
+ @Test
+ public void shouldMatchIfEqualToStringHasNewLinesWithin() {
+ assertThat(fooMatcher.matches("f\ro\no"), is(true));
+ }
+
+ @Test
+ public void shouldNotMatchIfDoesNotStartWithString() {
+ assertThat(fooMatcher.matches("fob"), is(false));
+ }
+
+}
Modified: incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringOrNullTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringOrNullTest.java?rev=1358111&r1=1358110&r2=1358111&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringOrNullTest.java (original)
+++ incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringOrNullTest.java Fri Jul 6 10:51:16 2012
@@ -1,53 +1,53 @@
-/*
- * 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.isis.core.commons.matchers;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IsisMatchers_NonEmptyStringOrNullTest {
-
- private Matcher<String> fooMatcher;
-
- @Before
- public void setUp() {
- fooMatcher = IsisMatchers.nonEmptyStringOrNull();
- }
-
- @Test
- public void shouldMatchNonEmptyString() {
- assertThat(fooMatcher.matches("foo"), is(true));
- }
-
- @Test
- public void shouldNotMatchEmptyString() {
- assertThat(fooMatcher.matches(""), is(false));
- }
-
- @Test
- public void shouldMatchNullString() {
- assertThat(fooMatcher.matches(null), is(true));
- }
-
-}
+/*
+ * 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.isis.core.commons.matchers;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.hamcrest.Matcher;
+import org.junit.Before;
+import org.junit.Test;
+
+public class IsisMatchers_NonEmptyStringOrNullTest {
+
+ private Matcher<String> fooMatcher;
+
+ @Before
+ public void setUp() {
+ fooMatcher = IsisMatchers.nonEmptyStringOrNull();
+ }
+
+ @Test
+ public void shouldMatchNonEmptyString() {
+ assertThat(fooMatcher.matches("foo"), is(true));
+ }
+
+ @Test
+ public void shouldNotMatchEmptyString() {
+ assertThat(fooMatcher.matches(""), is(false));
+ }
+
+ @Test
+ public void shouldMatchNullString() {
+ assertThat(fooMatcher.matches(null), is(true));
+ }
+
+}
Modified: incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringTest.java?rev=1358111&r1=1358110&r2=1358111&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringTest.java (original)
+++ incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringTest.java Fri Jul 6 10:51:16 2012
@@ -1,53 +1,53 @@
-/*
- * 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.isis.core.commons.matchers;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IsisMatchers_NonEmptyStringTest {
-
- private Matcher<String> fooMatcher;
-
- @Before
- public void setUp() {
- fooMatcher = IsisMatchers.nonEmptyString();
- }
-
- @Test
- public void shouldMatchNonEmptyString() {
- assertThat(fooMatcher.matches("foo"), is(true));
- }
-
- @Test
- public void shouldNotMatchEmptyString() {
- assertThat(fooMatcher.matches(""), is(false));
- }
-
- @Test
- public void shouldNotMatchNullString() {
- assertThat(fooMatcher.matches(null), is(false));
- }
-
-}
+/*
+ * 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.isis.core.commons.matchers;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.hamcrest.Matcher;
+import org.junit.Before;
+import org.junit.Test;
+
+public class IsisMatchers_NonEmptyStringTest {
+
+ private Matcher<String> fooMatcher;
+
+ @Before
+ public void setUp() {
+ fooMatcher = IsisMatchers.nonEmptyString();
+ }
+
+ @Test
+ public void shouldMatchNonEmptyString() {
+ assertThat(fooMatcher.matches("foo"), is(true));
+ }
+
+ @Test
+ public void shouldNotMatchEmptyString() {
+ assertThat(fooMatcher.matches(""), is(false));
+ }
+
+ @Test
+ public void shouldNotMatchNullString() {
+ assertThat(fooMatcher.matches(null), is(false));
+ }
+
+}
Modified: incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_StartsWithStripNewLinesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_StartsWithStripNewLinesTest.java?rev=1358111&r1=1358110&r2=1358111&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_StartsWithStripNewLinesTest.java (original)
+++ incubator/isis/trunk/framework/core/commons/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_StartsWithStripNewLinesTest.java Fri Jul 6 10:51:16 2012
@@ -1,63 +1,63 @@
-/*
- * 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.isis.core.commons.matchers;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IsisMatchers_StartsWithStripNewLinesTest {
-
- private Matcher<String> fooMatcher;
-
- @Before
- public void setUp() {
- fooMatcher = IsisMatchers.startsWithStripNewLines("foo");
- }
-
- @Test
- public void shouldMatchExactString() {
- assertThat(fooMatcher.matches("foo"), is(true));
- }
-
- @Test
- public void shouldMatchIfStartsWithAndStringNoNewLines() {
- assertThat(fooMatcher.matches("foodef"), is(true));
- }
-
- @Test
- public void shouldMatchIfStartsWithStringHasNewLinesAfter() {
- assertThat(fooMatcher.matches("food\ne\rfan\rg"), is(true));
- }
-
- @Test
- public void shouldMatchIfStartsWithStringHasNewLinesWithin() {
- assertThat(fooMatcher.matches("f\ro\nodef"), is(true));
- }
-
- @Test
- public void shouldNotMatchIfDoesNotStartWithString() {
- assertThat(fooMatcher.matches("fob"), is(false));
- }
-
-}
+/*
+ * 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.isis.core.commons.matchers;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.hamcrest.Matcher;
+import org.junit.Before;
+import org.junit.Test;
+
+public class IsisMatchers_StartsWithStripNewLinesTest {
+
+ private Matcher<String> fooMatcher;
+
+ @Before
+ public void setUp() {
+ fooMatcher = IsisMatchers.startsWithStripNewLines("foo");
+ }
+
+ @Test
+ public void shouldMatchExactString() {
+ assertThat(fooMatcher.matches("foo"), is(true));
+ }
+
+ @Test
+ public void shouldMatchIfStartsWithAndStringNoNewLines() {
+ assertThat(fooMatcher.matches("foodef"), is(true));
+ }
+
+ @Test
+ public void shouldMatchIfStartsWithStringHasNewLinesAfter() {
+ assertThat(fooMatcher.matches("food\ne\rfan\rg"), is(true));
+ }
+
+ @Test
+ public void shouldMatchIfStartsWithStringHasNewLinesWithin() {
+ assertThat(fooMatcher.matches("f\ro\nodef"), is(true));
+ }
+
+ @Test
+ public void shouldNotMatchIfDoesNotStartWithString() {
+ assertThat(fooMatcher.matches("fob"), is(false));
+ }
+
+}
Modified: incubator/isis/trunk/framework/core/commons/src/test/three.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/commons/src/test/three.properties?rev=1358111&r1=1358110&r2=1358111&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/commons/src/test/three.properties (original)
+++ incubator/isis/trunk/framework/core/commons/src/test/three.properties Fri Jul 6 10:51:16 2012
@@ -1,17 +1,17 @@
-# 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.
+# 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.
different.property = version 3
\ No newline at end of file