Skip to content

Commit

Permalink
Merge branch '__rultor'
Browse files Browse the repository at this point in the history
  • Loading branch information
rultor committed May 2, 2024
2 parents e422a9c + e4b8c0e commit 7b44858
Show file tree
Hide file tree
Showing 11 changed files with 91 additions and 8 deletions.
1 change: 1 addition & 0 deletions .codacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ exclude_paths:
- "eo-runtime/src/main/java/EOorg/EOeolang/EOmalloc$EOof$EOallocated$EOread.java"
- "eo-runtime/src/main/java/EOorg/EOeolang/EOmalloc$EOof$EOallocated$EOwrite.java"
- "eo-runtime/src/test/java/EOorg/EOeolang/EOmallocTest.java"
- "eo-runtime/src/test/java/EOorg/EOeolang/EoClassesArePublicTest.java"
5 changes: 5 additions & 0 deletions eo-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@ SOFTWARE.
<!-- version from parent POM -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
*/
@Versionized
@XmirObject(oname = "cage.encaged.encage")
final class EOcage$EOencaged$EOencage extends PhDefault implements Atom {
public final class EOcage$EOencaged$EOencage extends PhDefault implements Atom {
/**
* Ctor.
* @param sigma Sigma
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
*/
@Versionized
@XmirObject(oname = "cage.encaged.@")
final class EOcage$EOencaged$EOφ extends PhDefault implements Atom {
public final class EOcage$EOencaged$EOφ extends PhDefault implements Atom {
/**
* Ctor.
* @param sigma Sigma
Expand Down
2 changes: 1 addition & 1 deletion eo-runtime/src/main/java/EOorg/EOeolang/EOcage$EOφ.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
*/
@Versionized
@XmirObject(oname = "cage.@")
final class EOcage$EOφ extends PhDefault implements Atom {
public final class EOcage$EOφ extends PhDefault implements Atom {
/**
* Ctor.
* @param sigma Sigma
Expand Down
2 changes: 1 addition & 1 deletion eo-runtime/src/main/java/EOorg/EOeolang/EOio/Input.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* @since 0.28.0
*/
@Versionized
public final class Input {
final class Input {
/**
* Default input.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
*/
@Versionized
@XmirObject(oname = "malloc.of.allocated.read")
final class EOmalloc$EOof$EOallocated$EOread extends PhDefault implements Atom {
public final class EOmalloc$EOof$EOallocated$EOread extends PhDefault implements Atom {
/**
* Ctor.
* @param sigma Sigma
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
*/
@Versionized
@XmirObject(oname = "malloc.of.allocated.write")
final class EOmalloc$EOof$EOallocated$EOwrite extends PhDefault implements Atom {
public final class EOmalloc$EOof$EOallocated$EOwrite extends PhDefault implements Atom {
/**
* Ctor.
* @param sigma Sigma
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
*/
@Versionized
@XmirObject(oname = "malloc.of.@")
final class EOmalloc$EOof$EOφ extends PhDefault implements Atom {
public final class EOmalloc$EOof$EOφ extends PhDefault implements Atom {
/**
* Ctor.
* @param sigma Sigma
Expand Down
2 changes: 1 addition & 1 deletion eo-runtime/src/test/java/EOorg/EOeolang/EOfailed.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@
"JTCOP.RuleCorrectTestName",
"JTCOP.RuleInheritanceInTests"
})
final class EOfailed extends PhDefault {
public final class EOfailed extends PhDefault {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2016-2024 Objectionary.com
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
/*
* @checkstyle PackageNameCheck (10 lines)
*/
package EOorg.EOeolang;

import com.google.common.reflect.ClassPath;
import com.jcabi.log.Logger;
import java.io.IOException;
import java.lang.reflect.Modifier;
import java.util.Set;
import java.util.stream.Collectors;
import org.eolang.Phi;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;

/**
* Test that all EO.. classes are public.
* @since 0.38
*/
@SuppressWarnings("JTCOP.RuleAllTestsHaveProductionClass")
public class EoClassesArePublicTest {

@Test
@SuppressWarnings("JTCOP.RulePresentTense")
public void arePublic() throws IOException {
final Set<Class<?>> clazzes = ClassPath.from(ClassLoader.getSystemClassLoader())
.getAllClasses()
.stream()
.filter(clazz -> clazz.getPackageName().equals("EOorg.EOeolang"))
.map(ClassPath.ClassInfo::load)
.filter(EoClassesArePublicTest::isEoClass)
.collect(Collectors.toSet());
assert !clazzes.isEmpty();
Logger.info(this.getClass(), "Found %d EO classes", clazzes.size());
MatcherAssert.assertThat(
"All EO.. classes should be public",
clazzes.stream()
.filter(clazz -> !Modifier.isPublic(clazz.getModifiers()))
.collect(Collectors.toList()),
Matchers.empty()
);
}

/**
* Is EO.. class and is instance of {@link Phi}.
* @param clazz Class.
* @return True if is.
*/
private static boolean isEoClass(final Class<?> clazz) {
return clazz.getSimpleName().startsWith("EO")
&& Phi.class.isAssignableFrom(clazz);
}
}

0 comments on commit 7b44858

Please sign in to comment.